Changeset 3755 for pjproject/branches/1.x/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Sep 19, 2011 6:43:49 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1374: Assertion when CANCEL and INVITE final response "crosses the wire"

File:

• pjproject/branches/1.x/pjsip/src/pjsip/sip_transaction.c (modified) (1 diff)

pjproject/branches/1.x/pjsip/src/pjsip/sip_transaction.c

@@ -2961 +2961 @@
         }
         lock_timer(tsx);
+        /* In the short period above timer may have been inserted
+         * by set_timeout() (by CANCEL). Cancel it if necessary. See:
+         *  https://trac.pjsip.org/repos/ticket/1374
+         */
+        if (tsx->timeout_timer.id)
+            pjsip_endpt_cancel_timer( tsx->endpt, &tsx->timeout_timer );
         tsx->timeout_timer.id = TIMER_ACTIVE;
         pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, &timeout);