Changeset 2739 for pjproject

Timestamp:

Jun 3, 2009 10:19:44 AM (15 years ago)

Author:

bennylp

Message:

Ticket #822: Retransmit provisional response every 1 minute

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (5 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
 
 
@@ -1950 +1957 @@
 {
     pj_time_val timeout;
-    unsigned msec_time;
+    pj_uint32_t msec_time;
 
     pj_assert((tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT) == 0);
@@ -1968 +1975 @@
         }
     } else {
-        /* Retransmission of INVITE final response also caps-off at T2 */
-        pj_assert(tsx->status_code >= 200);
-        if (msec_time > pjsip_cfg()->tsx.t2)
-            msec_time = pjsip_cfg()->tsx.t2;
+        /* For UAS, this can be retransmission of 2xx response for INVITE
+         * or non-100 1xx response.
+         */
+        if (tsx->status_code < 200) {
+            /* non-100 1xx retransmission is at 60 seconds */
+            msec_time = PJSIP_TSX_1XX_RETRANS_DELAY * 1000;
+        } else {
+            /* Retransmission of INVITE final response also caps-off at T2 */
+            pj_assert(tsx->status_code >= 200);
+            if (msec_time > pjsip_cfg()->tsx.t2)
+                msec_time = pjsip_cfg()->tsx.t2;
+        }
     }
 
@@ -2339 +2354 @@
                            PJSIP_EVENT_TX_MSG, tdata );
 
+            /* Retransmit provisional response every 1 minute if this is
+             * an INVITE provisional response greater than 100.
+             */
+            if (PJSIP_TSX_1XX_RETRANS_DELAY > 0 && 
+                tsx->method.id==PJSIP_INVITE_METHOD && tsx->status_code>100)
+            {
+
+                /* Stop 1xx retransmission timer, if any */
+                if (tsx->retransmit_timer.id) {
+                    pjsip_endpt_cancel_timer(tsx->endpt, 
+                                             &tsx->retransmit_timer);
+                    tsx->retransmit_timer.id = 0;
+                }
+
+                /* Schedule retransmission */
+                tsx->retransmit_count = 0;
+                if (tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT) {
+                    tsx->transport_flag |= TSX_HAS_PENDING_RESCHED;
+                } else {
+                    pj_time_val delay = {PJSIP_TSX_1XX_RETRANS_DELAY, 0};
+
+                    tsx->retransmit_timer.id = TIMER_ACTIVE;
+                    pjsip_endpt_schedule_timer( tsx->endpt, 
+                                                &tsx->retransmit_timer,
+                                                &delay);
+                }
+            }
+
         } else if (PJSIP_IS_STATUS_IN_CLASS(tsx->status_code, 200)) {
+
+            /* Stop 1xx retransmission timer, if any */
+            if (tsx->retransmit_timer.id) {
+                pjsip_endpt_cancel_timer(tsx->endpt, &tsx->retransmit_timer);
+                tsx->retransmit_timer.id = 0;
+            }
 
             if (tsx->method.id == PJSIP_INVITE_METHOD && tsx->handle_200resp==0) {
@@ -2410 +2459 @@
         } else if (tsx->status_code >= 300) {
 
+            /* Stop 1xx retransmission timer, if any */
+            if (tsx->retransmit_timer.id) {
+                pjsip_endpt_cancel_timer(tsx->endpt, &tsx->retransmit_timer);
+                tsx->retransmit_timer.id = 0;
+            }
+
             /* 3xx-6xx class message causes transaction to move to 
              * "Completed" state.