Changeset 4787 for pjproject/trunk

Timestamp:

Mar 11, 2014 2:50:36 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1746: Assertion in sip_transaction.c when ACK and retransmit timer events occur simultaneously

File:

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

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -3243 +3243 @@
 
     } else if (event->type == PJSIP_EVENT_TIMER) {
-        /* Must be from timeout_timer_. */
-        pj_assert(event->body.timer.entry == &tsx->timeout_timer);
-
-        /* Move to Terminated state. */
-        tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED,
-                       PJSIP_EVENT_TIMER, &tsx->timeout_timer );
-
-        /* Transaction has been destroyed. */
-        //return PJSIP_ETSXDESTROYED;
-
+        /* Ignore overlapped retransmit timer.
+         * https://trac.pjsip.org/repos/ticket/1746
+         */
+        if (event->body.timer.entry == &tsx->retransmit_timer) {
+            /* Ignore */
+        } else {
+            /* Must be from timeout_timer_. */
+            pj_assert(event->body.timer.entry == &tsx->timeout_timer);
+
+            /* Move to Terminated state. */
+            tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED,
+                           PJSIP_EVENT_TIMER, &tsx->timeout_timer );
+
+            /* Transaction has been destroyed. */
+            //return PJSIP_ETSXDESTROYED;
+        }
     } else {
         pj_assert(!"Unexpected event");