Changeset 2745

Timestamp:

Jun 4, 2009 3:51:39 PM (15 years ago)

Author:

bennylp

Message:

Ticket #863: Account may always re-register with IPv6, due to string comparison of IPv6 address. Note: this needs ticket #878)

File:

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

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

@@ -569 +569 @@
     pjsip_sip_uri *uri;
     pjsip_via_hdr *via;
+    pj_sockaddr contact_addr;
+    pj_sockaddr recv_addr;
+    pj_status_t status;
+    pj_bool_t matched;
     pj_str_t srv_ip;
 
@@ -627 +631 @@
     }
 
-    if (uri->port == rport &&
-        pj_stricmp(&uri->host, via_addr)==0)
-    {
+    /* Convert IP address strings into sockaddr for comparison.
+     * (http://trac.pjsip.org/repos/ticket/863)
+     */
+    status = pj_sockaddr_parse(pj_AF_UNSPEC(), 0, &uri->host, 
+                               &contact_addr);
+    if (status == PJ_SUCCESS)
+        status = pj_sockaddr_parse(pj_AF_UNSPEC(), 0, via_addr, 
+                                   &recv_addr);
+    if (status == PJ_SUCCESS) {
+        /* Compare the addresses as sockaddr according to the ticket above */
+        matched = (uri->port == rport &&
+                   pj_sockaddr_cmp(&contact_addr, &recv_addr)==0);
+    } else {
+        /* Compare the addresses as string, as before */
+        matched = (uri->port == rport &&
+                   pj_stricmp(&uri->host, via_addr)==0);
+    }
+
+    if (matched) {
         /* Address doesn't change */
         pj_pool_release(pool);