Changeset 2179 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

Timestamp:

Jul 28, 2008 6:57:36 PM (16 years ago)

Author:

bennylp

Message:

Ticket #580: Incoming target refresh request does not update the Contact header (thanks Joel Dodson for the report)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_dialog.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -1501 +1501 @@
     }
 
+    /* Update the target URI if this is a target refresh request.
+     * We have passed the basic checking for the request, I think we
+     * should update the target URI regardless of whether the request
+     * is accepted or not (e.g. when re-INVITE is answered with 488,
+     * we would still need to update the target URI, otherwise our
+     * target URI would be wrong, wouldn't it).
+     */
+    if (pjsip_method_creates_dialog(&rdata->msg_info.cseq->method)) {
+        pjsip_contact_hdr *contact;
+
+        contact = (pjsip_contact_hdr*)
+                  pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
+                                     NULL);
+        if (contact && (dlg->remote.contact==NULL ||
+                        pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI, 
+                                      dlg->remote.contact->uri, 
+                                      contact->uri)))
+        {
+            dlg->remote.contact = (pjsip_contact_hdr*) 
+                                  pjsip_hdr_clone(dlg->pool, contact);
+            dlg->target = dlg->remote.contact->uri;
+        }
+    }
+
     /* Report the request to dialog usages. */
     for (i=0; i<dlg->usage_cnt; ++i) {
@@ -1690 +1714 @@
                   pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
                                      NULL);
-        if (contact) {
+        if (contact && (dlg->remote.contact==NULL ||
+                        pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI, 
+                                      dlg->remote.contact->uri, 
+                                      contact->uri)))
+        {
             dlg->remote.contact = (pjsip_contact_hdr*) 
                                   pjsip_hdr_clone(dlg->pool, contact);
@@ -1736 +1764 @@
                                                           PJSIP_H_CONTACT, 
                                                           NULL);
-        if (contact) {
+        if (contact && (dlg->remote.contact==NULL ||
+                        pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI, 
+                                      dlg->remote.contact->uri, 
+                                      contact->uri)))
+        {
             dlg->remote.contact = (pjsip_contact_hdr*) 
                                   pjsip_hdr_clone(dlg->pool, contact);