Changeset 4455 for pjproject

Timestamp:

Apr 3, 2013 12:54:37 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1651: incoming CANCEL request is not reported in any callbacks

File:

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

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

@@ -624 +624 @@
     (*inv_state_handler[inv->state])(inv, e);
 
-    /* Call on_tsx_state */
-    if (mod_inv.cb.on_tsx_state_changed && inv->notify)
+    /* Call on_tsx_state. CANCEL request is a special case and has been
+     * reported earlier in inv_respond_incoming_cancel()
+     */
+    if (mod_inv.cb.on_tsx_state_changed && inv->notify &&
+        !(tsx->method.id==PJSIP_CANCEL_METHOD &&
+          e->body.tsx_state.type==PJSIP_EVENT_RX_MSG))
+    {
         (*mod_inv.cb.on_tsx_state_changed)(inv, tsx, e);
+    }
 
     /* Clear invite transaction when tsx is confirmed.
@@ -2855 +2861 @@
 static void inv_respond_incoming_cancel(pjsip_inv_session *inv,
                                         pjsip_transaction *cancel_tsx,
-                                        pjsip_rx_data *rdata)
+                                        pjsip_event *e)
 {
     pjsip_tx_data *tdata;
     pjsip_transaction *invite_tsx;
+    pjsip_rx_data *rdata;
     pj_str_t key;
     pj_status_t status;
+
+    pj_assert(e->body.tsx_state.type == PJSIP_EVENT_RX_MSG);
+    rdata = e->body.tsx_state.src.rdata;
+
+    /* https://trac.pjsip.org/repos/ticket/1651
+     * Special treatment for CANCEL. Since here we're responding to CANCEL
+     * automatically (including 487 to INVITE), application will see the
+     * 200/OK response to CANCEL first in the callback, and then 487 to
+     * INVITE, before the CANCEL request itself. And worse, pjsua application
+     * may not see the CANCEL request at all because by the time the CANCEL
+     * request is reported, call has been disconnected and further events
+     * from the INVITE session has been suppressed.
+     */
+    if (mod_inv.cb.on_tsx_state_changed && inv->notify)
+        (*mod_inv.cb.on_tsx_state_changed)(inv, cancel_tsx, e);
 
     /* See if we have matching INVITE server transaction: */
@@ -3755 +3777 @@
          */
 
-        inv_respond_incoming_cancel(inv, tsx, e->body.tsx_state.src.rdata);
+        inv_respond_incoming_cancel(inv, tsx, e);
 
     }
@@ -3879 +3901 @@
          */
 
-        inv_respond_incoming_cancel(inv, tsx, e->body.tsx_state.src.rdata);
+        inv_respond_incoming_cancel(inv, tsx, e);
 
     } else if (tsx->role == PJSIP_ROLE_UAS &&