Changeset 1518 for pjproject/trunk

Timestamp:

Oct 24, 2007 8:32:00 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #401: Unable to register when account URI contains display name

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -714 +714 @@
                 if (hdr->expires >= 0 && hdr->expires < expiration) {
                     pjsip_contact_hdr *our_contact;
+                    const pjsip_uri *uri1, *uri2;
 
                     our_contact = (pjsip_contact_hdr*)
@@ -723 +724 @@
                      * that we register.
                      */
-                    if (pjsip_uri_cmp(PJSIP_URI_IN_CONTACT_HDR, 
-                                      hdr->uri, 
-                                      our_contact->uri)==0) 
+
+                    /* Exclude the display name when comparing the URI.
+                     * This is because a well known open source proxy server
+                     * doesn't return the display name in the Contact header
+                     * of the REGISTER response.
+                     */
+                    uri1 = pjsip_uri_get_uri(hdr->uri);
+                    uri2 = pjsip_uri_get_uri(our_contact->uri);
+                    if (pjsip_uri_cmp(PJSIP_URI_IN_CONTACT_HDR, uri1, uri2)==0)
                     {
                         expiration = contact[i]->expires;