Changeset 1026

Timestamp:

Mar 1, 2007 6:39:37 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #153: UAC dialog doesn't update route_set when calling RFC 2543 UAS (thanks Binu K S)

File:

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

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

@@ -1516 +1516 @@
 }
 
+/* Update route-set from incoming message */
+static void dlg_update_routeset(pjsip_dialog *dlg, const pjsip_msg *msg)
+{
+    const pjsip_hdr *hdr, *end_hdr;
+
+    pj_list_init(&dlg->route_set);
+
+    end_hdr = &msg->hdr;
+    for (hdr=msg->hdr.prev; hdr!=end_hdr; hdr=hdr->prev) {
+        if (hdr->type == PJSIP_H_RECORD_ROUTE) {
+            pjsip_route_hdr *r;
+            r = pjsip_hdr_clone(dlg->pool, hdr);
+            pjsip_routing_hdr_set_route(r);
+            pj_list_push_back(&dlg->route_set, r);
+        }
+    }
+}
+
 /* This function is called by user agent upon receiving incoming response
  * message.
@@ -1522 +1540 @@
 {
     unsigned i;
+    pj_bool_t routeset_updated = PJ_FALSE;
     int res_code;
 
@@ -1559 +1578 @@
          pj_strcmp(&dlg->remote.info->tag, &rdata->msg_info.to->tag)))
     {
-        pjsip_hdr *hdr, *end_hdr;
         pjsip_contact_hdr *contact;
 
@@ -1575 +1593 @@
          * route set for future requests in this dialog.
          */
-        pj_list_init(&dlg->route_set);
-
-        end_hdr = &rdata->msg_info.msg->hdr;
-        for (hdr=rdata->msg_info.msg->hdr.prev; hdr!=end_hdr; hdr=hdr->prev) {
-            if (hdr->type == PJSIP_H_RECORD_ROUTE) {
-                pjsip_route_hdr *r;
-                r = pjsip_hdr_clone(dlg->pool, hdr);
-                pjsip_routing_hdr_set_route(r);
-                pj_list_push_back(&dlg->route_set, r);
-            }
-        }
+        dlg_update_routeset(dlg, rdata->msg_info.msg);
+        routeset_updated = PJ_TRUE;
 
         /* The remote target MUST be set to the URI from the Contact header 
@@ -1611 +1620 @@
     /* Update remote target (again) when receiving 2xx response messages
      * that's defined as target refresh. 
+     *
+     * Also upon receiving 2xx response, recheck again the route set.
+     * This is for compatibility with RFC 2543, as described in Section
+     * 13.2.2.4 of RFC 3261:
+
+        If the dialog identifier in the 2xx response matches the dialog
+        identifier of an existing dialog, the dialog MUST be transitioned to
+        the "confirmed" state, and the route set for the dialog MUST be
+        recomputed based on the 2xx response using the procedures of Section
+        12.2.1.2. 
+
+        Note that the only piece of state that is recomputed is the route
+        set.  Other pieces of state such as the highest sequence numbers
+        (remote and local) sent within the dialog are not recomputed.  The
+        route set only is recomputed for backwards compatibility.  RFC
+        2543 did not mandate mirroring of the Record-Route header field in
+        a 1xx, only 2xx.
      */
     if (pjsip_method_creates_dialog(&rdata->msg_info.cseq->method) &&
@@ -1623 +1649 @@
             dlg->target = dlg->remote.contact->uri;
         }
+
+        if (!routeset_updated) {
+            dlg_update_routeset(dlg, rdata->msg_info.msg);
+            routeset_updated = PJ_TRUE;
+        }
     }