sr-dev October 2019

sr-dev@lists.kamailio.org

22 participants
436 discussions

git:5.3:5f477b4e: usrloc: keep a private copy of urecord before running ul_callbacks
by Victor Seva 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 5f477b4e58e4d9b02aa20176c314b2915ff832f5 URL: https://github.com/kamailio/kamailio/commit/5f477b4e58e4d9b02aa20176c314b29… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-07T23:11:03+02:00 usrloc: keep a private copy of urecord before running ul_callbacks fixes #2089 (cherry picked from commit f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/5f477b4e58e4d9b02aa20176c314b29… Patch: https://github.com/kamailio/kamailio/commit/5f477b4e58e4d9b02aa20176c314b29… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index d451057bdd..80980c4cdf 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -907,7 +907,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) str user, contact; int i; int n; - urecord_t* r; + urecord_t r; ucontact_t* c; #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; @@ -1013,12 +1013,16 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) } lock_udomain(_d, &user); - get_static_urecord(_d, &user, &r); + /* don't use the same static value from get_static_urecord() */ + memset( &r, 0, sizeof(struct urecord) ); + r.aor = user; + r.aorhash = ul_get_aorhash(&user); + r.domain = _d->name; - if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) { + if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", user.len, user.s); - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); goto error; } @@ -1041,7 +1045,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) user.len, user.s); } } - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */

1 0

[kamailio/kamailio] ursloc has a memory leak if db_mode is DB_ONLY and calling reg_fetch_contacts() (#2089)
by Victor Seva 07 Oct '19

07 Oct '19

### Description usrloc should not leave any ucontact behind when on DB_ONLY ### Troubleshooting #### Reproduction ``` event_route[usrloc:contact-expired] { $var(uri) = "sip:" + $ulc(exp=>aor) + "@localhost"; xinfo("expired contact for $ulc(exp=>aor) uri:$var(uri)"); reg_fetch_contacts("location", "$var(uri)", "caller"); if($(ulc(caller=>count)) < 0) { xinfo("no more contacts for $ulc(exp=>aor)\n"); } else { xinfo("$ulc(exp=>aor) has $(ulc(caller=>count)) contacts left\n"); } return; } ``` REGISTER a subscriber and let it expire #### Debugging Data after ``` root@16d059a62a76:/code/utils/kamcmd# sh /kamdev/shm_dump.sh 1 2 qm_status: alloc'd from usrloc: dlist.c: new_dlist(557) 2 qm_status: alloc'd from usrloc: dlist.c: new_dlist(565) 2 qm_status: alloc'd from usrloc: ucontact.c: new_ucontact(96) 2 qm_status: alloc'd from usrloc: udomain.c: new_udomain(91) 2 qm_status: alloc'd from usrloc: udomain.c: new_udomain(98) 2 qm_status: alloc'd from usrloc: ul_callback.c: init_ulcb_list(45) 2 qm_status: alloc'd from usrloc: ul_callback.c: register_ulcb(94) 6 qm_status: alloc'd from usrloc: udomain.c: build_stat_name(56) 10 qm_status: alloc'd from usrloc: ../../core/ut.h: shm_str_dup(722) ``` #### Log Messages ``` 1(4112) DEBUG: usrloc [udomain.c:996]: udomain_contact_expired_cb(): calling contact expired records - cycle [1] 1(4112) DEBUG: usrloc [ul_callback.h:83]: run_ul_callbacks(): contact=0x7f621e476bd0, callback type 8/8, id 0 entered 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1015 a=63 n=assign 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1016 a=25 n=xinfo 1(4112) INFO: <script>: expired contact for 1001-whatever uri:sip:1001-whatever@localhost 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1017 a=27 n=reg_fetch_contacts 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1022 a=16 n=if 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1021 a=25 n=xinfo 1(4112) INFO: <script>: 1001-whatever has 1 contacts left 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1023 a=2 n=return ``` ### Possible Solutions I think the problem resides on udomain_contact_expired_cb() and using get_urecord(). PR will follow. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.0-dev0 (x86_64/linux) 075c74 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 075c74 compiled on 10:36:45 Oct 3 2019 with gcc 8.3.0 ``` -- 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/issues/2089

1 2

[kamailio/kamailio] usrloc: keep a private copy of urecord before running ul_callbacks (#2090)
by Victor Seva 07 Oct '19

07 Oct '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2089 #### Description keep a local urecord in order not to loose ucontacts when calling ul_callbacks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2090 -- Commit Summary -- * usrloc: keep a private copy of urecord before running ul_callbacks -- File Changes -- M src/modules/usrloc/udomain.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2090.patch https://github.com/kamailio/kamailio/pull/2090.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/2090

2 3

git:master:f3cf0a2f: usrloc: keep a private copy of urecord before running ul_callbacks
by Victor Seva 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b URL: https://github.com/kamailio/kamailio/commit/f3cf0a2f4e60a3a7185baa106869dab… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-07T22:56:21+02:00 usrloc: keep a private copy of urecord before running ul_callbacks fixes #2089 --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/f3cf0a2f4e60a3a7185baa106869dab… Patch: https://github.com/kamailio/kamailio/commit/f3cf0a2f4e60a3a7185baa106869dab… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index d451057bdd..80980c4cdf 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -907,7 +907,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) str user, contact; int i; int n; - urecord_t* r; + urecord_t r; ucontact_t* c; #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; @@ -1013,12 +1013,16 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) } lock_udomain(_d, &user); - get_static_urecord(_d, &user, &r); + /* don't use the same static value from get_static_urecord() */ + memset( &r, 0, sizeof(struct urecord) ); + r.aor = user; + r.aorhash = ul_get_aorhash(&user); + r.domain = _d->name; - if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) { + if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", user.len, user.s); - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); goto error; } @@ -1041,7 +1045,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) user.len, user.s); } } - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */

1 0

[kamailio] avpops: avp_copy add xavp (#7)
by Victor Seva 07 Oct '19

07 Oct '19

We have avp_copy on avpops module but we don’t have anything to copy xavps. ``` // copy all the content of an avp to a xavp $xavp(a[0]=>b) = $(avp(x)[*]); // deleting left content $xavp(a[0]=>b[*]) = $(avp(x)[*]); // copy xavp to a xavp with index $xavp(a[0]) = $xavp(b[1]); // all $xavp(a[*]) = $xavp(b[*]); // copy all content of a xavp to a avp $avp(x) = $xavp(a[0]=>b[*]); ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/7

4 8

git:master:2f641a40: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 2f641a405ad703f5b3124621aa30291ef8742903 URL: https://github.com/kamailio/kamailio/commit/2f641a405ad703f5b3124621aa30291… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-07T21:01:09+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/2f641a405ad703f5b3124621aa30291… Patch: https://github.com/kamailio/kamailio/commit/2f641a405ad703f5b3124621aa30291…

1 0

[kamailio/kamailio] core: adding xavp_clone_level_nodata_with_new_name (#2070)
by Julien Chavanton 07 Oct '19

07 Oct '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] New feature (non-breaking change which adds new functionality) #### Checklist: - [x] Tested changes locally #### Description proposal for `xavp_copy()` param1: source xavp name param2: source xavp index param3: destination xavp name The command will copy only one specific xavp from the stack. If the destination xavp stack exist it will append else it will create a new one, it seems to be more or less compatible to what we do with XAVP in general. We can not reorder xavp stack like in the following example : ``` route[TEST] { $xavp(a=>x) = "a-0-x"; $xavp(a[0]=>y) = "a-0-y"; $xavp(a=>x) = "a-1-x"; $xavp(a[0]=>y) = "a-1-y"; xinfo("$$xavp(a[0]) = [$xavp(a[0]=>x)][$xavp(a[0]=>y)]\n"); xinfo("$$xavp(a[1]) = [$xavp(a[1]=>x)][$xavp(a[1]=>y)]\n"); $var(src_idx) = 1; $var(v) = "b"; xavp_copy("a", "$var(src_idx)", "$var(v)"); $var(src_idx) = 0; xavp_copy("a", "$var(src_idx)", "$var(v)"); xinfo("$$xavp(b[0]) = [$xavp(b[0]=>x)][$xavp(b[0]=>y)]\n"); xinfo("$$xavp(b[1]) = [$xavp(b[1]=>x)][$xavp(b[1]=>y)]\n"); } ``` ``` 2(137) INFO: <script>: $xavp(a[0]) = [a-1-x][a-1-y] 2(137) INFO: <script>: $xavp(a[1]) = [a-0-x][a-0-y] 2(137) INFO: pv [pv.c:827]: w_xavp_copy(): xavp_copy(new): $xavp(a[1]) >> $xavp(b) 2(137) INFO: pv [pv.c:833]: w_xavp_copy(): xavp_copy(append): $xavp(a[0]) >> $xavp(b) 2(137) INFO: <script>: $xavp(b[0]) = [a-0-x][a-0-y] 2(137) INFO: <script>: $xavp(b[1]) = [a-1-x][a-1-y] ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2070 -- Commit Summary -- * core: adding xavp_clone_level_nodata_with_new_name -- File Changes -- M src/core/xavp.c (126) M src/core/xavp.h (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2070.patch https://github.com/kamailio/kamailio/pull/2070.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/2070

3 11

git:master:75226997: Merge pull request #2070 from kamailio/xavp_copy
by GitHub 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 75226997422218a70acc121f4d9f65d9034de7ce URL: https://github.com/kamailio/kamailio/commit/75226997422218a70acc121f4d9f65d… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-10-07T12:00:57-07:00 Merge pull request #2070 from kamailio/xavp_copy pv: adding xavp_copy --- Modified: src/core/xavp.c Modified: src/core/xavp.h Modified: src/modules/pv/doc/pv_admin.xml Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/75226997422218a70acc121f4d9f65d… Patch: https://github.com/kamailio/kamailio/commit/75226997422218a70acc121f4d9f65d…

1 0

git:master:e3816557: pv: adding xavp_copy
by Julien Chavanton 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: e38165575c5e05e871fd3eb89973b385c2146539 URL: https://github.com/kamailio/kamailio/commit/e38165575c5e05e871fd3eb89973b38… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-10-01T09:23:13-07:00 pv: adding xavp_copy --- Modified: src/modules/pv/doc/pv_admin.xml Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/e38165575c5e05e871fd3eb89973b38… Patch: https://github.com/kamailio/kamailio/commit/e38165575c5e05e871fd3eb89973b38…

1 0

git:master:3cffe878: core: adding xavp_clone_level_nodata_with_new_name
by Julien Chavanton 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 3cffe8789fd14baef4ff548bb2afc5b2ca9ed66e URL: https://github.com/kamailio/kamailio/commit/3cffe8789fd14baef4ff548bb2afc5b… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-10-01T09:22:43-07:00 core: adding xavp_clone_level_nodata_with_new_name --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/3cffe8789fd14baef4ff548bb2afc5b… Patch: https://github.com/kamailio/kamailio/commit/3cffe8789fd14baef4ff548bb2afc5b… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index e5e33f6e9d..f279def1ed 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -693,11 +693,16 @@ struct str_list *xavp_get_list_key_names(sr_xavp_t *xavp) return result; } +sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) +{ + return xavp_clone_level_nodata_with_new_name(xold, &xold->name); +} + /** * clone the xavp without values that are custom data * - only one list level is cloned, other sublists are ignored */ -sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) +sr_xavp_t *xavp_clone_level_nodata_with_new_name(sr_xavp_t *xold, str *dst_name) { sr_xavp_t *xnew = NULL; sr_xavp_t *navp = NULL; @@ -713,13 +718,13 @@ sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) LM_INFO("xavp value type is 'data' - ignoring in clone\n"); return NULL; } - xnew = xavp_new_value(&xold->name, &xold->val); + xnew = xavp_new_value(dst_name, &xold->val); if(xnew==NULL) { LM_ERR("cannot create cloned root xavp\n"); return NULL; } - LM_DBG("cloned root xavp [%.*s]\n", xold->name.len, xold->name.s); + LM_DBG("cloned root xavp [%.*s] >> [%.*s]\n", xold->name.len, xold->name.s, dst_name->len, dst_name->s); if(xold->val.type!=SR_XTYPE_XAVP) { diff --git a/src/core/xavp.h b/src/core/xavp.h index 071a421a4a..85c4bb3a3d 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -102,6 +102,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list); void xavp_print_list(sr_xavp_t **head); sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold); +sr_xavp_t *xavp_clone_level_nodata_with_new_name(sr_xavp_t *xold, str *dst_name); sr_xavp_t* xavp_get_child(str *rname, str *cname); sr_xavp_t* xavp_get_child_with_ival(str *rname, str *cname);

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2019