Changeset 3964

Timestamp:

Mar 6, 2012 7:18:23 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1460: Allow call to transition to CONFIRMED state even when SDP negotiation is pending if the pending negotiation is an updated offer and not the original one with the INVITE transaction

File:

• pjproject/branches/1.x/pjsip/src/pjsip-ua/sip_inv.c (modified) (1 diff)

pjproject/branches/1.x/pjsip/src/pjsip-ua/sip_inv.c

@@ -213 +213 @@
      */
     if (state == PJSIP_INV_STATE_CONFIRMED) {
-        if (pjmedia_sdp_neg_get_state(inv->neg)!=PJMEDIA_SDP_NEG_STATE_DONE) {
+        struct tsx_inv_data *tsx_inv_data = NULL;
+
+        if (inv->invite_tsx) {
+            tsx_inv_data = (struct tsx_inv_data*)
+                           inv->invite_tsx->mod_data[mod_inv.mod.id];
+        }
+
+        if (pjmedia_sdp_neg_get_state(inv->neg)!=PJMEDIA_SDP_NEG_STATE_DONE &&
+            (tsx_inv_data && !tsx_inv_data->sdp_done) )
+        {
             pjsip_tx_data *bye;