From: Sangchul Lee <sc11.lee@samsung.com>
Date: Tue, 9 Nov 2021 07:37:59 +0000 (+0900)
Subject: webrtc_test: Show server ip/port/status when using private signaling server
X-Git-Tag: submit/tizen_6.5/20211124.101818~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=142b59008f7c137476db7c45dba163b2f5a267a5;p=platform%2Fcore%2Fapi%2Fwebrtc.git

webrtc_test: Show server ip/port/status when using private signaling server

It is also fixed to use designated initializers for some string arrays.

[Version] 0.2.151
[Issue Type] Improvement

Change-Id: I28f50fee799466de6ac0fee6de1772374a196246
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
---

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index 417d9912..5536271b 100644
--- a/packaging/capi-media-webrtc.spec
+++ b/packaging/capi-media-webrtc.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-webrtc
 Summary:    A WebRTC library in Tizen Native API
-Version:    0.2.150
+Version:    0.2.151
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
diff --git a/test/webrtc_test.c b/test/webrtc_test.c
index 1f203ccd..d8d8dc80 100644
--- a/test/webrtc_test.c
+++ b/test/webrtc_test.c
@@ -111,33 +111,35 @@ enum {
 	SERVER_STATUS_DISCONNECTED,
 	SERVER_STATUS_CONNECTED,
 	SERVER_STATUS_SESSION_ESTABLISHED,
+	SERVER_STATUS_SESSION_CLOSED,
 	SERVER_STATUS_ROOM_ESTABLISHED,
 	SERVER_STATUS_ERROR_FOUND
 };
 
 const char *g_server_status_str[] = {
-	"DISCONNECTED",
-	"CONNECTED",
-	"SESSION_ESTABLISHED",
-	"ROOM_ESTABLISHED",
-	"ERROR_FOUND",
+	[SERVER_STATUS_DISCONNECTED] = "DISCONNECTED",
+	[SERVER_STATUS_CONNECTED] = "CONNECTED",
+	[SERVER_STATUS_SESSION_ESTABLISHED] = "SESSION_ESTABLISHED",
+	[SERVER_STATUS_SESSION_CLOSED] = "SESSION_CLOSED",
+	[SERVER_STATUS_ROOM_ESTABLISHED] = "ROOM_ESTABLISHED",
+	[SERVER_STATUS_ERROR_FOUND] = "ERROR_FOUND",
 };
 
 static const char* g_webrtc_state_str[] = {
-	"IDLE",
-	"NEGOTIATING",
-	"PLAYING",
+	[WEBRTC_STATE_IDLE] = "IDLE",
+	[WEBRTC_STATE_NEGOTIATING] = "NEGOTIATING",
+	[WEBRTC_STATE_PLAYING] = "PLAYING",
 };
 
 static const char* g_webrtc_media_type_str[] = {
-	"AUDIO",
-	"VIDEO",
+	[WEBRTC_MEDIA_TYPE_AUDIO] = "AUDIO",
+	[WEBRTC_MEDIA_TYPE_VIDEO] = "VIDEO",
 };
 
 static const char* g_webrtc_transceiver_direction_str[] = {
-	"SENDONLY",
-	"RECVONLY",
-	"SENDRECV",
+	[WEBRTC_TRANSCEIVER_DIRECTION_SENDONLY] = "SENDONLY",
+	[WEBRTC_TRANSCEIVER_DIRECTION_RECVONLY] = "RECVONLY",
+	[WEBRTC_TRANSCEIVER_DIRECTION_SENDRECV] = "SENDRECV",
 };
 
 /* for video display */
@@ -232,6 +234,8 @@ typedef struct _signaling_server_s {
 
 	/* for private network - internal API */
 	webrtc_signaling_client_h signaling_client;
+	char *private_ip;
+	int port;
 	bool is_connected;
 } signaling_server_s;
 
@@ -1758,16 +1762,21 @@ static void __signaling_message_cb(webrtc_signaling_message_type_e type, const c
 	if (type == SIGNALING_MESSAGE_TYPE_CONNECTED) {
 		g_print("\n[from SERVER > CONNECTED %s]\n", message);
 		g_signaling_server.is_connected = true;
+		g_signaling_server.server_status = SERVER_STATUS_CONNECTED;
+		g_signaling_server.local_peer_id = atoi(message);
 
 	} else if (type == SIGNALING_MESSAGE_TYPE_DISCONNECTED) {
 		g_print("\n[from SERVER > DISCONNECTED %s]\n", message);
 		g_signaling_server.is_connected = false;
+		g_signaling_server.server_status = SERVER_STATUS_DISCONNECTED;
 
 	} else if (type == SIGNALING_MESSAGE_TYPE_SESSION_ESTABLISHED) {
 		g_print("\n[from SERVER > SESSION_ESTABLISHED with %s]\n", message);
+		g_signaling_server.server_status = SERVER_STATUS_SESSION_ESTABLISHED;
 
 	} else if (type == SIGNALING_MESSAGE_TYPE_SESSION_CLOSED) {
 		g_print("\n[from SERVER > SESSION_CLOSED with %s]\n", message);
+		g_signaling_server.server_status = SERVER_STATUS_SESSION_CLOSED;
 
 	} else if (type == SIGNALING_MESSAGE_TYPE_SDP) {
 		g_print("\n[from SERVER > SDP]\n%s\n", message);
@@ -1793,6 +1802,11 @@ static void _webrtc_signaling_connect(const char *ip, int port)
 	ret = webrtc_signaling_connect(ip, port, __signaling_message_cb, &g_conns[0], &g_signaling_server.signaling_client);
 	RET_IF(ret != WEBRTC_ERROR_NONE, "ret[0x%x]", ret);
 
+	if (g_signaling_server.private_ip)
+		free(g_signaling_server.private_ip);
+	g_signaling_server.private_ip = strdup(ip);
+	g_signaling_server.port = port;
+
 	g_print("webrtc_signaling_connect() success\n");
 }
 
@@ -4055,13 +4069,12 @@ void display_setting_status()
 	int len_server = strlen(g_signaling_server.url);
 	int i;
 
-	if (len_proxy == 0 && len_server == 0)
-		return;
-
 	if (len_proxy > 0)
 		g_print("  proxy[%s]", g_proxy);
 	if (len_server > 0)
 		g_print("  server[%s][%s]\n", g_signaling_server.url, g_server_status_str[g_signaling_server.server_status]);
+	if (g_signaling_server.private_ip && g_signaling_server.port > 0)
+		g_print("  server[%s:%d][%s]\n", g_signaling_server.private_ip, g_signaling_server.port, g_server_status_str[g_signaling_server.server_status]);
 	if (g_signaling_server.local_peer_id > 0)
 		g_print("  local peer id : %d\n", g_signaling_server.local_peer_id);
 	for (i = 0; i < MAX_CONNECTION_LEN; i++) {