Module: sip-router Branch: master Commit: 2d53d99abcf9ae218fa547d572aee3f55dbba79b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d53d99… Author: Juha Heinanen &lt;jh(a)tutpro.com&gt; Committer: Juha Heinanen &lt;jh(a)tutpro.com&gt; Date: Wed Dec 12 17:03:42 2012 +0200 modules/tm: forgot to commit new version of t_funcs.c - reported by Peter Dunkley. --- modules/tm/t_funcs.c | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 1b43cc1..e9d9598 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -85,10 +85,6 @@ int fr_inv_timer_avp_type = 0; int_str fr_inv_timer_avp = {0}; static str fr_inv_timer_str; static int fr_inv_timer_index = 0; -int contacts_avp_type = 0; -int_str contacts_avp = {0}; -static str contacts_avp_str; -static int contacts_avp_index = 0; int tm_error = 0; /* delayed tm error */ @@ -398,8 +394,7 @@ done: * Initialize parameters containing the ID of * AVPs with various timers */ -int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, - char* contacts_avp_param) +int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param) { pv_spec_t avp_spec; unsigned short avp_type; @@ -469,34 +464,6 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, } } - if (contacts_avp_param && *contacts_avp_param) { - contacts_avp_str.s = contacts_avp_param; - contacts_avp_str.len = strlen(contacts_avp_str.s); - - if(contacts_avp_str.s[0]==PV_MARKER) { - if ((pv_parse_spec(&contacts_avp_str, &avp_spec) == 0) - || (avp_spec.type != PVT_AVP)) { - LM_ERR("malformed or non AVP definition <%s>\n", - contacts_avp_param); - return -1; - } - - if(pv_get_avp_name(0, &(avp_spec.pvp), &contacts_avp, - &avp_type) != 0) { - LM_ERR("invalid AVP definition <%s>\n", contacts_avp_param); - return -1; - } - contacts_avp_type = avp_type; - } else { - if (parse_avp_spec( &contacts_avp_str, &contacts_avp_type, - &contacts_avp, &contacts_avp_index)<0) { - LOG(L_CRIT,"ERROR:tm:init_avp_params: invalid contact_avp_params " - "AVP specs \"%s\"\n", contacts_avp_param); - return -1; - } - } - } - return 0; }