Changeset 160 for pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c

Timestamp:

Feb 8, 2006 10:44:25 PM (18 years ago)

Author:

bennylp

Message:

Finished invite session UAS implementation

File:

• pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c

@@ -475 +475 @@
     pjsip_dialog *dlg;
 
-    /* Optimized path: bail out early if request doesn't have To tag */
-    if (rdata->msg_info.to->tag.slen == 0)
+    /* Optimized path: bail out early if request is not CANCEL and it doesn't
+     * have To tag 
+     */
+    if (rdata->msg_info.to->tag.slen == 0 && 
+        rdata->msg_info.msg->line.req.method.id != PJSIP_CANCEL_METHOD)
+    {
         return PJ_FALSE;
+    }
 
     /* Lock user agent before looking up the dialog hash table. */
@@ -625 +630 @@
 
     if (rdata->msg_info.cseq->method.id == PJSIP_INVITE_METHOD) {
-        //pj_str_t *to_tag = &rdata->msg_info.to->tag;
+        
+        int st_code = rdata->msg_info.msg->line.status.code;
+        pj_str_t *to_tag = &rdata->msg_info.to->tag;
 
         /* Must hold UA mutex before accessing dialog set. */
@@ -632 +639 @@
         dlg = dlg_set->dlg_list.next;
 
-        /* Forking handling is temporarily disabled. */
-        PJ_TODO(UA_LAYER_HANDLE_FORKING);
-
-#if 0
         while (dlg != (pjsip_dialog*)&dlg_set->dlg_list) {
 
@@ -653 +656 @@
 
         /* If no dialog with matching remote tag is found, this must be
-         * a forked response.
+         * a forked response. Respond to this ONLY when response is non-100
+         * provisional response OR a 2xx response.
          */
-        if (dlg == (pjsip_dialog*)&dlg_set->dlg_list) {
+        if (dlg == (pjsip_dialog*)&dlg_set->dlg_list &&
+            ((st_code/100==1 && st_code!=100) || st_code/100==2)) 
+        {
             /* Report to application about forked condition.
              * Application can either create a dialog or ignore the response.
@@ -678 +684 @@
                 return PJ_TRUE;
             }
+
+        } else if (dlg == (pjsip_dialog*)&dlg_set->dlg_list) {
+
+            /* For 100 or non-2xx response which has different To tag,
+             * pass the response to the first dialog.
+             */
+
+            dlg = dlg_set->dlg_list.next;
+
         }
-#endif
 
         /* Done with the dialog set. */