Changeset 576 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Jul 2, 2006 2:53:05 PM (18 years ago)

Author:

bennylp

Message:

Final changeset from the PROTOS testing, fixed misc. crashes. See
mailing list archive for the details

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -233 +233 @@
     method = &rdata->msg_info.msg->line.req.method;
 
-    if (method->id == PJSIP_INVITE_METHOD ||
-        method->id == PJSIP_CANCEL_METHOD ||
-        method->id == PJSIP_BYE_METHOD)
+    if (method->id == PJSIP_INVITE_METHOD) {
+        return PJ_TRUE;
+    }
+
+    /* BYE and CANCEL must have existing invite session */
+    if (method->id == PJSIP_BYE_METHOD ||
+        method->id == PJSIP_CANCEL_METHOD)
     {
+        if (inv == NULL)
+            return PJ_FALSE;
+
         return PJ_TRUE;
     }
@@ -781 +788 @@
 
         *p_tdata = tdata;
+
+        /* Can not return PJ_SUCCESS when response message is produced.
+         * Ref: PROTOS test ~#2490
+         */
+        if (status == PJ_SUCCESS)
+            status = PJSIP_ERRNO_FROM_SIP_STATUS(code);
+
     }
 
@@ -2205 +2219 @@
 
     }
-
+    else if (tsx->method.id == PJSIP_CANCEL_METHOD &&
+             tsx->role == PJSIP_ROLE_UAS &&
+             tsx->status_code < 200 &&
+             e->body.tsx_state.type == PJSIP_EVENT_RX_MSG) 
+    {
+
+        /*
+         * Handle strandled incoming CANCEL.
+         */
+        pjsip_rx_data *rdata = e->body.tsx_state.src.rdata;
+        pjsip_tx_data *tdata;
+        pj_status_t status;
+
+        status = pjsip_dlg_create_response(dlg, rdata, 200, NULL, &tdata);
+        if (status != PJ_SUCCESS) return;
+
+        status = pjsip_dlg_send_response(dlg, tsx, tdata);
+        if (status != PJ_SUCCESS) return;
+
+    }
 }
 
@@ -2243 +2276 @@
 
         inv_respond_incoming_bye( inv, tsx, e->body.tsx_state.src.rdata, e );
+
+    }
+    else if (tsx->method.id == PJSIP_CANCEL_METHOD &&
+             tsx->role == PJSIP_ROLE_UAS &&
+             tsx->status_code < 200 &&
+             e->body.tsx_state.type == PJSIP_EVENT_RX_MSG) 
+    {
+
+        /*
+         * Handle strandled incoming CANCEL.
+         */
+        pjsip_rx_data *rdata = e->body.tsx_state.src.rdata;
+        pjsip_tx_data *tdata;
+        pj_status_t status;
+
+        status = pjsip_dlg_create_response(dlg, rdata, 200, NULL, &tdata);
+        if (status != PJ_SUCCESS) return;
+
+        status = pjsip_dlg_send_response(dlg, tsx, tdata);
+        if (status != PJ_SUCCESS) return;
 
     }
@@ -2378 +2431 @@
     PJ_ASSERT_ON_FAIL(tsx && dlg, return);
 
-    if (tsx->method.id == PJSIP_BYE_METHOD &&
-        tsx->role == PJSIP_ROLE_UAS &&
+    if (tsx->role == PJSIP_ROLE_UAS &&
         tsx->status_code < 200 &&
         e->body.tsx_state.type == PJSIP_EVENT_RX_MSG) 
     {
+        pjsip_rx_data *rdata = e->body.tsx_state.src.rdata;
 
         /*
-         * Be nice, handle incoming BYE.
+         * Respond BYE with 200/OK
          */
-
-        inv_respond_incoming_bye( inv, tsx, e->body.tsx_state.src.rdata, e );
-
-    }
-}
-
+        if (tsx->method.id == PJSIP_BYE_METHOD) {
+            inv_respond_incoming_bye( inv, tsx, rdata, e );
+        } else if (tsx->method.id == PJSIP_CANCEL_METHOD) {
+            /*
+             * Respond CANCEL with 200/OK too.
+             */
+            pjsip_tx_data *tdata;
+            pj_status_t status;
+
+            status = pjsip_dlg_create_response(dlg, rdata, 200, NULL, &tdata);
+            if (status != PJ_SUCCESS) return;
+
+            status = pjsip_dlg_send_response(dlg, tsx, tdata);
+            if (status != PJ_SUCCESS) return;
+
+        }
+    }
+}
+