Changeset 5714 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Dec 13, 2017 8:16:30 AM (6 years ago)

Author:

nanang

Message:

Fixed #2076:

• Ignore transport error on completed transaction.
• Don't disconnect call if transport error happens on transaction that is not initial INVITE transaction.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (2 diffs)

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

@@ -2045 +2045 @@
         lock_timer(tsx);
         tsx->transport_err = (pj_status_t)-sent;
-        tsx_cancel_timer(tsx, &tsx->timeout_timer);
-        tsx_schedule_timer(tsx, &tsx->timeout_timer, &delay,
-                           TRANSPORT_ERR_TIMER);
+        /* Don't cancel timeout timer if tsx state is already
+         * PJSIP_TSX_STATE_COMPLETED (see #2076).
+         */
+        if (tsx->state < PJSIP_TSX_STATE_COMPLETED) {
+            tsx_cancel_timer(tsx, &tsx->timeout_timer);
+            tsx_schedule_timer(tsx, &tsx->timeout_timer, &delay,
+                               TRANSPORT_ERR_TIMER);
+        }
         unlock_timer(tsx);
    }
@@ -2078 +2083 @@
         lock_timer(tsx);
         tsx->transport_err = info->status;
-        tsx_cancel_timer(tsx, &tsx->timeout_timer);
-        tsx_schedule_timer(tsx, &tsx->timeout_timer, &delay,
-                           TRANSPORT_ERR_TIMER);
+        /* Don't cancel timeout timer if tsx state is already
+         * PJSIP_TSX_STATE_COMPLETED (see #2076).
+         */
+        if (tsx->state < PJSIP_TSX_STATE_COMPLETED) {
+            tsx_cancel_timer(tsx, &tsx->timeout_timer);
+            tsx_schedule_timer(tsx, &tsx->timeout_timer, &delay,
+                               TRANSPORT_ERR_TIMER);
+        }
         unlock_timer(tsx);
     }