Changeset 1882 for pjproject/trunk/pjnath/src/pjturn-client/client_main.c

Timestamp:

Mar 20, 2008 7:21:27 PM (17 years ago)

Author:

bennylp

Message:

More ticket #485: updated Makefiles and fixed compilation warnings with gcc

File:

• pjproject/trunk/pjnath/src/pjturn-client/client_main.c (modified) (5 diffs)

pjproject/trunk/pjnath/src/pjturn-client/client_main.c

@@ -67 +67 @@
 
 static int worker_thread(void *unused);
-static pj_status_t parse_addr(const char *input, pj_sockaddr_in *addr);
 static void turn_on_rx_data(pj_turn_udp *udp_rel,
                             const pj_uint8_t *pkt,
@@ -319 +318 @@
         g.udp_rel = NULL;
     }
-}
-
-static pj_status_t parse_addr(const char *input,
-                              pj_sockaddr_in *addr)
-{
-    const char *pos;
-    pj_str_t ip;
-    pj_uint16_t port;
-    pj_sockaddr tmp_addr;
-
-    pos = pj_ansi_strchr(input, ':');
-    if (pos==NULL) {
-        puts("Invalid format");
-        return -1;
-    }
-
-    ip.ptr = (char*)input;
-    ip.slen = pos - input;
-    port = (pj_uint16_t)atoi(pos+1);
-
-    if (port==0) {
-        puts("Invalid port");
-        return -1;
-    }
-
-    if (pj_sockaddr_in_init(&tmp_addr.ipv4, &ip, port)!=PJ_SUCCESS) {
-        puts("Invalid address");
-        return -1;
-    }
-
-    pj_memcpy(addr, &tmp_addr, sizeof(pj_sockaddr_in));
-
-    return PJ_SUCCESS;
 }
 
@@ -424 +390 @@
 
             strcpy(input, "Hello from client");
-            status = pj_turn_udp_sendto(g.udp_rel, input, strlen(input)+1, 
+            status = pj_turn_udp_sendto(g.udp_rel, (const pj_uint8_t*)input, 
+                                        strlen(input)+1, 
                                         &peer->addr, 
                                         pj_sockaddr_get_len(&peer->addr));
@@ -454 +421 @@
         case '0':
         case '1':
+            if (g.udp_rel == NULL) {
+                puts("No relay");
+                break;
+            }
             peer = &g.peer[input[0]-'0'];
             sprintf(input, "Hello from peer%d", input[0]-'0');
@@ -523 +494 @@
     if (pj_optind == argc) {
         puts("Error: TARGET is needed");
+        usage();
         return 1;
     }