Changeset 4963 for pjproject/trunk

Timestamp:

Nov 25, 2014 9:53:14 AM (10 years ago)

Author:

nanang

Message:

Fix #1804: Call should use local IP in Via sent-by when the account is not using STUN.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

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

@@ -773 +773 @@
     pjsip_dlg_inc_lock(dlg);
 
-    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0)
+    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0) {
         pjsip_dlg_set_via_sent_by(dlg, &acc->via_addr, acc->via_tp);
+    } else if (!pjsua_sip_acc_is_using_stun(acc_id)) {
+        /* Choose local interface to use in Via if acc is not using
+         * STUN. See https://trac.pjsip.org/repos/ticket/1804
+         */
+        pjsip_host_port via_addr;
+        const void *via_tp;
+
+        if (pjsua_acc_get_uac_addr(acc_id, dlg->pool, &acc->cfg.id,
+                                   &via_addr, NULL, NULL,
+                                   &via_tp) == PJ_SUCCESS)
+        {
+            pjsip_dlg_set_via_sent_by(dlg, &via_addr,
+                                      (pjsip_transport*)via_tp);
+        }
+    }
 
     /* Calculate call's secure level */
@@ -1350 +1365 @@
         pjsip_dlg_set_via_sent_by(dlg, &pjsua_var.acc[acc_id].via_addr,
                                   pjsua_var.acc[acc_id].via_tp);
+    } else if (!pjsua_sip_acc_is_using_stun(acc_id)) {
+        /* Choose local interface to use in Via if acc is not using
+         * STUN. See https://trac.pjsip.org/repos/ticket/1804
+         */
+        char target_buf[PJSIP_MAX_URL_SIZE];
+        pj_str_t target;
+        pjsip_host_port via_addr;
+        const void *via_tp;
+
+        target.ptr = target_buf;
+        target.slen = pjsip_uri_print(PJSIP_URI_IN_REQ_URI,
+                                      dlg->target,
+                                      target_buf, sizeof(target_buf));
+        if (target.slen < 0) target.slen = 0;
+
+        if (pjsua_acc_get_uac_addr(acc_id, dlg->pool, &target,
+                                   &via_addr, NULL, NULL,
+                                   &via_tp) == PJ_SUCCESS)
+        {
+            pjsip_dlg_set_via_sent_by(dlg, &via_addr,
+                                      (pjsip_transport*)via_tp);
+        }
     }