Changeset 4173 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

Timestamp:

Jun 20, 2012 10:39:05 AM (12 years ago)

Author:

ming

Message:

Fixed #1537: Via rewrite: putting the right IP address in Via sent-by for outgoing requests

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c (modified) (4 diffs)

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

@@ -865 +865 @@
     }
 
+    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);
+
     /* Set credentials and preference. */
     pjsip_auth_clt_set_credentials(&dlg->auth_sess, acc->cred_cnt, acc->cred);
@@ -1229 +1232 @@
     /* Add headers etc */
     pjsua_process_msg_data(tdata, NULL);
+
+    /* Set Via sent-by */
+    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0) {
+        pjsip_publishc_set_via_sent_by(acc->publish_sess, &acc->via_addr,
+                                       acc->via_tp);
+    }
 
     /* Send the PUBLISH request */
@@ -1781 +1790 @@
     pjsip_dlg_inc_lock(buddy->dlg);
 
+    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0)
+        pjsip_dlg_set_via_sent_by(buddy->dlg, &acc->via_addr, acc->via_tp);
+
     status = pjsip_pres_create_uac( buddy->dlg, &pres_callback, 
                                     PJSIP_EVSUB_NO_EVENT_ID, &buddy->sub);
@@ -2097 +2109 @@
      */
     pjsip_dlg_inc_lock(acc->mwi_dlg);
+
+    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0)
+        pjsip_dlg_set_via_sent_by(acc->mwi_dlg, &acc->via_addr, acc->via_tp);
 
     /* Create UAC subscription */