Changeset 4583 for pjproject/trunk

Timestamp:

Aug 21, 2013 9:32:24 AM (11 years ago)

Author:

ming

Message:

Re #817: Fix replying to re-INVITE after it was cancelled (thanks to Saúl Ibarra Corretgé for the patch)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-ua/sip_inv.h (modified) (1 diff)
• src/pjsip-ua/sip_inv.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip-ua/sip_inv.h

@@ -172 +172 @@
      * #pjsip_inv_set_sdp_answer() and the re-INVITE will be answered
      * automatically.
+     *
+     * Remarks: Application may need to monitor on_tsx_state_changed()
+     * callback to check whether the re-INVITE is already answered
+     * automatically with 487 due to being cancelled.
      *
      * @param inv       The invite session.

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

@@ -4272 +4272 @@
 
         /*
-         * 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;
-
+         * Handle strandled incoming CANCEL or CANCEL for re-INVITE
+         */
+        inv_respond_incoming_cancel(inv, tsx, e);
     }
     else if (tsx->method.id == PJSIP_INVITE_METHOD &&