Changeset 4546 for pjproject/trunk

Timestamp:

Jun 27, 2013 10:07:14 AM (11 years ago)

Author:

bennylp

Message:

More re #1683:

• also update the Via port when only the port has changed AND either the received IP is public OR allow_contact_rewrite is set to 2

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)

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

@@ -1452 +1452 @@
 
     /* If allow_via_rewrite is enabled, we save the Via "received" address
-     * from the response.
+     * from the response, if either of the following condition is met:
+     *  - the Via "received" address differs from saved one (or we haven't
+     *    saved any yet)
+     *  - transport is different
+     *  - only the port has changed, AND either the received address is
+     *    public IP or allow_contact_rewrite is 2
      */
     if (acc->cfg.allow_via_rewrite &&
-        (pj_strcmp(&acc->via_addr.host, via_addr) || acc->via_tp != tp))
+        (pj_strcmp(&acc->via_addr.host, via_addr) || acc->via_tp != tp ||
+         (acc->via_addr.port != rport &&
+           (!is_private_ip(via_addr) || acc->cfg.allow_contact_rewrite == 2))))
     {
         if (pj_strcmp(&acc->via_addr.host, via_addr))