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

Timestamp:

Oct 24, 2011 9:28:13 AM (13 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3557:r3832

TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_transaction.c (modified) (4 diffs)

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

@@ -146 +146 @@
 #define TIMER_INACTIVE  0
 #define TIMER_ACTIVE    1
-
-/* Delay for 1xx retransmission (should be 60 seconds).
- * Specify 0 to disable this feature
- */
-#ifndef PJSIP_TSX_1XX_RETRANS_DELAY
-#   define PJSIP_TSX_1XX_RETRANS_DELAY    60
-#endif
 
 
@@ -2119 +2112 @@
 static void tsx_resched_retransmission( pjsip_transaction *tsx )
 {
-    pj_time_val timeout;
     pj_uint32_t msec_time;
 
@@ -2152 +2144 @@
     }
 
-    timeout.sec = msec_time / 1000;
-    timeout.msec = msec_time % 1000;
-    tsx->retransmit_timer.id = TIMER_ACTIVE;
-    pjsip_endpt_schedule_timer( tsx->endpt, &tsx->retransmit_timer, 
-                                &timeout);
+    if (msec_time != 0) {
+        pj_time_val timeout;
+
+        timeout.sec = msec_time / 1000;
+        timeout.msec = msec_time % 1000;
+        tsx->retransmit_timer.id = TIMER_ACTIVE;
+        pjsip_endpt_schedule_timer( tsx->endpt, &tsx->retransmit_timer, 
+                                    &timeout);
+    }
 }
 
@@ -2988 +2984 @@
         }
         lock_timer(tsx);
+        /* In the short period above timer may have been inserted
+         * by set_timeout() (by CANCEL). Cancel it if necessary. See:
+         *  https://trac.pjsip.org/repos/ticket/1374
+         */
+        if (tsx->timeout_timer.id)
+            pjsip_endpt_cancel_timer( tsx->endpt, &tsx->timeout_timer );
         tsx->timeout_timer.id = TIMER_ACTIVE;
         pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, &timeout);