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

Timestamp:

Feb 22, 2008 11:10:17 AM (16 years ago)

Author:

bennylp

Message:

Ticket #7: Move PJSIP compile time configurations/settings (such as T1, T2 timers) to run-time (thanks Philippe Leuba)

File:

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

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

@@ -131 +131 @@
 
 /* Timer timeout value constants */
-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 };
-static const pj_time_val td_timer_val = { PJSIP_TD_TIMEOUT/1000, 
-                                          PJSIP_TD_TIMEOUT%1000 };
-static const pj_time_val timeout_timer_val = { (64*PJSIP_T1_TIMEOUT)/1000,
-                                               (64*PJSIP_T1_TIMEOUT)%1000 };
+static pj_time_val t1_timer_val = { PJSIP_T1_TIMEOUT/1000, 
+                                    PJSIP_T1_TIMEOUT%1000 };
+static pj_time_val t2_timer_val = { PJSIP_T2_TIMEOUT/1000, 
+                                    PJSIP_T2_TIMEOUT%1000 };
+static pj_time_val t4_timer_val = { PJSIP_T4_TIMEOUT/1000, 
+                                    PJSIP_T4_TIMEOUT%1000 };
+static pj_time_val td_timer_val = { PJSIP_TD_TIMEOUT/1000, 
+                                    PJSIP_TD_TIMEOUT%1000 };
+static pj_time_val timeout_timer_val = { (64*PJSIP_T1_TIMEOUT)/1000,
+                                         (64*PJSIP_T1_TIMEOUT)%1000 };
 
 #define TIMER_INACTIVE  0
@@ -428 +428 @@
     PJ_ASSERT_RETURN(mod_tsx_layer.endpt==NULL, PJ_EINVALIDOP);
 
+    /* Initialize timer values */
+    t1_timer_val.sec  = pjsip_cfg()->tsx.t1 / 1000;
+    t1_timer_val.msec = pjsip_cfg()->tsx.t1 % 1000;
+    t2_timer_val.sec  = pjsip_cfg()->tsx.t2 / 1000;
+    t2_timer_val.msec = pjsip_cfg()->tsx.t2 % 1000;
+    t4_timer_val.sec  = pjsip_cfg()->tsx.t4 / 1000;
+    t4_timer_val.msec = pjsip_cfg()->tsx.t4 % 1000;
+    td_timer_val.sec  = pjsip_cfg()->tsx.td / 1000;
+    td_timer_val.msec = pjsip_cfg()->tsx.td % 1000;
+    timeout_timer_val.sec  = (64 * pjsip_cfg()->tsx.t1) / 1000;
+    timeout_timer_val.msec = (64 * pjsip_cfg()->tsx.t1) % 1000;
+
     /* Initialize TLS ID for transaction lock. */
     status = pj_thread_local_alloc(&pjsip_tsx_lock_tls_id);
@@ -453 +465 @@
 
     /* Create hash table. */
-    mod_tsx_layer.htable = pj_hash_create( pool, PJSIP_MAX_TSX_COUNT );
+    mod_tsx_layer.htable = pj_hash_create( pool, pjsip_cfg()->tsx.max_count );
     if (!mod_tsx_layer.htable) {
         pjsip_endpt_release_pool(endpt, pool);
@@ -1868 +1880 @@
 {
     pj_time_val timeout;
-    int msec_time;
+    unsigned msec_time;
 
     pj_assert((tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT) == 0);
 
     if (tsx->role==PJSIP_ROLE_UAC && tsx->status_code >= 100)
-        msec_time = PJSIP_T2_TIMEOUT;
+        msec_time = pjsip_cfg()->tsx.t2;
     else
-        msec_time = (1 << (tsx->retransmit_count)) * PJSIP_T1_TIMEOUT;
+        msec_time = (1 << (tsx->retransmit_count)) * pjsip_cfg()->tsx.t1;
 
     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)
-            msec_time = PJSIP_T2_TIMEOUT;
+        if (msec_time > pjsip_cfg()->tsx.t2 && 
+            tsx->method.id != PJSIP_INVITE_METHOD)
+        {
+            msec_time = pjsip_cfg()->tsx.t2;
+        }
     } else {
         /* Retransmission of INVITE final response also caps-off at T2 */
         pj_assert(tsx->status_code >= 200);
-        if (msec_time>PJSIP_T2_TIMEOUT)
-            msec_time = PJSIP_T2_TIMEOUT;
+        if (msec_time > pjsip_cfg()->tsx.t2)
+            msec_time = pjsip_cfg()->tsx.t2;
     }