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

Timestamp:

Feb 13, 2007 2:52:37 AM (17 years ago)

Author:

bennylp

Message:

Implement ticket #99: a more generic mechanism to implement UAC transaction timeout after provisional response is received

File:

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

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

@@ -1397 +1397 @@
 
 /*
+ * 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.
  */
@@ -1897 +1914 @@
 
         /* Start Timer B (or called timer F for non-INVITE) for transaction 
-         * timeout.
+         * timeout. If user has configured the timeout value with 
+         * pjsip_tsx_set_uac_timeout(), use the timeout value there.
          */
-        pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, 
-                                    &timeout_timer_val);
+        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);
+        }
 
         /* Start Timer A (or timer E) for retransmission only if unreliable 
@@ -1968 +1997 @@
     } else if (event->type == PJSIP_EVENT_RX_MSG) {
         pjsip_msg *msg;
-        //int code;
+        int code;
 
         /* Get message instance */
@@ -1985 +2014 @@
 
 
-        /* Cancel timer B (transaction timeout) */
-        pjsip_endpt_cancel_timer(tsx->endpt, &tsx->timeout_timer);
+        /* 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.
@@ -2373 +2412 @@
         }
 
+    } else if (event->type == PJSIP_EVENT_TIMER &&
+               event->body.timer.entry == &tsx->timeout_timer) {
+
+        /* Inform TU. */
+        tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED, 
+                       PJSIP_EVENT_TIMER, &tsx->timeout_timer);
+
+
     } else if (tsx->status_code >= 300 && tsx->status_code <= 699) {