Changeset 2316 for pjproject/trunk

Timestamp:

Sep 24, 2008 4:52:41 PM (16 years ago)

Author:

bennylp

Message:

Ticket #643: Do not try to re-register with a new Contact when the REGISTER response contains private IP address

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1358 +1358 @@
 
     /*  */
-    if (acc_cfg->allow_contact_rewrite==0)
+    if (acc_cfg->allow_contact_rewrite!=1)
     {
         pj_ansi_sprintf(line, "--auto-update-nat %i\n",

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

@@ -538 +538 @@
 }
 
+/* Check if IP is private IP address */
+static pj_bool_t is_private_ip(const pj_str_t *addr)
+{
+    const pj_str_t private_net[] = 
+    {
+        { "10.", 3 },
+        { "127.", 4 },
+        { "172.16.", 7 },
+        { "192.168.", 8 }
+    };
+    unsigned i;
+
+    for (i=0; i<PJ_ARRAY_SIZE(private_net); ++i) {
+        if (pj_strncmp(addr, &private_net[i], private_net[i].slen)==0)
+            return PJ_TRUE;
+    }
+
+    return PJ_FALSE;
+}
 
 /* Update NAT address from the REGISTER response */
@@ -549 +568 @@
     pjsip_sip_uri *uri;
     pjsip_via_hdr *via;
+    pj_str_t srv_ip;
 
     tp = param->rdata->tp_info.transport;
@@ -614 +634 @@
     }
 
+    /* Get server IP */
+    srv_ip = pj_str(param->rdata->pkt_info.src_name);
+
     /* At this point we've detected that the address as seen by registrar.
      * has changed.
      */
+
+    /* Do not switch if both Contact and server's IP address are
+     * public but response contains private IP. A NAT in the middle
+     * might have messed up with the SIP packets.
+     */
+    if (!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;
+    }
+
     PJ_LOG(3,(THIS_FILE, "IP address change detected for account %d "
                          "(%.*s:%d --> %.*s:%d). Updating registration..",