Changeset 1208 for pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Apr 20, 2007 3:01:50 AM (17 years ago)

Author:

bennylp

Message:

Fix for ticket #220: retransmit timer wasn't cleared when 2xx response for NIT is received, causing assertion failure

File:

• pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip/sip_transaction.c (modified) (3 diffs)

pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsip/sip_transaction.c

@@ -1795 +1795 @@
     pj_assert((tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT) == 0);
 
-    pj_assert(tsx->status_code < 200);
-
-    if (tsx->status_code >= 100)
+    if (tsx->role==PJSIP_ROLE_UAC && tsx->status_code >= 100)
         msec_time = PJSIP_T2_TIMEOUT;
     else
@@ -1803 +1801 @@
 
     if (tsx->role == PJSIP_ROLE_UAC) {
+        pj_assert(tsx->status_code < 200);
         /* Retransmission for non-INVITE transaction caps-off at T2 */
         if (msec_time>PJSIP_T2_TIMEOUT && tsx->method.id!=PJSIP_INVITE_METHOD)
@@ -2422 +2421 @@
                                         &timeout);
 
+            /* Cancel retransmission timer */
+            if (tsx->retransmit_timer._timer_id != -1) {
+                pjsip_endpt_cancel_timer(tsx->endpt, &tsx->retransmit_timer);
+                tsx->retransmit_timer._timer_id = -1;
+            }
+
             /* Move state to Completed, inform TU. */
             tsx_set_state( tsx, PJSIP_TSX_STATE_COMPLETED,