[sr-dev] git:master: tm: timer avps spec type auto-detected

Module: sip-router Branch: master Commit: 6961e3afe035035f657748961498fd2d58adf004 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6961e3a… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Mon Apr 19 21:13:36 2010 +0200 tm: timer avps spec type auto-detected - detect if is PV spec format or AVP name format - get rid this way of cfg compat mode --- modules/tm/t_funcs.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 92a68da..e19ceab 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -407,7 +407,7 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, fr_timer_str.s = fr_timer_param; fr_timer_str.len = strlen(fr_timer_str.s); - if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { + if(fr_timer_str.s[0]==PV_MARKER) { if (pv_parse_spec(&fr_timer_str, &avp_spec)==0 || avp_spec.type!=PVT_AVP) { LM_ERR("malformed or non AVP %s AVP definition\n", @@ -435,7 +435,7 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, fr_inv_timer_str.s = fr_inv_timer_param; fr_inv_timer_str.len = strlen(fr_inv_timer_str.s); - if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { + if(fr_inv_timer_str.s[0]==PV_MARKER) { if (pv_parse_spec(&fr_inv_timer_str, &avp_spec)==0 || avp_spec.type!=PVT_AVP) { LM_ERR("malformed or non AVP %s AVP definition\n", @@ -463,7 +463,7 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, contacts_avp_str.s = contacts_avp_param; contacts_avp_str.len = strlen(contacts_avp_str.s); - if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { + 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",