Changeset 1415 for pjproject/trunk

Timestamp:

Aug 12, 2007 4:12:17 AM (17 years ago)

Author:

bennylp

Message:

Ticket #362: Transaction timer I in Completed state should be zero for reliable transports (thanks Ivan F. Skripov)

File:

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

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

@@ -2641 +2641 @@
 
         } else {
+            pj_time_val timeout;
+
             /* Process incoming ACK request. */
 
@@ -2650 +2652 @@
             tsx->transport_flag &= ~(TSX_HAS_PENDING_RESCHED);
 
-            /* Start timer I in T4 interval (transaction termination). */
+            /* Reschedule timeout timer. */
             pjsip_endpt_cancel_timer( tsx->endpt, &tsx->timeout_timer );
             tsx->timeout_timer.id = TIMER_ACTIVE;
+
+            /* Timer I is T4 timer for unreliable transports, and
+             * zero seconds for reliable transports.
+             */
+            if (PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport)==0) {
+                timeout.sec = 0; 
+                timeout.msec = 0;
+            } else {
+                timeout.sec = t4_timer_val.sec;
+                timeout.msec = t4_timer_val.msec;
+            }
             pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, 
-                                        &t4_timer_val);
+                                        &timeout);
 
             /* Move state to "Confirmed" */