Changeset 979

Timestamp:

Feb 19, 2007 4:55:42 PM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #111: workaround for forking dialog

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_dialog.h (modified) (1 diff)
• src/pjsip/sip_dialog.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_dialog.h

@@ -125 +125 @@
     pjsip_dlg_party     remote;     /**< Remote party info.                 */
     pjsip_role_e        role;       /**< Initial role.                      */
+    pj_bool_t           uac_has_2xx;/**< UAC has received 2xx response?     */
     pj_bool_t           secure;     /**< Use secure transport?              */
     pjsip_cid_hdr      *call_id;    /**< Call-ID header.                    */

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

@@ -1519 +1519 @@
     /* When we receive response that establishes dialog, update To tag, 
      * route set and dialog target.
-     */
-    if (dlg->state == PJSIP_DIALOG_STATE_NULL && 
-        pjsip_method_creates_dialog(&rdata->msg_info.cseq->method) &&
-        (res_code > 100 && res_code < 300) &&
-        rdata->msg_info.to->tag.slen)
+     *
+     * The second condition of the "if" is a workaround for forking.
+     * Originally, the dialog takes the first To tag seen and set it as
+     * the remote tag. If the tag in 2xx response is different than this
+     * tag, ACK will be sent with wrong To tag and incoming request with
+     * this tag will be rejected with 481.
+     *
+     * The workaround for this is to take the To tag received in the
+     * 2xx response and set it as remote tag.
+     */
+    if ((dlg->state == PJSIP_DIALOG_STATE_NULL && 
+         pjsip_method_creates_dialog(&rdata->msg_info.cseq->method) &&
+         (res_code > 100 && res_code < 300) &&
+         rdata->msg_info.to->tag.slen) 
+         ||
+        (dlg->role==PJSIP_ROLE_UAC &&
+         !dlg->uac_has_2xx &&
+         res_code/100 == 2 &&
+         pjsip_method_creates_dialog(&rdata->msg_info.cseq->method) &&
+         pj_strcmp(&dlg->remote.info->tag, &rdata->msg_info.to->tag)))
     {
         pjsip_hdr *hdr, *end_hdr;
@@ -1564 +1579 @@
 
         dlg->state = PJSIP_DIALOG_STATE_ESTABLISHED;
+
+        /* Prevent dialog from being updated just in case more 2xx
+         * gets through this dialog (it shouldn't happen).
+         */
+        if (dlg->role==PJSIP_ROLE_UAC && !dlg->uac_has_2xx && 
+            res_code/100==2) 
+        {
+            dlg->uac_has_2xx = PJ_TRUE;
+        }
     }