sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master:65a296b3: htable: wrapped maco code in do {} while(0)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 65a296b3478503ed3519ea9156d8f46f5cb9ce2a URL: https://github.com/kamailio/kamailio/commit/65a296b3478503ed3519ea9156d8f46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-27T10:20:49+01:00 htable: wrapped maco code in do {} while(0) --- Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/65a296b3478503ed3519ea9156d8f46… Patch: https://github.com/kamailio/kamailio/commit/65a296b3478503ed3519ea9156d8f46… --- diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 4e0757f237b..d9fc187e722 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -144,10 +144,19 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); -#define HT_UPDATE_EXPIRE(ht, it, now) \ - if(ht->updateexpire || (now && it->expire && it->expire < now)) \ - it->expire = now + ht->htexpire -#define HT_COPY_EXPIRE(ht, it, now, src) \ - HT_UPDATE_EXPIRE(ht, it, now); \ - else it->expire = src->expire +#define HT_UPDATE_EXPIRE(ht, it, now) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } \ + } while(0) +#define HT_COPY_EXPIRE(ht, it, now, src) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } else { \ + it->expire = src->expire; \ + } \ + } while(0) + #endif

2 weeks, 6 days

[kamailio/kamailio] htable: Fix expiry on assignment (PR #4103)

by Bastian Triller

Update cell expiry on assignment for htables w/o updateexpiry (analogue to #4079).   #### 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 - [ ] 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  Currently Kamailio does not update expiry when assigning a value to an expired cell if htable's `updateexpire` equals `0`. So expired cells aren't usable as long htable timer cleans up these cells. Reproduction 1: ``` #!KAMAILIO listen=udp:127.0.0.1:9999 log_stderror=yes loadmodule "xlog.so" loadmodule "pv.so" loadmodule "sl.so" loadmodule "htable.so" modparam("htable", "htable", "foo=>autoexpire=1;updateexpire=0;initval=0") request_route { if ($sht(foo=>bar) == $null) { xlog("it's null, init it\n"); } $sht(foo=>bar) = $sht(foo=>bar) + 1; xlog("$Ts value $sht(foo=>bar)\texpire $shtex(foo=>bar)\n"); sl_send_reply("200", "Hello"); } ``` output: ``` 0(787651) ERROR: <script>: 1736855046 value 1 expire 1 0(787651) ERROR: <script>: 1736855046 value 2 expire 1 0(787651) ERROR: <script>: 1736855047 value 3 expire 0 0(787651) ERROR: <script>: 1736855048 value 0 expire 4294967295 0(787651) ERROR: <script>: 1736855048 value 0 expire 4294967295 0(787651) ERROR: <script>: 1736855049 value 0 expire 4294967294 0(787651) ERROR: <script>: 1736855050 value 0 expire 4294967293 SNIP expire decreases while value stays 0 0(787651) ERROR: <script>: 1736855066 value 1 expire 1 0(787651) ERROR: <script>: 1736855066 value 2 expire 1 0(787651) ERROR: <script>: 1736855067 value 3 expire 0 ``` Reproduction 2: ``` #!KAMAILIO listen=udp:127.0.0.1:9999 log_stderror=yes loadmodule "xlog.so" loadmodule "pv.so" loadmodule "sl.so" loadmodule "htable.so" modparam("htable", "htable", "baz=>") modparam("htable", "htable", "foo=>autoexpire=1;updateexpire=0") request_route { if ($sht(foo=>bar) == $null) { xlog("it's null, init it\n"); } $sht(foo=>bar) = $_s($shtinc(baz=>cnt)); xlog("$Ts value $sht(foo=>bar)\texpire $shtex(foo=>bar)\n"); sl_send_reply("200", "Hello"); } event_route[htable:mod-init] { xlog("htable:mod-init\n"); # $sht(foo=>bar) = 0; $sht(baz=>cnt) = 0; } ``` output: ``` 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855379 value 1 expire 1 0(789709) ERROR: <script>: 1736855379 value 2 expire 1 0(789709) ERROR: <script>: 1736855380 value 3 expire 0 0(789709) ERROR: <script>: 1736855380 value 4 expire 0 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855381 value <null> expire 4294967295 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855382 value <null> expire 4294967294 SNIP expire decreases value stays null 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855399 value 33 expire 1 0(789709) ERROR: <script>: 1736855399 value 34 expire 1 0(789709) ERROR: <script>: 1736855400 value 35 expire 0 0(789709) ERROR: <script>: 1736855400 value 36 expire 0 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4103 -- Commit Summary -- * htable: Fix expiry on assignment -- File Changes -- M src/modules/htable/ht_api.c (24) M src/modules/htable/ht_api.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4103.patch https://github.com/kamailio/kamailio/pull/4103.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4103 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4103(a)github.com>

2 weeks, 6 days

git:master:75994f40: htable: Fix expiry on assignment

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 75994f40c99ffa2c7c33e5fce5e3d3cd8db7d780 URL: https://github.com/kamailio/kamailio/commit/75994f40c99ffa2c7c33e5fce5e3d3c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-27T10:15:59+01:00 htable: Fix expiry on assignment Update cell expiry on assignment for htables w/o updateexpiry (analogue to #4079). --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/75994f40c99ffa2c7c33e5fce5e3d3c… Patch: https://github.com/kamailio/kamailio/commit/75994f40c99ffa2c7c33e5fce5e3d3c… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 9190dd310ff..47b4b975194 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -496,9 +496,7 @@ int ht_set_cell_ex( it->value.s.s[it->value.s.len] = '\0'; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -514,11 +512,7 @@ int ht_set_cell_ex( cell->next = it->next; cell->prev = it->prev; if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -535,9 +529,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -556,11 +548,7 @@ int ht_set_cell_ex( return -1; } if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -578,9 +566,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 5ac11b9bb00..4e0757f237b 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -143,4 +143,11 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); + +#define HT_UPDATE_EXPIRE(ht, it, now) \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) \ + it->expire = now + ht->htexpire +#define HT_COPY_EXPIRE(ht, it, now, src) \ + HT_UPDATE_EXPIRE(ht, it, now); \ + else it->expire = src->expire #endif

2 weeks, 6 days

[kamailio/kamailio] The future of internal libraries (Issue #4041)

by Daniel-Constantin Mierla

Considering that it hasn't been much activity around the internal libraries for long time, I was wondering if it still makes sense to keep them like they are or merge them in the core. Recently, during the devel meeting, I relocated a couple of them to the archive. The `lib/binrpc` (and `print`) can have the same fate, being not actually used. The srdb1 is very common and I guess it is very rare the case when a deployment is used without a module not depending on it (e.g., even if dispatcher is used with a list file, the code is still linked to this library). The `trie` library is small and `ims` is actually a set of getter functions for message attribtues/headers. The `srdb2` is not used much, but I think the right approach for it is to change the modules using it to `libsrdb1` and get rid of it completely sometime in the future. Till then the code is not big and can reside as part of the core. The benefits I see are in simplifying the build system (current makefiles and hopefully soon-to-be-merged the one based on cmake), reducing also the time to compute compile and link dependencies; getting rid of packaging complexity (same library may be needed by different modules, which, when packaged separately, the library has to be in a 3rd package, or have dependency of the other module's package -- probably now the libs are shipped with the core package). The code for libs can stay at the same location, so source code for modules doesn't need to be updated, just that they are compiled with the core, removing internal libs from makefiles. Thinking that we go for 6.0.x, clarifying the plans for this component and cleaning it, if decided so, should fit well in such version number jump. Opinions? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4041 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4041(a)github.com>

2 weeks, 6 days

[kamailio/kamailio] [rtpengine] failure to ping rtpengine results in consistent core dump in kamailio 5.8.2 (Issue #4122)

by Brandon Armstead

### RTPEngine + RTIMER + SEGFAULT + unable to ping When unable to ping RTPEngine instances kamailio crashes. ### Troubleshooting Determined issue was related to the ping failures, resolved AWS SG issue, allowing successful pings. Issue subsequently went away. #### Reproduction Use rtpengine with RDS backend Load rtpengine with ~ 20 destinations you do not expect a response from on Use rtimer to call rtpengine.reload via jsonrpcs: ``` modparam("rtimer", "timer", "name=rtpengine;interval=60;mode=0;") modparam("rtimer", "exec", "timer=rtpengine;route=RELOAD_RTPENGINE") route[RELOAD_RTPENGINE] { xinfo("RTPEngine database reloading"); jsonrpc_exec('{"jsonrpc": "2.0", "method": "rtpengine.reload", "id": 1}'); } ``` #### Debugging Data Got a core dump -- although I deleted quickly (not thinking) as they were running instances out of disk quickly. bt full did not show much to step through all though clearly pointed to rtpengine. #### Log Messages ``` send_rtpp_command(): timeout waiting reply for command "ping" from RTPEngine <udp:10.0.X.X> ``` ### Possible Solutions TBD / do not have ping failures under heavy load. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_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: unknown compiled with gcc 10.2.1 ``` * **Operating System**: ``` uname -a Linux 5.10.0-27-cloud-amd64 #1 SMP Debian 5.10.205-2 (2023-12-31) x86_64 GNU/Linux cat /proc/version Linux version 5.10.0-27-cloud-amd64 (debian-kernel(a)lists.debian.org) (gcc-10 (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2) #1 SMP Debian 5.10.205-2 (2023-12-31) lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4122 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4122(a)github.com>

2 weeks, 6 days

git:master:200cdb31: core/parser/sdp: proper test for media ip separator

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 200cdb318569191cd012dfe99b252f98fe9623b9 URL: https://github.com/kamailio/kamailio/commit/200cdb318569191cd012dfe99b252f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-26T18:07:54+01:00 core/parser/sdp: proper test for media ip separator --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/200cdb318569191cd012dfe99b252f9… Patch: https://github.com/kamailio/kamailio/commit/200cdb318569191cd012dfe99b252f9… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 61022b6148f..893ef0e58a4 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -561,7 +561,7 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) * - for length, at least 6: ' IP[4|6] x...' * - white space after */ - if(cp + 6 > mediaip->s + mediaip->len && cp[4] != ' ') { + if(cp + 6 > mediaip->s + mediaip->len || cp[4] != ' ') { LM_ERR("invalid content for `%s' line\n", line); return -1; }

3 weeks

[kamailio/kamailio] Fixes SUBSCRIBE and NOTIFY mechanism in case of registration refresh (PR #4123)

by Supreeth Herle

#### 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:  - [ ] 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/4123 -- Commit Summary -- * ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265 * ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4123.patch https://github.com/kamailio/kamailio/pull/4123.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4123 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4123(a)github.com>

3 weeks

[kamailio/kamailio] lib/srdb1/schema: ims_usrloc_scscf definitions (PR #4110)

by Victor Seva

#### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #4100 #### Description add ims_usrloc_scscf definitions You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4110 -- Commit Summary -- * lib/srdb1/schema: ims_usrloc_scscf definitions -- File Changes -- A src/lib/srdb1/schema/contact.xml (100) A src/lib/srdb1/schema/impu.xml (99) A src/lib/srdb1/schema/impu_contact.xml (52) A src/lib/srdb1/schema/impu_subscriber.xml (52) A src/lib/srdb1/schema/kamailio-ims_usrloc_scscf.xml (16) A src/lib/srdb1/schema/subscriber_scscf.xml (123) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4110.patch https://github.com/kamailio/kamailio/pull/4110.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4110 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4110(a)github.com>

3 weeks, 1 day

[kamailio/kamailio] Unexpected return code from route with switch-case block (Issue #4088)

by Marat

### Description I see unexpected return code from route if there is no explicit `return` and switch-case block.  #### Reproduction Here is simple configuration part: ``` route(TEST_ROUTE_WITH_SWITCH); xlog("L_WARN", "TEST_ROUTE_WITH_SWITCH result $rc\n"); ... route[TEST_ROUTE_WITH_SWITCH] { $var(a) = "a"; switch ($var(a)) { case "a": case "b": $var(b) = $var(a); break; default: $var(c) = $var(a); } # must be optional according to documentation: # https://www.kamailio.org/wiki/cookbooks/5.3.x/core#return # > If no value is specified, or a route reaches its end without executing a return statement, it returns 1. # # return 1; } ``` Log: ``` WARNING: <script>: TEST_ROUTE_WITH_SWITCH result 0 ``` At the same time if there is no switch-block, return code is 1 as expected: ``` route[TEST_ROUTE_WITH_SWITCH] { $var(a) = "a"; } ``` Log: ``` WARNING: <script>: TEST_ROUTE_WITH_SWITCH w/o switch-case result 1 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` $ ./build/sbin/kamailio -v version: kamailio 5.7.5 (x86_64/linux) b47500-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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_BLOCKLIST, 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: b47500 -dirty compiled on 22:02:13 Nov 9 2024 with /usr/bin/gcc 11.3.1 ``` * **Operating System**:  ``` Oracle Linux 9 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4088 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4088(a)github.com>

3 weeks, 1 day

[kamailio/kamailio] Module dispatcher: ds_is_active() return incorrect. (Issue #4001)

by Minh Vũ

#### Kamailo 5.8 ### Description I use ```ds_is_active function()``` in ```dispatcher``` module. ``` $var(sip_url) = $sht(conf_fs=>$var(conf_id)); # sip:192.168.1.44:5060 if(ds_is_active("1", "$var(sip_url)")){ #### is allways run } ``` or ```ds_is_active("1", $var(sip_url))``` #### Debugging Data When I check dispatcher: ``` "DEST": { "URI": "sip:192.168.1.44:5060", "FLAGS": "IP", "PRIORITY": 0, "ATTRS": { "BODY": "rweight=50;weight=50;cc=1", "DUID": null, "MAXLOAD": 0, "WEIGHT": 50, "RWEIGHT": 50, "SOCKET": null, "SOCKNAME": null, "OBPROXY": null } } ``` Why is the flag set to ```IP```, but ```ds_is_active()``` returns true? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4001 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4001(a)github.com>

3 weeks, 2 days

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev