sr-dev June 2019

sr-dev@lists.kamailio.org

19 participants
216 discussions

git:master:d19b32f7: pv: exported kemi functions to set root xavp values
by Daniel-Constantin Mierla 07 Jun '19

07 Jun '19

Module: kamailio Branch: master Commit: d19b32f75d3b84a3218163a090087f0c974ae009 URL: https://github.com/kamailio/kamailio/commit/d19b32f75d3b84a3218163a090087f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-07T09:14:43+02:00 pv: exported kemi functions to set root xavp values --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/d19b32f75d3b84a3218163a090087f0… Patch: https://github.com/kamailio/kamailio/commit/d19b32f75d3b84a3218163a090087f0… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 8af4af59e9..42ef30676b 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -899,6 +899,40 @@ static int w_xavp_params_implode(sip_msg_t *msg, char *pxname, char *pvname) return ki_xavp_params_implode(msg, &sxname, (str*)pvname); } +/** + * + */ +static int ki_xavp_seti(sip_msg_t *msg, str *rname, int ival) +{ + sr_xavp_t *xavp = NULL; + sr_xval_t xval; + + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_INT; + xval.v.i = ival; + + xavp = xavp_add_value(rname, &xval, NULL); + + return (xavp!=NULL)?1:-1; +} + +/** + * + */ +static int ki_xavp_sets(sip_msg_t *msg, str *rname, str *sval) +{ + sr_xavp_t *xavp = NULL; + sr_xval_t xval; + + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_STR; + xval.v.s = *sval; + + xavp = xavp_add_value(rname, &xval, NULL); + + return (xavp!=NULL)?1:-1; +} + /** * */ @@ -1634,6 +1668,16 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_seti"), + SR_KEMIP_INT, ki_xavp_seti, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("xavp_sets"), + SR_KEMIP_INT, ki_xavp_sets, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_get"), SR_KEMIP_XVAL, ki_xavp_get, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:cf0008d8: tm: detect local uac transaction not inserted in the hash table
by Daniel-Constantin Mierla 07 Jun '19

07 Jun '19

Module: kamailio Branch: master Commit: cf0008d843009acc8e40fcad3eceda063b1a358c URL: https://github.com/kamailio/kamailio/commit/cf0008d843009acc8e40fcad3eceda0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-07T08:48:34+02:00 tm: detect local uac transaction not inserted in the hash table --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/cf0008d843009acc8e40fcad3eceda0… Patch: https://github.com/kamailio/kamailio/commit/cf0008d843009acc8e40fcad3eceda0… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 9e67c91fa2..340c011d6e 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -589,7 +589,8 @@ static inline int t_uac_prepare(uac_req_t *uac_r, if (is_ack) { free_cell(new_cell); } else { - if(atomic_get_int(&new_cell->ref_count)==0) { + if((new_cell->next_c == 0 && new_cell->prev_c == 0) + || (atomic_get_int(&new_cell->ref_count)==0)) { free_cell(new_cell); } else { UNREF_FREE(new_cell, 0);

1 0

git:master:844a8854: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 06 Jun '19

06 Jun '19

Module: kamailio Branch: master Commit: 844a8854d52e7cb8056fdff286215f6318fc0122 URL: https://github.com/kamailio/kamailio/commit/844a8854d52e7cb8056fdff286215f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-06-06T12:32:47+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/844a8854d52e7cb8056fdff286215f6… Patch: https://github.com/kamailio/kamailio/commit/844a8854d52e7cb8056fdff286215f6…

1 0

git:master:e42cb58d: pv: docs - updated xavp management functions names
by Daniel-Constantin Mierla 06 Jun '19

06 Jun '19

Module: kamailio Branch: master Commit: e42cb58d3be13c1bfb65ce426c53a2f0ff78af0b URL: https://github.com/kamailio/kamailio/commit/e42cb58d3be13c1bfb65ce426c53a2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-06T12:09:41+02:00 pv: docs - updated xavp management functions names --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e42cb58d3be13c1bfb65ce426c53a2f… Patch: https://github.com/kamailio/kamailio/commit/e42cb58d3be13c1bfb65ce426c53a2f… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 464d5ac80b..c563f90d6f 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -327,9 +327,9 @@ xavp_params_implode("x", "$var(out)"); </programlisting> </example> </section> - <section id="pv.f.xavp_set_child_ival"> + <section id="pv.f.xavp_child_seti"> <title> - <function moreinfo="none">xavp_set_child_ival(rname, cname, ival)</function> + <function moreinfo="none">xavp_child_seti(rname, cname, ival)</function> </title> <para> Set the value of $xavp(rname=>cname) to integer value ival. @@ -343,19 +343,19 @@ xavp_params_implode("x", "$var(out)"); Function can be used from ANY ROUTE. </para> <example> - <title><function>xavp_set_child_ival</function> usage</title> + <title><function>xavp_child_seti</function> usage</title> <programlisting format="linespecific"> ... $var(n) = 10; -xavp_set_child_ival("x", "y", "$var(n)"); +xavp_child_seti("x", "y", "$var(n)"); # results in: $xavp(x=>y) is 10 ... </programlisting> </example> </section> - <section id="pv.f.xavp_set_child_sval"> + <section id="pv.f.xavp_child_sets"> <title> - <function moreinfo="none">xavp_set_child_sval(rname, cname, sval)</function> + <function moreinfo="none">xavp_child_sets(rname, cname, sval)</function> </title> <para> Set the value of $xavp(rname=>cname) to string value sval. @@ -369,11 +369,11 @@ xavp_set_child_ival("x", "y", "$var(n)"); Function can be used from ANY ROUTE. </para> <example> - <title><function>xavp_set_child_sval</function> usage</title> + <title><function>xavp_child_sets</function> usage</title> <programlisting format="linespecific"> ... $var(n) = 10; -xavp_set_child_sval("x", "y", "Count: $var(n)"); +xavp_child_sets("x", "y", "Count: $var(n)"); # results in: $xavp(x=>y) is "Count: 10" ... </programlisting> @@ -397,16 +397,16 @@ xavp_set_child_sval("x", "y", "Count: $var(n)"); <title><function>xavp_rm</function> usage</title> <programlisting format="linespecific"> ... -xavp_rm_child_sval("x"); +xavp_rm("x"); # same result as: $xavp(x) = $null; ... </programlisting> </example> </section> - <section id="pv.f.xavp_rm_child"> + <section id="pv.f.xavp_child_rm"> <title> - <function moreinfo="none">xavp_rm_child(rname, cname)</function> + <function moreinfo="none">xavp_child_rm(rname, cname)</function> </title> <para> Remove the value of $xavp(rname=>cname). @@ -420,10 +420,10 @@ xavp_rm_child_sval("x"); Function can be used from ANY ROUTE. </para> <example> - <title><function>xavp_rm_child</function> usage</title> + <title><function>xavp_child_rm</function> usage</title> <programlisting format="linespecific"> ... -xavp_rm_child_sval("x", "y"); +xavp_child_rm("x", "y"); # same result as: $xavp(x=>y) = $null; ... </programlisting>

1 0

git:master:a80f6e9c: pv: renamed xavp child management functions
by Daniel-Constantin Mierla 06 Jun '19

06 Jun '19

Module: kamailio Branch: master Commit: a80f6e9caffc80152c1a47a5f19774f919775cec URL: https://github.com/kamailio/kamailio/commit/a80f6e9caffc80152c1a47a5f19774f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-06T12:05:35+02:00 pv: renamed xavp child management functions - coherent pattern to reflect the operations --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a80f6e9caffc80152c1a47a5f19774f… Patch: https://github.com/kamailio/kamailio/commit/a80f6e9caffc80152c1a47a5f19774f…

1 0

git:master:15e6a4a9: pv: added kemi functions to test if xavp is null
by Daniel-Constantin Mierla 06 Jun '19

06 Jun '19

Module: kamailio Branch: master Commit: 15e6a4a9548edbae5c553a8c6e59f3ffe0006d4f URL: https://github.com/kamailio/kamailio/commit/15e6a4a9548edbae5c553a8c6e59f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-06T11:33:14+02:00 pv: added kemi functions to test if xavp is null --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/15e6a4a9548edbae5c553a8c6e59f3f… Patch: https://github.com/kamailio/kamailio/commit/15e6a4a9548edbae5c553a8c6e59f3f… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 0c5288b748..8031a56642 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1061,6 +1061,23 @@ static int w_xavp_rm_child(sip_msg_t *msg, char *prname, char *pcname) return ki_xavp_rm_child(msg, &rname, &cname); } +/** + * + */ +static int ki_xavp_is_null(sip_msg_t *msg, str *rname) +{ + sr_xavp_t *xavp=NULL; + + xavp = xavp_get_by_index(rname, 0, NULL); + if(xavp==NULL) { + return 1; + } + if(xavp->val.type == SR_XTYPE_NULL) { + return 1; + } + return -1; +} + /** * */ @@ -1171,6 +1188,30 @@ static sr_kemi_xval_t* ki_xavp_getw(sip_msg_t *msg, str *rname) return ki_xavp_get_mode(msg, rname, SR_KEMI_XVAL_NULL_PRINT); } +/** + * + */ +static int ki_xavp_child_is_null(sip_msg_t *msg, str *rname, str *cname) +{ + sr_xavp_t *xavp=NULL; + + xavp = xavp_get_by_index(rname, 0, NULL); + if(xavp==NULL) { + return 1; + } + if(xavp->val.type != SR_XTYPE_XAVP) { + return 1; + } + xavp = xavp_get_by_index(cname, 0, &xavp->val.v.xavp); + if(xavp==NULL) { + return 1; + } + if(xavp->val.type == SR_XTYPE_NULL) { + return 1; + } + return -1; +} + /** * */ @@ -1637,11 +1678,21 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_is_null"), + SR_KEMIP_INT, ki_xavp_is_null, + { 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("xavp_child_is_null"), + SR_KEMIP_INT, ki_xavp_child_is_null, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_get"), SR_KEMIP_XVAL, ki_xavp_get, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:04cd53eb: pv: added kemi functions to manage avps
by Daniel-Constantin Mierla 06 Jun '19

06 Jun '19

Module: kamailio Branch: master Commit: 04cd53eb9dec6079082a552f58f351f80bfc58dc URL: https://github.com/kamailio/kamailio/commit/04cd53eb9dec6079082a552f58f351f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-06T11:09:12+02:00 pv: added kemi functions to manage avps --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/04cd53eb9dec6079082a552f58f351f… Patch: https://github.com/kamailio/kamailio/commit/04cd53eb9dec6079082a552f58f351f…

1 0

[kamailio/kamailio] Ipsec tcp (#1974)
by alexyosifov 06 Jun '19

06 Jun '19

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1974 -- Commit Summary -- * ims_ipsec_pcscf: IPv6 support * ims_usrloc_pcscf: get_pcontact changes for IPv6 -- File Changes -- M src/modules/ims_ipsec_pcscf/README (80) M src/modules/ims_ipsec_pcscf/cmd.c (207) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (21) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (93) M src/modules/ims_ipsec_pcscf/ipsec.c (14) M src/modules/ims_ipsec_pcscf/ipsec.h (2) M src/modules/ims_usrloc_pcscf/udomain.c (128) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1974.patch https://github.com/kamailio/kamailio/pull/1974.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/1974

5 9

git:master:f2ba8d56: p_usrloc: fix a few more missing line breaks for log statements
by Henning Westerholt 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: f2ba8d560480c591401dd114411510357e7c0cea URL: https://github.com/kamailio/kamailio/commit/f2ba8d560480c591401dd1144115103… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-06-05T22:51:23+02:00 p_usrloc: fix a few more missing line breaks for log statements --- Modified: src/modules/p_usrloc/dlist.c Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/udomain.c Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_mi.c --- Diff: https://github.com/kamailio/kamailio/commit/f2ba8d560480c591401dd1144115103… Patch: https://github.com/kamailio/kamailio/commit/f2ba8d560480c591401dd1144115103…

1 0

git:master:54840835: kazoo: add missing log line breaks, partially by conversion to mem log helper
by Henning Westerholt 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 5484083570e1e2b21d73a296fc9e1e80633d6c66 URL: https://github.com/kamailio/kamailio/commit/5484083570e1e2b21d73a296fc9e1e8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-06-05T22:46:02+02:00 kazoo: add missing log line breaks, partially by conversion to mem log helper --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/5484083570e1e2b21d73a296fc9e1e8… Patch: https://github.com/kamailio/kamailio/commit/5484083570e1e2b21d73a296fc9e1e8…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2019