Changeset 3586 for pjproject/branches/1.x

Timestamp:

Jun 16, 2011 1:15:04 PM (13 years ago)

Author:

nanang

Message:

Re #1306:

• Moved PJSIP_TSX_1XX_RETRANS_DELAY definition to sip_config.h.
• Updated retransmission mechanism to skip retransmission rescheduling when the interval is zero.

Location:

pjproject/branches/1.x/pjsip

Files:

• include/pjsip/sip_config.h (modified) (1 diff)
• src/pjsip/sip_transaction.c (modified) (3 diffs)

pjproject/branches/1.x/pjsip/include/pjsip/sip_config.h

@@ -669 +669 @@
 #endif
 
+/**
+ * Delay for non-100 1xx retransmission, in seconds.
+ * Set to 0 to disable this feature.
+ *
+ * Default: 60 seconds
+ */
+#ifndef PJSIP_TSX_1XX_RETRANS_DELAY
+#   define PJSIP_TSX_1XX_RETRANS_DELAY  60
+#endif
+
 #define PJSIP_MAX_TSX_KEY_LEN           (PJSIP_MAX_URL_SIZE*2)
 

pjproject/branches/1.x/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
 
 
@@ -2096 +2089 @@
 static void tsx_resched_retransmission( pjsip_transaction *tsx )
 {
-    pj_time_val timeout;
     pj_uint32_t msec_time;
 
@@ -2129 +2121 @@
     }
 
-    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);
+    }
 }