Changeset 4703 for pjproject/trunk

Timestamp:

Jan 7, 2014 10:55:10 AM (11 years ago)

Author:

riza

Message:

Re #1721: Clear invite transaction before calling on_call_tsx_state (on transaction terminated)

File:

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

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

@@ -656 +656 @@
     (*inv_state_handler[inv->state])(inv, e);
 
+    /* Clear invite transaction when tsx is terminated. 
+     * Necessary for app that wants to send a new re-INVITE request immediately
+     * after the transaction is terminated. 
+     */
+    if (tsx->state==PJSIP_TSX_STATE_TERMINATED  && tsx == inv->invite_tsx) {
+        inv->invite_tsx = NULL;    
+
+        if (inv->last_answer) {
+                pjsip_tx_data_dec_ref(inv->last_answer);
+                inv->last_answer = NULL;
+        }
+    }
+
     /* Call on_tsx_state. CANCEL request is a special case and has been
      * reported earlier in inv_respond_incoming_cancel()
@@ -671 +684 @@
      * value as the INVITE (see http://www.pjsip.org/trac/ticket/113)
      */
-    if (tsx->state>=PJSIP_TSX_STATE_CONFIRMED && tsx == inv->invite_tsx) {
-        inv->invite_tsx = NULL;
+    if (tsx->state>=PJSIP_TSX_STATE_CONFIRMED && tsx == inv->invite_tsx) {      
+        inv->invite_tsx = NULL;
+
         if (inv->last_answer) {
                 pjsip_tx_data_dec_ref(inv->last_answer);