Changeset 947 for pjproject/trunk

Timestamp:

Feb 14, 2007 2:36:13 PM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #101: PJSUA transport is not updated with correct port number if application specifies port is zero

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -486 +486 @@
         case OPT_LOCAL_PORT:   /* local-port */
             lval = pj_strtoul(pj_cstr(&tmp, pj_optarg));
-            if (lval < 1 || lval > 65535) {
+            if (lval < 0 || lval > 65535) {
                 PJ_LOG(1,(THIS_FILE, 
                           "Error: expecting integer value for "
@@ -2892 +2892 @@
 {
     pjsua_transport_id transport_id = -1;
+    pjsua_transport_config tcp_cfg;
     unsigned i;
     pj_status_t status;
@@ -2996 +2997 @@
     }
 
+    pj_memcpy(&tcp_cfg, &app_config.udp_cfg, sizeof(tcp_cfg));
+
     /* Add UDP transport unless it's disabled. */
     if (!app_config.no_udp) {
@@ -3010 +3013 @@
         //pjsua_acc_set_transport(aid, transport_id);
         pjsua_acc_set_online_status(current_acc, PJ_TRUE);
+
+        if (app_config.udp_cfg.port == 0) {
+            pjsua_transport_info ti;
+            pj_sockaddr_in *a;
+
+            pjsua_transport_get_info(transport_id, &ti);
+            a = (pj_sockaddr_in*)&ti.local_addr;
+
+            tcp_cfg.port = pj_ntohs(a->sin_port);
+        }
     }
 
@@ -3015 +3028 @@
     if (!app_config.no_tcp) {
         status = pjsua_transport_create(PJSIP_TRANSPORT_TCP,
-                                        &app_config.udp_cfg, 
+                                        &tcp_cfg, 
                                         &transport_id);
         if (status != PJ_SUCCESS)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -842 +842 @@
     }
 
+    /* If port is zero, get the bound port */
+    if (port == 0) {
+        pj_sockaddr_in bound_addr;
+        int namelen = sizeof(bound_addr);
+        status = pj_sock_getsockname(sock, &bound_addr, &namelen);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "getsockname() error", status);
+            pj_sock_close(sock);
+            return status;
+        }
+
+        port = pj_ntohs(bound_addr.sin_port);
+    }
+
     /* Copy and normalize STUN param */
     if (use_stun) {
@@ -874 +888 @@
          * address, only set the port.
          */
-        /* Do nothing */
+        if (p_pub_addr->sin_port == 0)
+            p_pub_addr->sin_port = pj_htons((pj_uint16_t)port);
 
     } else {