sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
317 discussions

[kamailio/kamailio] dmq_usrloc: output AoR on warning message (#1929)
by Emmanuel Schmidbauer 18 Apr '19

18 Apr '19

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1929 -- Commit Summary -- * dmq_usrloc: output AoR on warning message -- File Changes -- M src/modules/dmq_usrloc/usrloc_sync.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1929.patch https://github.com/kamailio/kamailio/pull/1929.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1929

2 2

git:master:caaa8650: Merge pull request #1929 from kamailio/usrloc_sync-better-warn-log
by GitHub 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: caaa8650c2882eb665dd97b4fa4518ee0f27c759 URL: https://github.com/kamailio/kamailio/commit/caaa8650c2882eb665dd97b4fa4518e… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-18T13:01:02+01:00 Merge pull request #1929 from kamailio/usrloc_sync-better-warn-log dmq_usrloc: output AoR on warning message --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/caaa8650c2882eb665dd97b4fa4518e… Patch: https://github.com/kamailio/kamailio/commit/caaa8650c2882eb665dd97b4fa4518e… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 1a7eef0ab8..5f7b55fb94 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -144,7 +144,7 @@ static int delete_contact(str aor, ucontact_info_t* ci) /* it locks the udomain on success */ if (dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(&aor), &ci->ruid, &r, &c) != 0) { - LM_WARN("AOR/Contact not found\n"); + LM_WARN("AOR/Contact ['%.*s'] not found\n", aor.len, aor.s); return -1; } if (dmq_ul.delete_ucontact(r, c) != 0) {

1 0

git:master:63f95447: dmq_usrloc: output AoR on warning message
by Emmanuel Schmidbauer 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 63f95447c40739be91203739cfca4bc5523226fa URL: https://github.com/kamailio/kamailio/commit/63f95447c40739be91203739cfca4bc… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2019-04-18T07:26:08-04:00 dmq_usrloc: output AoR on warning message --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/63f95447c40739be91203739cfca4bc… Patch: https://github.com/kamailio/kamailio/commit/63f95447c40739be91203739cfca4bc… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 1a7eef0ab8..5f7b55fb94 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -144,7 +144,7 @@ static int delete_contact(str aor, ucontact_info_t* ci) /* it locks the udomain on success */ if (dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(&aor), &ci->ruid, &r, &c) != 0) { - LM_WARN("AOR/Contact not found\n"); + LM_WARN("AOR/Contact ['%.*s'] not found\n", aor.len, aor.s); return -1; } if (dmq_ul.delete_ucontact(r, c) != 0) {

1 0

uac dialog callback and kamailio restarts
by Henning Westerholt 18 Apr '19

18 Apr '19

Hello, I am working right now on another difficult topic related to the usage of uac dialog callbacks for the usual replace from/to header logic after a kamailio restart. The uac/dialog module combination works just fine - but after a kamailio restart the dialog callback information is lost. So this means that for already established dialogs no from/to replacement operations are done. This causes errors later on during BYE or Re-INVITE signalization. I verified this with debug logging and can easily test this on a test system. One obvious workaround is of course not use the dialog module to store the data inside dialog variables. An approach to work on this problem would be to store the uac callback in the dialog table(s) as well, and then during kamailio startup use this to re-install the uac callback. Does this approach sounds feasible? Any other ideas how to tackle this issue? Thanks and regards, Henning

2 6

git:master:5e029186: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 5e029186d3c6b8aa530834ffd7ab54d4f5b1c1e5 URL: https://github.com/kamailio/kamailio/commit/5e029186d3c6b8aa530834ffd7ab54d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-18T10:02:00+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/5e029186d3c6b8aa530834ffd7ab54d… Patch: https://github.com/kamailio/kamailio/commit/5e029186d3c6b8aa530834ffd7ab54d…

1 0

git:master:9838774e: pv: docs for xavp_rm(...) and xavp_rm_child(...)
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 9838774e11f071324e6d6691570d2029cfb26c43 URL: https://github.com/kamailio/kamailio/commit/9838774e11f071324e6d6691570d202… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T09:51:21+02:00 pv: docs for xavp_rm(...) and xavp_rm_child(...) --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9838774e11f071324e6d6691570d202… Patch: https://github.com/kamailio/kamailio/commit/9838774e11f071324e6d6691570d202… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 98aded0063..464d5ac80b 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -375,6 +375,56 @@ xavp_set_child_ival("x", "y", "$var(n)"); $var(n) = 10; xavp_set_child_sval("x", "y", "Count: $var(n)"); # results in: $xavp(x=>y) is "Count: 10" +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_rm"> + <title> + <function moreinfo="none">xavp_rm(rname)</function> + </title> + <para> + Remove the value of $xavp(rname). + </para> + <para> + The parameter has to be the name of XAVP in the root list. + It can be static or dynamic string (to include variables). + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_rm</function> usage</title> + <programlisting format="linespecific"> +... +xavp_rm_child_sval("x"); +# same result as: $xavp(x) = $null; +... + </programlisting> + </example> + </section> + + <section id="pv.f.xavp_rm_child"> + <title> + <function moreinfo="none">xavp_rm_child(rname, cname)</function> + </title> + <para> + Remove the value of $xavp(rname=>cname). + </para> + <para> + The first parameter has to be the name of XAVP in the root list. + The second parameter name of child XAVP. Both parameters can be + static or dynamic strings (to include variables). + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_rm_child</function> usage</title> + <programlisting format="linespecific"> +... +xavp_rm_child_sval("x", "y"); +# same result as: $xavp(x=>y) = $null; ... </programlisting> </example>

1 0

git:master:0d8c0fd7: pv: exported functions to delete first root and child xavp
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 0d8c0fd732d88164f622f2ee8848b8e931a57d9a URL: https://github.com/kamailio/kamailio/commit/0d8c0fd732d88164f622f2ee8848b8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T09:40:30+02:00 pv: exported functions to delete first root and child xavp - xavp_rm(rname) - delete first xavp matching rname in root list - xavp_rm_child(rname, cname) - delete first child xavp matching cname in sublist from root xavp rname - functions exported to native scripting and kemi languages --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/0d8c0fd732d88164f622f2ee8848b8e… Patch: https://github.com/kamailio/kamailio/commit/0d8c0fd732d88164f622f2ee8848b8e… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 5364b18d0d..c065dca5d2 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -543,6 +543,8 @@ static int w_xavp_set_child_ival(sip_msg_t *msg, char *prname, char *pcname, char *pval); static int w_xavp_set_child_sval(sip_msg_t *msg, char *prname, char *pcname, char *pval); +static int w_xavp_rm(sip_msg_t *msg, char *prname, char *p2); +static int w_xavp_rm_child(sip_msg_t *msg, char *prname, char *pcname); static int w_sbranch_set_ruri(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_append(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_reset(sip_msg_t *msg, char p1, char *p2); @@ -591,6 +593,12 @@ static cmd_export_t cmds[]={ {"xavp_set_child_sval", (cmd_function)w_xavp_set_child_sval, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"xavp_rm", (cmd_function)w_xavp_rm, + 1, fixup_spve_null, fixup_free_spve_null, + ANY_ROUTE}, + {"xavp_rm_child", (cmd_function)w_xavp_rm_child, + 2, fixup_spve_spve, fixup_free_spve_spve, + ANY_ROUTE}, {"sbranch_set_ruri", (cmd_function)w_sbranch_set_ruri, 0, 0, 0, ANY_ROUTE }, {"sbranch_append", (cmd_function)w_sbranch_append, 0, 0, 0, @@ -1001,6 +1009,65 @@ static int fixup_free_xavp_set_child_ival(void** param, int param_no) return 0; } +/** + * + */ +static int ki_xavp_rm(sip_msg_t *msg, str *rname) +{ + int ret; + + ret = xavp_rm_by_index(rname, 0, NULL); + + return (ret==0)?1:ret; +} + +/** + * + */ +static int w_xavp_rm(sip_msg_t *msg, char *prname, char *p2) +{ + str rname; + + if(fixup_get_svalue(msg, (gparam_t*)prname, &rname)<0) { + LM_ERR("failed to get root xavp name\n"); + return -1; + } + + return ki_xavp_rm(msg, &rname); +} + +/** + * + */ +static int ki_xavp_rm_child(sip_msg_t *msg, str *rname, str *cname) +{ + int ret; + + ret = xavp_rm_child_by_index(rname, cname, 0); + + return (ret==0)?1:ret; +} + +/** + * + */ +static int w_xavp_rm_child(sip_msg_t *msg, char *prname, char *pcname) +{ + str rname; + str cname; + + if(fixup_get_svalue(msg, (gparam_t*)prname, &rname)<0) { + LM_ERR("failed to get root xavp name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)pcname, &cname)<0) { + LM_ERR("failed to get child xavp name\n"); + return -1; + } + + return ki_xavp_rm_child(msg, &rname, &cname); +} + /** * */ @@ -1258,6 +1325,16 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_rm"), + SR_KEMIP_INT, ki_xavp_rm, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("xavp_rm_child"), + SR_KEMIP_INT, ki_xavp_rm_child, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("evalx"), SR_KEMIP_INT, ki_pv_evalx, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:d9a4b292: core: xavp - helper function to remove child value
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: d9a4b2929ec999127c46256a6f497520df017488 URL: https://github.com/kamailio/kamailio/commit/d9a4b2929ec999127c46256a6f49752… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T09:37:36+02:00 core: xavp - helper function to remove child value --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/d9a4b2929ec999127c46256a6f49752… Patch: https://github.com/kamailio/kamailio/commit/d9a4b2929ec999127c46256a6f49752… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 1e25862650..be3bba423f 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -447,6 +447,20 @@ int xavp_rm_by_index(str *name, int idx, sr_xavp_t **head) return xavp_rm_internal(name, head, idx); } +int xavp_rm_child_by_index(str *rname, str *cname, int idx) +{ + sr_xavp_t *avp=NULL; + + if (idx<0) { + return 0; + } + avp = xavp_get(rname, NULL); + + if(avp == NULL || avp->val.type!=SR_XTYPE_XAVP) { + return 0; + } + return xavp_rm_internal(cname, &avp->val.v.xavp, idx); +} int xavp_count(str *name, sr_xavp_t **start) { diff --git a/src/core/xavp.h b/src/core/xavp.h index c97123e190..4cd333eaaf 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -88,6 +88,7 @@ sr_xavp_t *xavp_get_last(str *xname, sr_xavp_t **list); int xavp_rm_by_name(str *name, int all, sr_xavp_t **head); int xavp_rm_by_index(str *name, int idx, sr_xavp_t **head); int xavp_rm(sr_xavp_t *xa, sr_xavp_t **head); +int xavp_rm_child_by_index(str *rname, str *cname, int idx); int xavp_count(str *name, sr_xavp_t **start); void xavp_destroy_list_unsafe(sr_xavp_t **head); void xavp_destroy_list(sr_xavp_t **head);

1 0

git:master:24ca2e77: core: rpc command core.tcp_list returns an array of items
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 24ca2e7760a8dada433b188348c768e7e224f10d URL: https://github.com/kamailio/kamailio/commit/24ca2e7760a8dada433b188348c768e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:47:32+02:00 core: rpc command core.tcp_list returns an array of items --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/24ca2e7760a8dada433b188348c768e… Patch: https://github.com/kamailio/kamailio/commit/24ca2e7760a8dada433b188348c768e… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index ea38e60bae..5b1c4624ed 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -1090,7 +1090,7 @@ static rpc_export_t core_rpc_methods[] = { #endif {"core.tcp_info", core_tcpinfo, core_tcpinfo_doc, 0}, {"core.tcp_options", core_tcp_options, core_tcp_options_doc,0}, - {"core.tcp_list", core_tcp_list, core_tcp_list_doc,0}, + {"core.tcp_list", core_tcp_list, core_tcp_list_doc, RET_ARRAY}, {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0},

1 0

git:master:8d3d43c9: app_lua: safety check for anchor lump in old api hdr insert
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 8d3d43c9d8f768894e7ed89b17eca5be8d181b53 URL: https://github.com/kamailio/kamailio/commit/8d3d43c9d8f768894e7ed89b17eca5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:42:49+02:00 app_lua: safety check for anchor lump in old api hdr insert --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/8d3d43c9d8f768894e7ed89b17eca5b… Patch: https://github.com/kamailio/kamailio/commit/8d3d43c9d8f768894e7ed89b17eca5b… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 9334a67835..d30d73ef5a 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -835,7 +835,7 @@ static int lua_sr_hdr_insert (lua_State *L) memcpy(hdr, txt, len); anchor = anchor_lump(env_L->msg, hf->name.s + hf->len - env_L->msg->buf, 0, 0); - if(insert_new_lump_before(anchor, hdr, len, 0) == 0) + if((anchor==NULL) || (insert_new_lump_before(anchor, hdr, len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr);

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019