From 49120ac3a105acd216b6c966ed6918a6e829eb05 Mon Sep 17 00:00:00 2001 From: Henning Westerholt Date: Tue, 30 Jul 2019 13:37:19 +0200 Subject: [PATCH] tm: remove TM_DIFF_RT_TIMEOUT #define, default since 2007 (commit c0ff60b6887248) - remove TM_DIFF_RT_TIMEOUT #define, this was enabled and default since 2007 - this define could be used to deactivate different timeouts per transaction - introduced in commit c0ff60b6887248 --- src/modules/tm/doc/functions.xml | 3 --- src/modules/tm/h_table.h | 7 ------- src/modules/tm/t_lookup.c | 4 ---- src/modules/tm/t_lookup.h | 2 -- src/modules/tm/timer.c | 8 -------- src/modules/tm/timer.h | 9 --------- src/modules/tm/tm.c | 14 -------------- src/modules/tm/uac.c | 2 -- 8 files changed, 49 deletions(-) diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index ce0e84261c5..8ceaa6360a2 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -711,9 +711,6 @@ route { a transaction creating function (e.g.: t_set_retr(500, 4000); t_relay()). All new transaction created after this function call, during the same script invocation will use the new values. - Note that this function will work only if tm is compile with - -DTM_DIFF_RT_TIMEOUT (which increases every transaction size with - 4 bytes). Meaning of the parameters is as follows: diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 5486c1c4f04..c5049acff53 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -54,11 +54,6 @@ #include "../../core/hash_func.h" #include "config.h" -/* if TM_DIFF_RT_TIMEOUT is defined, different retransmissions timeouts - * can be used for each transaction, at a small memory cost - * (extra 4 bytes/transaction) */ -#define TM_DIFF_RT_TIMEOUT - struct s_table; struct entry; @@ -429,10 +424,8 @@ typedef struct cell ticks_t fr_timeout; /* final response interval for retr_bufs */ ticks_t fr_inv_timeout; /* final inv. response interval for retr_bufs */ -#ifdef TM_DIFF_RT_TIMEOUT retr_timeout_t rt_t1_timeout_ms; /* start retr. interval for retr_bufs */ retr_timeout_t rt_t2_timeout_ms; /* maximum retr. interval for retr_bufs */ -#endif ticks_t end_of_life; /* maximum lifetime */ /* nr of replied branch; 0..sr_dst_max_branches=branch value, diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 08a669f0d0b..5942c80c0a2 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1259,7 +1259,6 @@ static inline void init_new_t(struct cell *new_cell, struct sip_msg *p_msg) new_cell->fr_inv_timeout=cfg_get(tm, tm_cfg, fr_inv_timeout); } } -#ifdef TM_DIFF_RT_TIMEOUT new_cell->rt_t1_timeout_ms = (retr_timeout_t) get_msgid_val( user_rt_t1_timeout_ms, p_msg->id, int); @@ -1270,7 +1269,6 @@ static inline void init_new_t(struct cell *new_cell, struct sip_msg *p_msg) p_msg->id, int); if (likely(new_cell->rt_t2_timeout_ms == 0)) new_cell->rt_t2_timeout_ms = cfg_get(tm, tm_cfg, rt_t2_timeout_ms); -#endif new_cell->on_branch=get_on_branch(); } @@ -1783,7 +1781,6 @@ int t_reset_fr() return 1; } -#ifdef TM_DIFF_RT_TIMEOUT /* params: retr. t1 & retr. t2 value in ms, 0 means "do not touch" * ret: 1 on success, -1 on error (script safe)*/ @@ -1847,7 +1844,6 @@ int t_reset_retr() } return 1; } -#endif /* params: maximum transaction lifetime for inv and non-inv diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index 2180311f694..5e1e135280c 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -99,10 +99,8 @@ int t_lookup_callid(struct cell** trans, str callid, str cseq); int t_set_fr(struct sip_msg* msg, unsigned int fr_inv_to, unsigned int fr_to ); int t_reset_fr(void); -#ifdef TM_DIFF_RT_TIMEOUT int t_set_retr(struct sip_msg* msg, unsigned int t1_to, unsigned int t2_to); int t_reset_retr(void); -#endif int t_set_max_lifetime(struct sip_msg* msg, unsigned int eol_inv, unsigned int eol_noninv); int t_reset_max_lifetime(void); diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index 18679c99818..8d7b9b9dc9b 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -121,10 +121,8 @@ struct msgid_var user_fr_timeout; struct msgid_var user_fr_inv_timeout; -#ifdef TM_DIFF_RT_TIMEOUT struct msgid_var user_rt_t1_timeout_ms; struct msgid_var user_rt_t2_timeout_ms; -#endif struct msgid_var user_inv_max_lifetime; struct msgid_var user_noninv_max_lifetime; @@ -180,12 +178,10 @@ int tm_init_timers(void) SIZE_FIT_CHECK(fr_timeout, default_tm_cfg.fr_timeout, "fr_timer"); SIZE_FIT_CHECK( fr_inv_timeout, default_tm_cfg.fr_inv_timeout, "fr_inv_timer"); -#ifdef TM_DIFF_RT_TIMEOUT SIZE_FIT_CHECK( rt_t1_timeout_ms, default_tm_cfg.rt_t1_timeout_ms, "retr_timer1"); SIZE_FIT_CHECK( rt_t2_timeout_ms, default_tm_cfg.rt_t2_timeout_ms, "retr_timer2"); -#endif SIZE_FIT_CHECK(end_of_life, default_tm_cfg.tm_max_inv_lifetime, "max_inv_lifetime"); SIZE_FIT_CHECK(end_of_life, default_tm_cfg.tm_max_noninv_lifetime, @@ -193,10 +189,8 @@ int tm_init_timers(void) memset(&user_fr_timeout, 0, sizeof(user_fr_timeout)); memset(&user_fr_inv_timeout, 0, sizeof(user_fr_inv_timeout)); -#ifdef TM_DIFF_RT_TIMEOUT memset(&user_rt_t1_timeout_ms, 0, sizeof(user_rt_t1_timeout_ms)); memset(&user_rt_t2_timeout_ms, 0, sizeof(user_rt_t2_timeout_ms)); -#endif memset(&user_inv_max_lifetime, 0, sizeof(user_inv_max_lifetime)); memset(&user_noninv_max_lifetime, 0, sizeof(user_noninv_max_lifetime)); @@ -269,10 +263,8 @@ int timer_fixup_ms(void *handle, str *gname, str *name, void **val) t = (long)(*val); /* size fix checks */ -#ifdef TM_DIFF_RT_TIMEOUT IF_IS_TIMER_NAME(rt_t1_timeout_ms, "retr_timer1") else IF_IS_TIMER_NAME(rt_t2_timeout_ms, "retr_timer2") -#endif return 0; diff --git a/src/modules/tm/timer.h b/src/modules/tm/timer.h index 5f20dd36831..4fc513f637f 100644 --- a/src/modules/tm/timer.h +++ b/src/modules/tm/timer.h @@ -106,13 +106,8 @@ #define TM_FAST_RETR_TIMER -#ifdef TM_DIFF_RT_TIMEOUT #define RT_T1_TIMEOUT_MS(rb) ((rb)->my_T->rt_t1_timeout_ms) #define RT_T2_TIMEOUT_MS(rb) ((rb)->my_T->rt_t2_timeout_ms) -#else -#define RT_T1_TIMEOUT_MS(rb) (cfg_get(tm, tm_cfg, rt_t1_timeout_ms)) -#define RT_T2_TIMEOUT_MS(rb) (cfg_get(tm, tm_cfg, rt_t2_timeout_ms)) -#endif #define TM_REQ_TIMEOUT(t) \ (is_invite(t) ? cfg_get(tm, tm_cfg, tm_max_inv_lifetime) \ @@ -121,10 +116,8 @@ extern struct msgid_var user_fr_timeout; extern struct msgid_var user_fr_inv_timeout; -#ifdef TM_DIFF_RT_TIMEOUT extern struct msgid_var user_rt_t1_timeout_ms; extern struct msgid_var user_rt_t2_timeout_ms; -#endif extern struct msgid_var user_inv_max_lifetime; extern struct msgid_var user_noninv_max_lifetime; @@ -301,7 +294,6 @@ inline static void change_fr(struct cell *t, ticks_t fr_inv, ticks_t fr) } -#ifdef TM_DIFF_RT_TIMEOUT /* change t1 & t2 retransmissions timers * if now==1 try to change them almost on the fly * (next retransmission either at rt_t1 or rt_t2) @@ -332,7 +324,6 @@ inline static void change_retr( } } } -#endif /* TM_DIFF_RT_TIMEOUT */ /* set the maximum transaction lifetime (from the present moment) diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 6d9ea02e693..891cf513893 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1967,14 +1967,7 @@ static int ki_t_reset_fr(struct sip_msg* msg) static int ki_t_set_retr(sip_msg_t* msg, int t1, int t2) { -#ifdef TM_DIFF_RT_TIMEOUT return t_set_retr(msg, t1, t2); -#else - LM_ERR("support for changing retransmission intervals on " - "the fly not compiled in (re-compile tm with" - " -DTM_DIFF_RT_TIMEOUT)\n"); - return -1; -#endif } /* set retr. intervals per transaction; 0 means: use the default value */ @@ -1994,14 +1987,7 @@ static int w_t_set_retr(struct sip_msg* msg, char* p1, char* p2) /* reset retr. t1 and t2 to the default values */ int ki_t_reset_retr(sip_msg_t* msg) { -#ifdef TM_DIFF_RT_TIMEOUT return t_reset_retr(); -#else - LM_ERR("support for changing retransmission intervals on " - "the fly not compiled in (re-compile tm with" - " -DTM_DIFF_RT_TIMEOUT)\n"); - return -1; -#endif } int w_t_reset_retr(struct sip_msg* msg, char* foo, char* bar) diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index efe592846c3..6641c1bd6d1 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -473,11 +473,9 @@ static inline int t_uac_prepare(uac_req_t *uac_r, new_cell->fr_timeout=cfg_get(tm, tm_cfg, fr_timeout); new_cell->fr_inv_timeout=cfg_get(tm, tm_cfg, fr_inv_timeout); new_cell->end_of_life=get_ticks_raw()+lifetime; -#ifdef TM_DIFF_RT_TIMEOUT /* same as above for retransmission intervals */ new_cell->rt_t1_timeout_ms = cfg_get(tm, tm_cfg, rt_t1_timeout_ms); new_cell->rt_t2_timeout_ms = cfg_get(tm, tm_cfg, rt_t2_timeout_ms); -#endif set_kr(REQ_FWDED);