Changeset 4173 for pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.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/pjsip-ua/sip_reg.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -91 +91 @@
     pjsip_route_hdr              route_set;
     pjsip_hdr                    hdr_list;
+    pjsip_host_port              via_addr;
+    const void                  *via_tp;
 
     /* Authorization sessions. */
@@ -807 +809 @@
         regc->next_reg.sec += delay.sec;
     }
+}
+
+PJ_DEF(pj_status_t) pjsip_regc_set_via_sent_by( pjsip_regc *regc,
+                                                pjsip_host_port *via_addr,
+                                                pjsip_transport *via_tp)
+{
+    PJ_ASSERT_RETURN(regc, PJ_EINVAL);
+
+    if (!via_addr)
+        pj_bzero(&regc->via_addr, sizeof(regc->via_addr));
+    else
+        regc->via_addr = *via_addr;
+    regc->via_tp = via_tp;
+
+    return PJ_SUCCESS;
 }
 
@@ -1263 +1280 @@
     pjsip_tx_data_add_ref(tdata);
 
+    /* If via_addr is set, use this address for the Via header. */
+    if (regc->via_addr.host.slen > 0) {
+        tdata->via_addr = regc->via_addr;
+        tdata->via_tp = regc->via_tp;
+    }
+
     /* Need to unlock the regc temporarily while sending the message to
      * prevent deadlock (https://trac.pjsip.org/repos/ticket/1247).