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

pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

@@ -95 +95 @@
     pjsip_route_hdr              route_set;
     pjsip_hdr                    usr_hdr;
+    pjsip_host_port              via_addr;
+    const void                  *via_tp;
 
     /* Authorization sessions. */
@@ -342 +344 @@
         h = h->next;
     }
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pjsip_publishc_set_via_sent_by(pjsip_publishc *pubc,
+                                                   pjsip_host_port *via_addr,
+                                                   pjsip_transport *via_tp)
+{
+    PJ_ASSERT_RETURN(pubc, PJ_EINVAL);
+
+    if (!via_addr)
+        pj_bzero(&pubc->via_addr, sizeof(pubc->via_addr));
+    else
+        pubc->via_addr = *via_addr;
+    pubc->via_tp = via_tp;
 
     return PJ_SUCCESS;
@@ -740 +757 @@
     pj_mutex_unlock(pubc->mutex);
 
+    /* If via_addr is set, use this address for the Via header. */
+    if (pubc->via_addr.host.slen > 0) {
+        tdata->via_addr = pubc->via_addr;
+        tdata->via_tp = pubc->via_tp;
+    }
+
     /* Invalidate message buffer. */
     pjsip_tx_data_invalidate_msg(tdata);