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

Timestamp:

Mar 20, 2008 2:40:50 PM (17 years ago)

Author:

bennylp

Message:

Ticket #514: bug with handling simultaneous outgoing re-INVITE, the invite session does not check if we have an ongoing INVITE transaction (thanks Philippe Leuba)

File:

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

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

@@ -2071 +2071 @@
         pjsip_dlg_inc_lock(inv->dlg);
 
+        /* Check again that we didn't receive incoming re-INVITE */
+        if (inv->invite_tsx) {
+            pjsip_tx_data_dec_ref(tdata);
+            pjsip_dlg_dec_lock(inv->dlg);
+            return PJ_EINVALIDOP;
+        }
+
+        /* Associate our data in outgoing invite transaction */
         tsx_inv_data = PJ_POOL_ZALLOC_T(inv->pool, struct tsx_inv_data);
         tsx_inv_data->inv = inv;
@@ -3275 +3283 @@
              tsx->role == PJSIP_ROLE_UAC)
     {
+        /* Must not have other pending INVITE transaction */
+        pj_assert(inv->invite_tsx==NULL || tsx==inv->invite_tsx);
+
         /*
          * Handle outgoing re-INVITE
          */
-        if (tsx->state == PJSIP_TSX_STATE_TERMINATED &&
-            tsx->status_code/100 == 2) 
+        if (tsx->state == PJSIP_TSX_STATE_CALLING) {
+
+            /* Save pending invite transaction */
+            inv->invite_tsx = tsx;
+
+        } else if (tsx->state == PJSIP_TSX_STATE_TERMINATED &&
+                   tsx->status_code/100 == 2) 
         {