Changeset 6015

Timestamp:

May 29, 2019 8:02:02 AM (5 years ago)

Author:

ming

Message:

Fixed #2205: Use bound address for outgoing UDP SIP messages

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (2 diffs)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -315 +315 @@
     pj_bool_t                is_restarting;
     pj_status_t              restart_status;
+    pj_bool_t                has_bound_addr;
 } pjsua_transport_data;
 

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

@@ -3293 +3293 @@
         return status;
 
-    /* Set this as default return value. This may be changed below
-     * for TCP/TLS
-     */
+    /* Set this as default return value. This may be changed below. */
     addr->host = tfla2_prm.ret_addr;
     addr->port = tfla2_prm.ret_port;
@@ -3316 +3314 @@
             acc->via_tp = (pjsip_transport *)tfla2_prm.ret_tp;
         }
+    } else
+    /* For UDP transport, check if we need to overwrite the address
+     * with its bound address.
+     */
+    if ((flag & PJSIP_TRANSPORT_DATAGRAM) && tfla2_prm.local_if &&
+        tfla2_prm.ret_tp)
+    {
+        int i;
+
+        for (i = 0; i < sizeof(pjsua_var.tpdata); i++) {
+            if (tfla2_prm.ret_tp==(const void *)pjsua_var.tpdata[i].data.tp) {
+                if (pjsua_var.tpdata[i].has_bound_addr) {
+                    pj_strdup(acc->pool, &addr->host,
+                              &pjsua_var.tpdata[i].data.tp->local_name.host);
+                    addr->port = (pj_uint16_t)
+                                 pjsua_var.tpdata[i].data.tp->local_name.port;
+                }
+                break;
+            }
+        }
     }
 

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

@@ -2507 +2507 @@
         pjsua_var.tpdata[id].local_name = tp->local_name;
         pjsua_var.tpdata[id].data.tp = tp;
+        if (cfg->bound_addr.slen)
+            pjsua_var.tpdata[id].has_bound_addr = PJ_TRUE;
 
 #if defined(PJ_HAS_TCP) && PJ_HAS_TCP!=0