webrtc_test: Check URL length before setting it 93/243393/8
authorSangchul Lee <sc11.lee@samsung.com>
Mon, 7 Sep 2020 08:56:11 +0000 (17:56 +0900)
committerSangchul Lee <sc11.lee@samsung.com>
Fri, 11 Sep 2020 06:21:38 +0000 (15:21 +0900)
Two similar functions are merged into one.

[Version] 0.1.14
[Issue Type] Test application

Change-Id: I6e0760278b177eef6a3d835fe2d59910ca91a6b2
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
test/webrtc_test.c

index d66cd3210c2093fdbc9e869c0deb01a043dd71d8..241cc54e97a89846e195f06783d5c02e2ae28010 100644 (file)
@@ -452,28 +452,20 @@ static void _webrtc_set_remote_description(char *desc)
                g_print("webrtc_set_remote_description() success\n");
 }
 
-static void _setting_signaling_server(char *uri)
+static void _setting_uri(gchar *dest_arr, char *uri)
 {
        int ret = 0;
 
        if (!uri)
                return;
 
-       ret = __copy_string_arr(g_signaling_server, uri);
-       if (ret != 0)
-               return;
-}
-
-static void _setting_proxy(char *uri)
-{
-       int ret = 0;
-
-       if (!uri)
-               return;
-
-       ret = __copy_string_arr(g_proxy, uri);
-       if (ret != 0)
-               return;
+       if (strlen(uri) > strlen("0.0.0.0")) {
+               ret = __copy_string_arr(dest_arr, uri);
+               if (ret != 0)
+                       g_print("failed to __copy_string_arr()\n");
+       } else {
+               g_print("invalid value, uri[%s]\n", uri);
+       }
 }
 
 void quit_program()
@@ -589,8 +581,8 @@ void display_sub_basic()
        g_print("sr. Set remote description\n");
        g_print("st. Set STUN server\n");
        g_print("----------------------------------- App. Setting ----------------------------------------\n");
-       g_print("ss. Signalling server\n");
-       g_print("px. Proxy\n");
+       g_print("ss. Set signaling server URL\n");
+       g_print("px. Set proxy URL\n");
        g_print("-----------------------------------------------------------------------------------------\n");
        g_print("=========================================================================================\n");
 }
@@ -610,9 +602,9 @@ static void displaymenu()
        } else if (g_menu_state == CURRENT_STATUS_SET_REMOTE_DESCRIPTION) {
                g_print("*** input type of remote description.(1:offer, 2:answer)\n");
        } else if (g_menu_state == CURRENT_STATUS_SETTING_SIGNALING_SERVER) {
-               g_print("*** input signaling server url.\n");
+               g_print("*** input signaling server URL.\n");
        } else if (g_menu_state == CURRENT_STATUS_SETTING_PROXY) {
-               g_print("*** input proxy address.\n");
+               g_print("*** input proxy URL.\n");
        } else {
                g_print("*** unknown status.\n");
                quit_program();
@@ -704,12 +696,12 @@ static void interpret(char *cmd)
                break;
        }
        case CURRENT_STATUS_SETTING_SIGNALING_SERVER: {
-               _setting_signaling_server(cmd);
+               _setting_uri(g_signaling_server, cmd);
                reset_menu_state();
                break;
        }
        case CURRENT_STATUS_SETTING_PROXY: {
-               _setting_proxy(cmd);
+               _setting_uri(g_proxy, cmd);
                reset_menu_state();
                break;
        }