Changeset 1555 for pjproject/trunk

Timestamp:

Nov 6, 2007 8:59:17 AM (17 years ago)

Author:

bennylp

Message:

Fixed bug in route set calculation: prevent updating route set upon receiving failure response (e.g. 401/407 response), and remove the first_cseq check since this would not work when the first request is challenged

File:

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

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

@@ -1561 +1561 @@
             return;
 
-        /* Ignore subsequent responses with higher CSeq than initial CSeq */
-        if (msg_cseq != dlg->local.first_cseq)
-            return;
+        /* Ignore subsequent responses with higher CSeq than initial CSeq.
+         * Unfortunately this would be broken when the first request is 
+         * challenged!
+         */
+        //if (msg_cseq != dlg->local.first_cseq)
+        //    return;
 
     } else {
@@ -1577 +1580 @@
     /* Based on the checks above, we should only get response message here */
     pj_assert(msg->type == PJSIP_RESPONSE_MSG);
+
+    /* Ignore if this is not 1xx or 2xx response */
+    if (msg->line.status.code >= 300)
+        return;
 
     /* Reset route set */
@@ -1592 +1599 @@
     }
 
+    PJ_LOG(5,(dlg->obj_name, "Route-set updated"));
+
     /* Freeze the route set only when the route set comes in 2xx response. 
      * If it is in 1xx response, prepare to recompute the route set when 
@@ -1600 +1609 @@
      * it is safer to not freeze the route set (thus recompute the route set
      * upon receiving 2xx response). Also RFC 3261 says so in 13.2.2.4.
-     */
-    if (PJSIP_IS_STATUS_IN_CLASS(msg->line.status.code, 200)) {
+     *
+     * The pjsip_method_creates_dialog() check protects from wrongly 
+     * freezing the route set upon receiving 200/OK response for PRACK.
+     */
+    if (pjsip_method_creates_dialog(&rdata->msg_info.cseq->method) &&
+        PJSIP_IS_STATUS_IN_CLASS(msg->line.status.code, 200)) 
+    {
         dlg->route_set_frozen = PJ_TRUE;
+        PJ_LOG(5,(dlg->obj_name, "Route-set frozen"));
     }
 }