Changeset 5774 for pjproject

Timestamp:

Apr 3, 2018 5:01:20 AM (6 years ago)

Author:

ming

Message:

Fixed #2108: Fixed RTP socket to bind to any available port if port is zero

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_core.c (modified) (2 diffs)
• pjsua_media.c (modified) (3 diffs)

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

@@ -23 +23 @@
 
 #define THIS_FILE   "pjsua_core.c"
+
+#define DEFAULT_RTP_PORT        4000
 
 
@@ -289 +291 @@
 #endif
     pjsua_transport_config_default(&cfg->rtp_cfg);
+    cfg->rtp_cfg.port = DEFAULT_RTP_PORT;
 
     pjsua_media_config_default(&med_cfg);

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

@@ -24 +24 @@
 #define THIS_FILE               "pjsua_media.c"
 
-#define DEFAULT_RTP_PORT        4000
-
 #ifndef PJSUA_REQUIRE_CONSECUTIVE_RTCP_PORT
 #   define PJSUA_REQUIRE_CONSECUTIVE_RTCP_PORT  0
@@ -268 +266 @@
     }
 
-    if (acc->next_rtp_port == 0)
+    if (acc->next_rtp_port == 0 || cfg->port == 0)
         acc->next_rtp_port = (pj_uint16_t)cfg->port;
-
-    if (acc->next_rtp_port == 0)
-        acc->next_rtp_port = (pj_uint16_t)DEFAULT_RTP_PORT;
 
     for (i=0; i<2; ++i)
@@ -321 +316 @@
             sock[0] = PJ_INVALID_SOCKET;
             continue;
+        }
+        
+        /* If bound to random port, find out the port number. */
+        if (acc->next_rtp_port == 0) {
+            pj_sockaddr sock_addr;
+            int addr_len = sizeof(pj_sockaddr);
+
+            status = pj_sock_getsockname(sock[0], &sock_addr, &addr_len);
+            if (status != PJ_SUCCESS) {
+                pjsua_perror(THIS_FILE, "getsockname() error", status);
+                pj_sock_close(sock[0]);
+                return status;
+            }
+            acc->next_rtp_port = pj_sockaddr_get_port(&sock_addr);
         }