Changeset 1210 for pjproject/branches/split-3rd-party/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Apr 22, 2007 12:48:30 PM (17 years ago)

Author:

bennylp

Message:

Merged changes from the trunk

File:

• pjproject/branches/split-3rd-party/pjsip/src/pjsip/sip_transaction.c (modified) (7 diffs)

pjproject/branches/split-3rd-party/pjsip/src/pjsip/sip_transaction.c

@@ -133 +133 @@
 static const pj_time_val t1_timer_val = { PJSIP_T1_TIMEOUT/1000, 
                                           PJSIP_T1_TIMEOUT%1000 };
+static const pj_time_val t2_timer_val = { PJSIP_T2_TIMEOUT/1000, 
+                                          PJSIP_T2_TIMEOUT%1000 };
 static const pj_time_val t4_timer_val = { PJSIP_T4_TIMEOUT/1000, 
                                           PJSIP_T4_TIMEOUT%1000 };
@@ -1397 +1399 @@
 
 /*
- * Set the UAC absolute transaction timeout.
- */
-PJ_DEF(pj_status_t) pjsip_tsx_set_uac_timeout(pjsip_transaction *tsx,
-                                              unsigned msec_time,
-                                              pjsip_tsx_timeout_policy policy)
-{
-    PJ_ASSERT_RETURN(tsx && tsx->role==PJSIP_ROLE_UAC &&
-                     tsx->state==PJSIP_TSX_STATE_NULL, PJ_EINVALIDOP);
-
-    tsx->msec_timeout = msec_time;
-    tsx->timeout_policy = policy;
-
-    return PJ_SUCCESS;
-}
-
-
-/*
  * Set transaction status code and reason.
  */
@@ -1810 +1795 @@
     pj_assert((tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT) == 0);
 
-    msec_time = (1 << (tsx->retransmit_count)) * PJSIP_T1_TIMEOUT;
+    if (tsx->role==PJSIP_ROLE_UAC && tsx->status_code >= 100)
+        msec_time = PJSIP_T2_TIMEOUT;
+    else
+        msec_time = (1 << (tsx->retransmit_count)) * PJSIP_T1_TIMEOUT;
 
     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)
@@ -1914 +1903 @@
 
         /* Start Timer B (or called timer F for non-INVITE) for transaction 
-         * timeout. If user has configured the timeout value with 
-         * pjsip_tsx_set_uac_timeout(), use the timeout value there.
+         * timeout.
          */
-        if (tsx->msec_timeout > 0) {
-            pj_time_val timeout;
-
-            timeout.sec = tsx->msec_timeout / 1000;
-            timeout.msec = tsx->msec_timeout % 1000;
-
-            pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, 
-                                        &timeout);
-
-        } else {
-            pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, 
-                                        &timeout_timer_val);
-        }
+        pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, 
+                                    &timeout_timer_val);
 
         /* Start Timer A (or timer E) for retransmission only if unreliable 
@@ -2006 +1983 @@
             return PJSIP_ENOTRESPONSEMSG;
 
-        /* Cancel retransmission timer A. */
-        if (tsx->retransmit_timer._timer_id != -1) {
-            pjsip_endpt_cancel_timer(tsx->endpt, &tsx->retransmit_timer);
-            tsx->retransmit_timer._timer_id = -1;
-        }
+        code = msg->line.status.code;
+
+        /* If the response is final, cancel both retransmission and timeout
+         * timer.
+         */
+        if (code >= 200) {
+            if (tsx->retransmit_timer._timer_id != -1) {
+                pjsip_endpt_cancel_timer(tsx->endpt, &tsx->retransmit_timer);
+                tsx->retransmit_timer._timer_id = -1;
+            }
+
+            if (tsx->timeout_timer._timer_id != -1) {
+                pjsip_endpt_cancel_timer(tsx->endpt, &tsx->timeout_timer);
+                tsx->timeout_timer._timer_id = -1;
+            }
+
+        } else {
+            /* Cancel retransmit timer (for non-INVITE transaction, the
+             * retransmit timer will be rescheduled at T2.
+             */
+            if (tsx->retransmit_timer._timer_id != -1) {
+                pjsip_endpt_cancel_timer(tsx->endpt, &tsx->retransmit_timer);
+                tsx->retransmit_timer._timer_id = -1;
+            }
+
+            /* For provisional response, only cancel retransmit when this
+             * is an INVITE transaction. For non-INVITE, section 17.1.2.1
+             * of RFC 3261 says that:
+             *  - retransmit timer is set to T2
+             *  - timeout timer F is not deleted.
+             */
+            if (tsx->method.id == PJSIP_INVITE_METHOD) {
+
+                /* Cancel timeout timer */
+                pjsip_endpt_cancel_timer(tsx->endpt, &tsx->timeout_timer);
+
+            } else {
+                if (!tsx->is_reliable) {
+                    pjsip_endpt_schedule_timer(tsx->endpt, 
+                                               &tsx->retransmit_timer,
+                                               &t2_timer_val);
+                }
+            }
+        }
+         
         tsx->transport_flag &= ~(TSX_HAS_PENDING_RESCHED);
 
-
-        /* Cancel timer B (transaction timeout) but look at the timeout policy
-         * as set by pjsip_tsx_set_uac_timeout().
-         */
-        code = msg->line.status.code;
-        if ((code==100 && tsx->timeout_policy==PJSIP_TSX_IGNORE_100) ||
-            (code<200 && tsx->timeout_policy==PJSIP_TSX_IGNORE_1xx))
-        {
-            /* Don't cancel the timeout timer */
-        }
-        else {
-            pjsip_endpt_cancel_timer(tsx->endpt, &tsx->timeout_timer);
-        }
 
         /* Discard retransmission message if it is not INVITE.
@@ -2368 +2372 @@
 
     } else {
-        tsx_set_status_code(tsx, PJSIP_SC_TSX_TIMEOUT, NULL);
+        if (event->body.timer.entry == &tsx->retransmit_timer) {
+            /* Retransmit message. */
+            pj_status_t status;
+
+            status = tsx_retransmit( tsx, 1 );
+            
+            return status;
+
+        } else {
+            tsx_set_status_code(tsx, PJSIP_SC_TSX_TIMEOUT, NULL);
+        }
     }
 
@@ -2407 +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,