sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
296 discussions

git:master:75994f40: htable: Fix expiry on assignment
by Daniel-Constantin Mierla 27 Jan '25

27 Jan '25

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

1 0

[kamailio/kamailio] The future of internal libraries (Issue #4041)
by Daniel-Constantin Mierla 27 Jan '25

27 Jan '25

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>

4 14

git:master:200cdb31: core/parser/sdp: proper test for media ip separator
by Daniel-Constantin Mierla 26 Jan '25

26 Jan '25

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; }

1 0

[kamailio/kamailio] Unexpected return code from route with switch-case block (Issue #4088)
by Marat 24 Jan '25

24 Jan '25

### 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>

2 2

[kamailio/kamailio] Module dispatcher: ds_is_active() return incorrect. (Issue #4001)
by Minh Vũ 24 Jan '25

24 Jan '25

#### 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 5

git:master:65e51b77: presence: do not break on one notify sending failure
by Daniel-Constantin Mierla 24 Jan '25

24 Jan '25

Module: kamailio Branch: master Commit: 65e51b776290a1981e9ac27fbe6b47813516bc8b URL: https://github.com/kamailio/kamailio/commit/65e51b776290a1981e9ac27fbe6b478… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-24T16:53:10+01:00 presence: do not break on one notify sending failure - try all of them, debug message with successful and failure counters - GH #4118 --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/65e51b776290a1981e9ac27fbe6b478… Patch: https://github.com/kamailio/kamailio/commit/65e51b776290a1981e9ac27fbe6b478… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 47a11b23183..191cac0d04b 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1557,6 +1557,8 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) subs_t *subs_array = NULL, *s = NULL; str *notify_body = NULL, *aux_body = NULL; int ret_code = -1; + int retOK = 0; + int retErr = 0; subs_array = get_subs_dialog(pres_uri, event, NULL); if(subs_array == NULL) { @@ -1586,7 +1588,9 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) < 0) { LM_ERR("Could not send notify for [event]=%.*s\n", event->name.len, event->name.s); - goto done; + retErr++; + } else { + retOK++; } if(aux_body != NULL) { @@ -1599,7 +1603,10 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) } } - ret_code = 1; + LM_DBG("sent ok: %d - err: %d\n", retOK, retErr); + if(retOK > 0) { + ret_code = 1; + } done: free_subs_list(subs_array, PKG_MEM_TYPE, 0);

1 0

git:master:b788c39b: github: [codeql] use all available processors when building [skip ci]
by GitHub 24 Jan '25

24 Jan '25

Module: kamailio Branch: master Commit: b788c39bf848fe9d04d0429094156028a991845b URL: https://github.com/kamailio/kamailio/commit/b788c39bf848fe9d04d042909415602… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2025-01-24T15:29:25+01:00 github: [codeql] use all available processors when building [skip ci] --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/b788c39bf848fe9d04d042909415602… Patch: https://github.com/kamailio/kamailio/commit/b788c39bf848fe9d04d042909415602… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9cdeafc77ff..1ca3734de17 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -75,7 +75,7 @@ jobs: - name: Build cpp if: ${{ matrix.language == 'cpp' }} - run: make all + run: make -j$(nproc) all - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3

1 0

git:master:f69b22ce: cmake: Install snmpstats files
by Xenofon Karamanos 24 Jan '25

24 Jan '25

Module: kamailio Branch: master Commit: f69b22ce3cdc2c06739c11f19c9ebeb5eb1727f3 URL: https://github.com/kamailio/kamailio/commit/f69b22ce3cdc2c06739c11f19c9ebeb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-24T09:59:18Z cmake: Install snmpstats files --- Modified: src/modules/snmpstats/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f69b22ce3cdc2c06739c11f19c9ebeb… Patch: https://github.com/kamailio/kamailio/commit/f69b22ce3cdc2c06739c11f19c9ebeb… --- diff --git a/src/modules/snmpstats/CMakeLists.txt b/src/modules/snmpstats/CMakeLists.txt index fa3980030db..ac416979da7 100644 --- a/src/modules/snmpstats/CMakeLists.txt +++ b/src/modules/snmpstats/CMakeLists.txt @@ -7,3 +7,8 @@ find_package(NETSNMP REQUIRED) # TODO: Compiles fine but need to do some more verifcation target_link_libraries(${module_name} PRIVATE NETSNMP::NETSNMP) + +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mibs + DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp/ + OPTIONAL)

1 0

git:5.8:0cf639ec: pkg/kamailio: added support for CentOS 10 [skip-ci]
by Sergey Safarov 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: 0cf639eceb6a8fea50d19184add989e049dfb6ca URL: https://github.com/kamailio/kamailio/commit/0cf639eceb6a8fea50d19184add989e… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-01-23T16:14:59+02:00 pkg/kamailio: added support for CentOS 10 [skip-ci] (cherry picked from commit cdafda78c9fc98d9d9fdb7f94e77c9bc60ebf4d1) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0cf639eceb6a8fea50d19184add989e… Patch: https://github.com/kamailio/kamailio/commit/0cf639eceb6a8fea50d19184add989e… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9c9c257fafb..eb0885e71c5 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -116,21 +116,21 @@ %bcond_without wolfssl %endif -%if 0%{?rhel} == 9 +%if 0%{?rhel} == 9 || 0%{?rhel} == 10 %if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} -%define dist .el9.centos +%define dist .el%{?centos_ver}.centos %endif %if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} -%define dist .el9.almalinux +%define dist .el%{?almalinux_ver}.almalinux %endif %if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} -%define dist .el9.rocky +%define dist .el%{?rocky_ver}.rocky %endif %if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 %define dist_name rhel

1 0

git:5.8:0e51b497: pkg/kamailio: simplified systemd unit files installation [skip ci]
by Sergey Safarov 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: 0e51b497a19c525a89d5fead5e0854b2b18317dd URL: https://github.com/kamailio/kamailio/commit/0e51b497a19c525a89d5fead5e0854b… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-01-23T14:56:40+02:00 pkg/kamailio: simplified systemd unit files installation [skip ci] (cherry picked from commit c47108eacba1a6cf7e8564a00ff0850f621d29aa) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0e51b497a19c525a89d5fead5e0854b… Patch: https://github.com/kamailio/kamailio/commit/0e51b497a19c525a89d5fead5e0854b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f160ec6d7ad..9c9c257fafb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1205,7 +1205,6 @@ sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/ob %build -ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 export FREERADIUS=1 %endif @@ -1444,29 +1443,29 @@ install -d %{buildroot}%{_sharedstatedir}/kamailio # On RedHat 6 like install -d %{buildroot}%{_var}/run/kamailio install -d %{buildroot}%{_sysconfdir}/rc.d/init.d -install -m755 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.init \ +install -m755 pkg/kamailio/obs/kamailio.init \ %{buildroot}%{_sysconfdir}/rc.d/init.d/kamailio %else # systemd install -d %{buildroot}%{_unitdir} -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.service %{buildroot}%{_unitdir}/kamailio.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf +install -Dpm 0644 pkg/kamailio/obs/kamailio.service %{buildroot}%{_unitdir}/kamailio.service +install -Dpm 0644 pkg/kamailio/obs/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service +install -Dpm 0644 pkg/kamailio/obs/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service +install -Dpm 0644 pkg/kamailio/obs/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf +install -Dpm 0644 pkg/kamailio/obs/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf %endif %if 0%{?suse_version} install -d %{buildroot}%{_fillupdir} -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/sipcapture %endif

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2025