Changeset 981 for pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Feb 19, 2007 10:19:23 PM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #113: INVITE transaction is not destroyed immediately when ACK has the same branch as the INVITE

File:

• pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip-ua/sip_inv.c (modified) (2 diffs)

pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip-ua/sip_inv.c

@@ -357 +357 @@
         (*mod_inv.cb.on_tsx_state_changed)(inv, tsx, e);
 
-    /* Clear invite transaction when tsx is terminated. */
-    if (tsx->state==PJSIP_TSX_STATE_TERMINATED && tsx == inv->invite_tsx)
+    /* Clear invite transaction when tsx is confirmed. 
+     * Previously we set invite_tsx to NULL only when transaction has
+     * terminated, but this didn't work when ACK has the same Via branch
+     * 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;
 }
@@ -2376 +2380 @@
             /* Check if we have INVITE pending. */
             if (inv->invite_tsx && inv->invite_tsx!=tsx) {
+                pj_str_t reason;
+
+                reason = pj_str("Another INVITE transaction in progress");
 
                 /* Can not receive re-INVITE while another one is pending. */
-                status = pjsip_dlg_create_response( inv->dlg, rdata, 500, NULL,
-                                                    &tdata);
+                status = pjsip_dlg_create_response( inv->dlg, rdata, 500, 
+                                                    &reason, &tdata);
                 if (status != PJ_SUCCESS)
                     return;