Changeset 3001 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Nov 10, 2009 3:45:42 AM (14 years ago)

Author:

bennylp

Message:

Ticket #864: Revise on account registration Contact update rule

• don't switch if only port number is different and the Via received address is private
• always update the transport (i.e. Via) address as well

File:

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

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

@@ -682 +682 @@
     if (acc->cfg.allow_contact_rewrite != 2 && !is_private_ip(&uri->host) &&
         !is_private_ip(&srv_ip) && is_private_ip(via_addr))
+    {
+        /* Don't switch */
+        pj_pool_release(pool);
+        return PJ_FALSE;
+    }
+
+    /* Also don't switch if only the port number part is different, and
+     * the Via received address is private.
+     * See http://trac.pjsip.org/repos/ticket/864
+     */
+    if (acc->cfg.allow_contact_rewrite != 2 &&
+        pj_sockaddr_cmp(&contact_addr, &recv_addr)==0 &&
+        is_private_ip(via_addr))
     {
         /* Don't switch */
@@ -744 +757 @@
     }
 
-    /* For UDP transport, if STUN is enabled then update the transport's
-     * published name as well.
-     */
-    if (tp->key.type==PJSIP_TRANSPORT_UDP &&
-        (pjsua_var.ua_cfg.stun_domain.slen != 0 ||
-         pjsua_var.ua_cfg.stun_host.slen != 0))
-    {
-        pj_strdup_with_null(tp->pool, &tp->local_name.host, via_addr);
-        tp->local_name.port = rport;
-    }
+    /* Always update, by http://trac.pjsip.org/repos/ticket/864. */
+    pj_strdup_with_null(tp->pool, &tp->local_name.host, via_addr);
+    tp->local_name.port = rport;
 
     /* Perform new registration */