Changeset 5147 for pjproject/trunk

Timestamp:

Aug 6, 2015 6:28:51 AM (9 years ago)

Author:

ming

Message:

Fixed #1875: Assertion in rescheduling PJSIP retransmission

File:

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

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

@@ -1849 +1849 @@
         }
 
-        /* Need to reschedule retransmission? */
-        if (tsx->transport_flag & TSX_HAS_PENDING_RESCHED) {
+        /* Need to reschedule retransmission?
+         * Note that when sending a pending message above, tsx_send_msg()
+         * may set the flag TSX_HAS_PENDING_TRANSPORT.
+         * Please refer to ticket #1875.
+         */
+        if (tsx->transport_flag & TSX_HAS_PENDING_RESCHED &&
+            !(tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT))
+        {
             tsx->transport_flag &= ~(TSX_HAS_PENDING_RESCHED);