diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-02-22 11:10:17 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-02-22 11:10:17 +0000 |
| commit | 5e9005a6ed8321e2a3d6cd307bafe5c6ca79eee3 (patch) | |
| tree | 825983a1fde955b6914870b7ba9f4a767b8fb761 /pjsip/src/test-pjsip | |
| parent | eb962bb2cade592db6319e2004e06c9ac8ee2ae2 (diff) | |
Ticket #7: Move PJSIP compile time configurations/settings (such as T1, T2 timers) to run-time (thanks Philippe Leuba)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1818 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/test-pjsip')
| -rw-r--r-- | pjsip/src/test-pjsip/tsx_uac_test.c | 6 | ||||
| -rw-r--r-- | pjsip/src/test-pjsip/tsx_uas_test.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pjsip/src/test-pjsip/tsx_uac_test.c b/pjsip/src/test-pjsip/tsx_uac_test.c index 60b7bcee..a4a340de 100644 --- a/pjsip/src/test-pjsip/tsx_uac_test.c +++ b/pjsip/src/test-pjsip/tsx_uac_test.c @@ -614,11 +614,11 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata) msec_elapsed = now.sec*1000 + now.msec; ++recv_count; - msec_expected = (1<<(recv_count-2))*PJSIP_T1_TIMEOUT; + msec_expected = (1<<(recv_count-2))*pjsip_cfg()->tsx.t1; if (msg->line.req.method.id != PJSIP_INVITE_METHOD) { - if (msec_expected > PJSIP_T2_TIMEOUT) - msec_expected = PJSIP_T2_TIMEOUT; + if (msec_expected > pjsip_cfg()->tsx.t2) + msec_expected = pjsip_cfg()->tsx.t2; max_received = 11; } else { max_received = 7; diff --git a/pjsip/src/test-pjsip/tsx_uas_test.c b/pjsip/src/test-pjsip/tsx_uas_test.c index 7ca05a89..74c40c71 100644 --- a/pjsip/src/test-pjsip/tsx_uas_test.c +++ b/pjsip/src/test-pjsip/tsx_uas_test.c @@ -986,9 +986,9 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata) PJ_TIME_VAL_SUB(now, recv_last); msec = now.sec*1000 + now.msec; - msec_expected = (1 << (recv_count-2)) * PJSIP_T1_TIMEOUT; - if (msec_expected > PJSIP_T2_TIMEOUT) - msec_expected = PJSIP_T2_TIMEOUT; + msec_expected = (1 << (recv_count-2)) * pjsip_cfg()->tsx.t1; + if (msec_expected > pjsip_cfg()->tsx.t2) + msec_expected = pjsip_cfg()->tsx.t2; if (DIFF(msec, msec_expected) > MAX_ALLOWED_DIFF) { PJ_LOG(3,(THIS_FILE, @@ -1058,9 +1058,9 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata) PJ_TIME_VAL_SUB(now, recv_last); msec = now.sec*1000 + now.msec; - msec_expected = (1 << (recv_count-2)) * PJSIP_T1_TIMEOUT; - if (msec_expected > PJSIP_T2_TIMEOUT) - msec_expected = PJSIP_T2_TIMEOUT; + msec_expected = (1 << (recv_count-2)) * pjsip_cfg()->tsx.t1; + if (msec_expected > pjsip_cfg()->tsx.t2) + msec_expected = pjsip_cfg()->tsx.t2; if (DIFF(msec, msec_expected) > MAX_ALLOWED_DIFF) { PJ_LOG(3,(THIS_FILE, |