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

Timestamp:

May 30, 2007 4:26:40 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #302: Behavior in cancelling INVITE session when no provisional response has been received (thanks Esbjörn Dominique)

File:

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

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

@@ -1513 +1513 @@
             if (inv->invite_tsx->status_code < 100) {
 
-                pjsip_tsx_terminate(inv->invite_tsx, 487);
+                pjsip_tsx_stop_retransmit(inv->invite_tsx);
+                inv->cancelling = PJ_TRUE;
+                inv->pending_cancel = PJ_TRUE;
                 *p_tdata = NULL;
+                PJ_LOG(4, (inv->obj_name, "Stopping retransmission, "
+                           "delaying CANCEL"));
                 return PJ_SUCCESS;
             }
@@ -1926 +1930 @@
 
         case PJSIP_TSX_STATE_PROCEEDING:
+            if (inv->pending_cancel) {
+                pjsip_tx_data *cancel;
+
+                inv->pending_cancel = PJ_FALSE;
+
+                status = pjsip_inv_end_session(inv, 487, NULL, &cancel);
+                if (status == PJ_SUCCESS && cancel)
+                    status = pjsip_inv_send_msg(inv, cancel);
+            }
+
             if (dlg->remote.info->tag.slen) {