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

Timestamp:

Jul 12, 2008 10:08:37 AM (16 years ago)

Author:

bennylp

Message:

Ticket #562: In TURN client sample application, when STUN server is specified, contact the STUN server on default STUN port rather than the TURN port

File:

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

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

@@ -134 +134 @@
         pj_stun_sock_cb stun_sock_cb;
         char name[] = "peer0";
+        pj_uint16_t port;
         pj_str_t server;
 
@@ -151 +152 @@
         }
 
-        if (o.stun_server)
+        if (o.stun_server) {
             server = pj_str(o.stun_server);
-        else
+            port = PJ_STUN_PORT;
+        } else {
             server = pj_str(o.srv_addr);
+            port = (pj_uint16_t)(o.srv_port?atoi(o.srv_port):PJ_STUN_PORT);
+        }
         status = pj_stun_sock_start(g.peer[i].stun_sock, &server, 
-                                    (pj_uint16_t)(o.srv_port?atoi(o.srv_port):PJ_STUN_PORT), 
-                                    NULL);
+                                    port,  NULL);
         if (status != PJ_SUCCESS) {
             my_perror("pj_stun_sock_start()", status);