sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

git:master:19ecfaa0: http_async_client: docs - small edits for readability
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 19ecfaa092eb54626a8543bf0639f51e7361672a URL: https://github.com/kamailio/kamailio/commit/19ecfaa092eb54626a8543bf0639f51… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:13:33+01:00 http_async_client: docs - small edits for readability --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/19ecfaa092eb54626a8543bf0639f51… Patch: https://github.com/kamailio/kamailio/commit/19ecfaa092eb54626a8543bf0639f51… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 962d60e9a6..a9e344a5dc 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -435,7 +435,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>hdr</emphasis>: sets/modifies/removes a HTTP header. N.B.: setting this variable multiple times will add several headers to the query.</para></listitem> <listitem><para><emphasis>body</emphasis>: sets/modifies/removes the request body</para></listitem> <listitem><para><emphasis>method</emphasis>: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified)</para></listitem> - <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less, than <literal>tm.fr_timer</literal> timeout, cause transaction timeout has a higher priority over HTTP timeout)</para></listitem> + <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less than <literal>tm.fr_timer</literal> timeout, because transaction timeout has a higher priority over HTTP timeout)</para></listitem> <listitem><para><emphasis>tls_client_cert</emphasis>: sets the client certificate to use</para></listitem> <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem>

1 0

git:master:bded7151: http_async_client: updates to README after last edits
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: bded7151a3926e4d44b26d9037b6480ad82b5f60 URL: https://github.com/kamailio/kamailio/commit/bded7151a3926e4d44b26d9037b6480… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:13:01+01:00 http_async_client: updates to README after last edits --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/bded7151a3926e4d44b26d9037b6480… Patch: https://github.com/kamailio/kamailio/commit/bded7151a3926e4d44b26d9037b6480… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 45fe6f0e5f..1f4540b69e 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -425,7 +425,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); * method: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified) - * timeout: sets the HTTP timeout (Note, this timeout should be normally less, than tm.fr_timer timeout, cause transaction timeout has a higher priority over HTTP timeout) + * timeout: sets the HTTP timeout * tls_client_cert: sets the client certificate to use * tls_client_key: sets the client certificate key to use * tls_ca_path: sets the CA certificate path to use

1 0

git:master:4b1c0d18: http_async_client: removed typo tag from previous commit
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 4b1c0d18b4555183181275000780f010b63fda47 URL: https://github.com/kamailio/kamailio/commit/4b1c0d18b4555183181275000780f01… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:12:12+01:00 http_async_client: removed typo tag from previous commit --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b1c0d18b4555183181275000780f01… Patch: https://github.com/kamailio/kamailio/commit/4b1c0d18b4555183181275000780f01… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index e6219e96ec..962d60e9a6 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -440,7 +440,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem> <listitem><para><emphasis>authmethod</emphasis>: - Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap<literal> + Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap and multiple methods can be used. Note that in this case, the CURL library will make an extra request to discover server-supported authentication methods. You may want to use a specific value.

1 0

git:master:cffc1159: http_async_client: small notes on $http_req(timeout) usage
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: cffc1159ce4cfc67f77c51c634f7d73c96e1371a URL: https://github.com/kamailio/kamailio/commit/cffc1159ce4cfc67f77c51c634f7d73… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 http_async_client: small notes on $http_req(timeout) usage --- Modified: src/modules/http_async_client/README Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cffc1159ce4cfc67f77c51c634f7d73… Patch: https://github.com/kamailio/kamailio/commit/cffc1159ce4cfc67f77c51c634f7d73… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 1f4540b69e..45fe6f0e5f 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -425,7 +425,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); * method: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified) - * timeout: sets the HTTP timeout + * timeout: sets the HTTP timeout (Note, this timeout should be normally less, than tm.fr_timer timeout, cause transaction timeout has a higher priority over HTTP timeout) * tls_client_cert: sets the client certificate to use * tls_client_key: sets the client certificate key to use * tls_ca_path: sets the CA certificate path to use diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 5a050bf424..e6219e96ec 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -435,12 +435,12 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>hdr</emphasis>: sets/modifies/removes a HTTP header. N.B.: setting this variable multiple times will add several headers to the query.</para></listitem> <listitem><para><emphasis>body</emphasis>: sets/modifies/removes the request body</para></listitem> <listitem><para><emphasis>method</emphasis>: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified)</para></listitem> - <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout</para></listitem> + <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less, than <literal>tm.fr_timer</literal> timeout, cause transaction timeout has a higher priority over HTTP timeout)</para></listitem> <listitem><para><emphasis>tls_client_cert</emphasis>: sets the client certificate to use</para></listitem> <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem> <listitem><para><emphasis>authmethod</emphasis>: - Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap + Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap<literal> and multiple methods can be used. Note that in this case, the CURL library will make an extra request to discover server-supported authentication methods. You may want to use a specific value.

1 0

git:master:fb99f748: app_lua: get lua execution stack for previous level
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: fb99f748db187d2699b6c050cf16f3f54d08ee47 URL: https://github.com/kamailio/kamailio/commit/fb99f748db187d2699b6c050cf16f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 app_lua: get lua execution stack for previous level - returns the info where current function was executed --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/fb99f748db187d2699b6c050cf16f3f… Patch: https://github.com/kamailio/kamailio/commit/fb99f748db187d2699b6c050cf16f3f… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 041cb32182..72cbc7180b 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1952,7 +1952,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) + (tve.tv_usec - tvb.tv_usec); if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { memset(&dinfo, 0, sizeof(lua_Debug)); - if(lua_getstack(L, 0, &dinfo)>0 + if(lua_getstack(L, 1, &dinfo)>0 && lua_getinfo(L, "nSl", &dinfo)>0) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)"

1 0

git:master:cb1637f3: app_lua: use lib functions for execution time and check return for lua debug
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: cb1637f346f3a0bd3659c8074ddffd61a8da4fff URL: https://github.com/kamailio/kamailio/commit/cb1637f346f3a0bd3659c8074ddffd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 app_lua: use lib functions for execution time and check return for lua debug --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/cb1637f346f3a0bd3659c8074ddffd6… Patch: https://github.com/kamailio/kamailio/commit/cb1637f346f3a0bd3659c8074ddffd6… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index bd3773e46c..041cb32182 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1932,28 +1932,34 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) { sr_kemi_t *ket; int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; lua_Debug dinfo; ket = sr_kemi_lua_export_get(eidx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_kemi_lua_exec_func_ex(L, ket, 0); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { memset(&dinfo, 0, sizeof(lua_Debug)); - if(lua_getstack(L, 0, &dinfo)==0 - && lua_getinfo(L, "nSl", &dinfo)==0) { + if(lua_getstack(L, 0, &dinfo)>0 + && lua_getinfo(L, "nSl", &dinfo)>0) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" " took too long [%u ms] (%s:%d - %s [%s])\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, + (ket->mname.len>0)?".":"", ket->fname.s, + tdiff, (dinfo.short_src[0])?dinfo.short_src:"<unknown>", dinfo.currentline, (dinfo.name)?dinfo.name:"<unknown>", @@ -1963,7 +1969,8 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) "alert - action KSR.%s%s%s(...)" " took too long [%u ms]\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms); + (ket->mname.len>0)?".":"", ket->fname.s, + tdiff); } } }

1 0

git:master:1f334f21: cfgutils: exported sleep() and usleep() to kemi framework
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 1f334f218d9e7c7f0c89cecb4aeeefca7cda232d URL: https://github.com/kamailio/kamailio/commit/1f334f218d9e7c7f0c89cecb4aeeefc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 cfgutils: exported sleep() and usleep() to kemi framework --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/1f334f218d9e7c7f0c89cecb4aeeefc… Patch: https://github.com/kamailio/kamailio/commit/1f334f218d9e7c7f0c89cecb4aeeefc… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index e62012cd14..02d7c46c54 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -623,6 +623,12 @@ static int m_sleep(struct sip_msg *msg, char *time, char *str2) return 1; } +static int ki_sleep(sip_msg_t* msg, int v) +{ + sleep((unsigned int)v); + return 1; +} + static int m_usleep(struct sip_msg *msg, char *time, char *str2) { int s; @@ -635,6 +641,12 @@ static int m_usleep(struct sip_msg *msg, char *time, char *str2) return 1; } +static int ki_usleep(sip_msg_t* msg, int v) +{ + sleep_us((unsigned int)v); + return 1; +} + static int dbg_abort(struct sip_msg* msg, char* foo, char* bar) { LM_CRIT("abort called\n"); @@ -1055,6 +1067,16 @@ static sr_kemi_t sr_kemi_cfgutils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("cfgutils"), str_init("sleep"), + SR_KEMIP_INT, ki_sleep, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cfgutils"), str_init("usleep"), + SR_KEMIP_INT, ki_usleep, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:2ddc54ba: kamctl: added acc initdb command
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 2ddc54ba212aa9c64a5488e8ae542cc13c97f195 URL: https://github.com/kamailio/kamailio/commit/2ddc54ba212aa9c64a5488e8ae542cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 kamctl: added acc initdb command - command to add additional columns needed with default kamailio.cfg and defined WITH_ACCDB for acc and missed_calls table --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/2ddc54ba212aa9c64a5488e8ae542cc… Patch: https://github.com/kamailio/kamailio/commit/2ddc54ba212aa9c64a5488e8ae542cc… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 3a25443355..a5f51803d8 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2345,6 +2345,32 @@ acc() { shift; require_dbengine case $1 in + initdb) + QUERY=$(cat <<-END +ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; +ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default ''; +ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; +ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; +ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default ''; +ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; +END +) + $DBCMD "$QUERY" + if [ $? -ne 0 ] ; then + merr "error - acc db init" + exit 1 + fi + + mecho "ok - acc db init" + + ;; + showdb) QUERY="select * FROM $ACC_TABLE ;" $DBROCMD "$QUERY" diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 16f61e04a5..46494f5a04 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -577,6 +577,7 @@ usage_acc() { mecho " -- command 'acc' - manage accounding records" echo cat <<EOF + acc initdb .................. init acc table by adding extra colums acc showdb .................. show content of acc table recent [<secs>] ............. show most recent records in acc (default 300s) EOF

1 0

git:master:ee1ea030: dialplan: fixed error log in rule_translate
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: ee1ea030d90818f5547c4970f0785b33889d8b75 URL: https://github.com/kamailio/kamailio/commit/ee1ea030d90818f5547c4970f0785b3… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 dialplan: fixed error log in rule_translate - Print an error line only if the string fails a match with all the subst_exp avp values. --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/ee1ea030d90818f5547c4970f0785b3… Patch: https://github.com/kamailio/kamailio/commit/ee1ea030d90818f5547c4970f0785b3… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 2cd568ca5f..06534a9dab 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -432,7 +432,7 @@ int rule_translate(sip_msg_t *msg, str *instr, dpl_node_t *rule, /*search for the pattern from the compiled subst_exp*/ if (pcre_exec(subst_comp, NULL, instr->s, instr->len, 0, 0, ovector, 3 * (MAX_REPLACE_WITH + 1)) <= 0) { - LM_ERR("the string %.*s matched " + LM_DBG("the string %.*s matched " "the match_exp %.*s but not the subst_exp %.*s!\n", instr->len, instr->s, rule->match_exp.len, rule->match_exp.s, @@ -721,6 +721,13 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str *output, dpl_id_p idp, pkg_free(re_list); re_list = rt; } while(re_list); + if(rez<0) { + LM_ERR("the string %.*s matched " + "the match_exp %.*s but not the subst_exp %.*s!\n", + input->len, input->s, + rulep->match_exp.len, rulep->match_exp.s, + rulep->subst_exp.len, rulep->subst_exp.s); + } } else { if(rule_translate(msg, input, rulep, rulep->subst_comp, output)!=0){

1 0

git:master:81b268d9: dialplan: fixed avp usage in subst_exp field
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 81b268d9610ea16420d7ce2aa1a9e3ba5364773c URL: https://github.com/kamailio/kamailio/commit/81b268d9610ea16420d7ce2aa1a9e3b… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 dialplan: fixed avp usage in subst_exp field - in case both match_exp and subst_exp contain avps, the content of match_exp were used to evaluate the substitute expression. --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/81b268d9610ea16420d7ce2aa1a9e3b… Patch: https://github.com/kamailio/kamailio/commit/81b268d9610ea16420d7ce2aa1a9e3b… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 06762ce6d2..2cd568ca5f 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -700,7 +700,7 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str *output, dpl_id_p idp, } } if(rulep->tflags&DP_TFLAGS_PV_SUBST) { - re_list = dpl_dynamic_pcre_list(msg, &rulep->match_exp); + re_list = dpl_dynamic_pcre_list(msg, &rulep->subst_exp); if(re_list==NULL) { /* failed to compile dynamic pcre -- ignore */ LM_DBG("failed to compile dynamic pcre[%.*s]\n",

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019