- sr-dev - kamailio.org

[kamailio/kamailio] kamailio 5.4.5: "0 ID or NULL NAME AVP!" in lcr module (#2709)
by mdyrna 16 Apr '21

16 Apr '21

### Description  After upgrading kamailio from 5.4.4 to 5.4.5, the lcr module logs an error for outgoing calls. load_gws returns success (1), but does not populate the avps. Consequently, next_gw fails. ### Troubleshooting #### Reproduction  kamailio.cfg: ``` loadmodule "lcr.so" ... modparam("lcr", "db_url", "cluster://cls1") modparam("lcr", "gw_uri_avp", "$avp(i:709)") modparam("lcr", "ruri_user_avp", "$avp(i:500)") modparam("lcr", "tag_avp", "$avp(lcr_tag)") modparam("lcr", "flags_avp", "$avp(i:712)") modparam("lcr", "defunct_capability", 1) modparam("lcr", "lcr_id_avp", "$avp(s:lcr_id_avp)") modparam("lcr", "defunct_gw_avp", "$avp(s:defunct_gw_avp)") modparam("lcr", "ping_interval", 60) ... route[LCR] { if(!($rU=~"^[+0-9]")) return; if(is_method("INVITE")) { if (!($fU=~"^[+0-9]+$")) { append_hf("P-Asserted-Identity: <sip:+49xxxxxxxxxxx@xxxxx.de>\n"); append_hf("Privacy: id\n"); $fn = "Anonymous"; $fu = "sip:+49xxxxxxxxxxx@xxxxx.de"; } if(load_gws(1, $rU, $var(caller_uri)) != 1) { xlog("L_ERROR", "Couldn't load gateways\n"); sl_send_reply("500", "Server Internal Error - Cannot load gateways"); exit; } else { xlog("L_INFO", "GW Selected '$avp(i:709)'\n"); xlog("L_INFO", "Domain of destination: $dd\n"); xlog("L_INFO", "To URI: $tu\n"); } if(!next_gw()) { xlog("L_WARN", "No gateway configured for $rU\n"); sl_send_reply("503", "Service not available, no gateways found"); exit; } else { xlog("L_INFO", "Calling the first matched gateway\n"); xlog("L_INFO", "ruri_user_avp: '$avp(i:500)'\n"); xlog("L_INFO", "To URI after next_gw: $tu\n"); xlog("L_INFO", "Request URI: $ru\n"); } t_on_failure("MANAGE_FAILURE_LCR"); route(RELAY); exit; } } ``` #### Debugging Data  #### Log Messages  ``` Apr 15 20:59:27 x /usr/sbin/kamailio[879]: ERROR: <core> [core/usr_avp.c:152]: create_avp(): 0 ID or NULL NAME AVP! Apr 15 20:59:27 x /usr/sbin/kamailio[879]: ERROR: <core> [core/usr_avp.c:152]: create_avp(): 0 ID or NULL NAME AVP! Apr 15 20:59:27 x /usr/sbin/kamailio[879]: INFO: <script>: GW Selected '<null>' Apr 15 20:59:27 x /usr/sbin/kamailio[879]: INFO: <script>: Domain of destination: <null> Apr 15 20:59:27 x /usr/sbin/kamailio[879]: INFO: <script>: To URI: sip:+49177xxxxxxx@xx.xxx.x.xxx:5060 Apr 15 20:59:27 x /usr/sbin/kamailio[879]: WARNING: <script>: No gateway configured for +49177xxxxxxx ``` #### SIP Traffic  SIP request: ``` INVITE sip:+49177xxxxxxx@xx.xx.xx.xxx:5060 SIP/2.0 Via: SIP/2.0/UDP xxx.xx.xx.xxx:xxxxx;branch=z9hG4bK5d833a50 Max-Forwards: 70 From: <sip:+xxxxxxxxxxx@xxx.xx.xx.xxx:xxxxx>;tag=as18ff0d47 To: <sip:+49177xxxxxxx@xx.xx.xx.xxx:5060> Contact: <sip:+xxxxxxxxxxx@xxx.xx.xx.xxx:xxxxx> Call-ID: 7489c50703b43b2f03980574181a2f81@xxx.xx.xx.xxx:xxxxx CSeq: 102 INVITE User-Agent: Asterisk PBX 13.18.3~dfsg-1ubuntu4 Date: Thu, 15 Apr 2021 21:52:42 GMT Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE Supported: replaces, timer Content-Type: application/sdp Content-Length: 952 ... ``` SIP reply: ``` SIP/2.0 503 Service not available, no gateways found Via: SIP/2.0/UDP xxx.xx.xx.xxx:xxxxx;branch=z9hG4bK5d833a50;rport=50060;received=xx.xx.xx.xxx From: <sip:+xxxxxxxxxxx@xxx.xx.xx.xxx:xxxxx>;tag=as18ff0d47 To: <sip:+49177xxxxxxx@xx.xx.xx.xxx:5060>;tag=6a823999ce344a0b461cf8d85d526103.51611a36 Call-ID: 7489c50703b43b2f03980574181a2f81@xxx.xx.xx.xxx:xxxxx CSeq: 102 INVITE Server: kamailio (5.4.5 (x86_64/linux)) Content-Length: 0 ``` ### Possible Solutions  As a workaround, I downgraded to kamailio 5.3.8 because the previous Ubuntu release 5.4.4 is not available anymore at http://deb.kamailio.org/kamailio54/pool/main/k/kamailio/ (why actually?) ### Additional Information * **Kamailio Version** 5.4.5 * **Operating System**: Ubuntu 18.04  ### Root Cause Assumption https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… might be involved in the issue. -- 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/2709

2 5

fresh GCC
by Sergey Safarov 16 Apr '21

16 Apr '21

I have created a pull request that allows the use of fresh GCC for the FreeSwitch project. https://github.com/signalwire/freeswitch/pull/1161 Think we can use the same approach to use fresh GCC for the Kamailio project. For RHEL based dist and old Debian dest. Is it a useful approach to use fresh GCC to build a master branch? Sergey

2 2

git:5.4:967dd294: core: usr avp - fix detection of invalid name and ids
by Daniel-Constantin Mierla 16 Apr '21

16 Apr '21

Module: kamailio Branch: 5.4 Commit: 967dd294ba424bf66e27bebe4d6261e0c8a66471 URL: https://github.com/kamailio/kamailio/commit/967dd294ba424bf66e27bebe4d6261e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-16T09:58:16+02:00 core: usr avp - fix detection of invalid name and ids - use the fields designated for str name or int id, code analyzers can follow properly the execution path - regression introduced in ca1821837dfe7dd6630f628d968ed4d1178c7040 (cherry picked from commit e4506385ca5a56d4861f36e85c1049599cba398f) --- Modified: src/core/usr_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/967dd294ba424bf66e27bebe4d6261e… Patch: https://github.com/kamailio/kamailio/commit/967dd294ba424bf66e27bebe4d6261e… --- diff --git a/src/core/usr_avp.c b/src/core/usr_avp.c index e80e52d79d..8d8fa34603 100644 --- a/src/core/usr_avp.c +++ b/src/core/usr_avp.c @@ -148,16 +148,11 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) struct str_str_data *ssd; int len; - if (name.s.s == NULL || name.s.len == 0) { - LM_ERR("0 ID or NULL NAME AVP!"); - goto error; - } - /* compute the required mem size */ len = sizeof(struct usr_avp); if (flags&AVP_NAME_STR) { if ( name.s.s==0 || name.s.len==0) { - LM_ERR("EMPTY NAME AVP!"); + LM_ERR("NULL or EMPTY NAME AVP!"); goto error; } if (flags&AVP_VAL_STR) { @@ -168,8 +163,14 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) len += sizeof(struct str_int_data)-sizeof(union usr_avp_data) + name.s.len + 1; /* Terminating zero for regex search */ } - } else if (flags&AVP_VAL_STR) { - len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } else { + if(name.n==0) { + LM_ERR("0 ID AVP!"); + goto error; + } + if (flags&AVP_VAL_STR) { + len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } } avp = (struct usr_avp*)shm_malloc( len );

1 0

git:master:e4506385: core: usr avp - fix detection of invalid name and ids
by Daniel-Constantin Mierla 16 Apr '21

16 Apr '21

Module: kamailio Branch: master Commit: e4506385ca5a56d4861f36e85c1049599cba398f URL: https://github.com/kamailio/kamailio/commit/e4506385ca5a56d4861f36e85c10495… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-16T09:56:11+02:00 core: usr avp - fix detection of invalid name and ids - use the fields designated for str name or int id, code analyzers can follow properly the execution path - regression introduced in ca1821837dfe7dd6630f628d968ed4d1178c7040 --- Modified: src/core/usr_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/e4506385ca5a56d4861f36e85c10495… Patch: https://github.com/kamailio/kamailio/commit/e4506385ca5a56d4861f36e85c10495… --- diff --git a/src/core/usr_avp.c b/src/core/usr_avp.c index e80e52d79d..8d8fa34603 100644 --- a/src/core/usr_avp.c +++ b/src/core/usr_avp.c @@ -148,16 +148,11 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) struct str_str_data *ssd; int len; - if (name.s.s == NULL || name.s.len == 0) { - LM_ERR("0 ID or NULL NAME AVP!"); - goto error; - } - /* compute the required mem size */ len = sizeof(struct usr_avp); if (flags&AVP_NAME_STR) { if ( name.s.s==0 || name.s.len==0) { - LM_ERR("EMPTY NAME AVP!"); + LM_ERR("NULL or EMPTY NAME AVP!"); goto error; } if (flags&AVP_VAL_STR) { @@ -168,8 +163,14 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) len += sizeof(struct str_int_data)-sizeof(union usr_avp_data) + name.s.len + 1; /* Terminating zero for regex search */ } - } else if (flags&AVP_VAL_STR) { - len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } else { + if(name.n==0) { + LM_ERR("0 ID AVP!"); + goto error; + } + if (flags&AVP_VAL_STR) { + len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } } avp = (struct usr_avp*)shm_malloc( len );

1 0

git:master:e016cb1b: pkg/kamailio/deb: add lwcs module
by Victor Seva 16 Apr '21

16 Apr '21

Module: kamailio Branch: master Commit: e016cb1bdb2837437663a4c24b104b40e9191eba URL: https://github.com/kamailio/kamailio/commit/e016cb1bdb2837437663a4c24b104b4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-15T13:46:50+02:00 pkg/kamailio/deb: add lwcs module * enable only the ones with libwebsockets >= 3.1 --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/e016cb1bdb2837437663a4c24b104b4… Patch: https://github.com/kamailio/kamailio/commit/e016cb1bdb2837437663a4c24b104b4…

1 0

[CRON] Errored: dbank888/kamailio#132 (master - 491e19e)
by Travis CI 15 Apr '21

15 Apr '21

Build Update for dbank888/kamailio ------------------------------------- Build: #132 Status: Errored Duration: 5 mins and 20 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/767207396?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Kamailio v5.4.5 Released
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Hello, Kamailio SIP Server v5.4.5 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.4. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.5. For more details about version 5.4.5 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/04/kamailio-v5-4-5-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.4:c4634265: ChangeLog: content updated for v5.4.5
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: c46342653c6a1c614d43ce31e791bffe30237be8 URL: https://github.com/kamailio/kamailio/commit/c46342653c6a1c614d43ce31e791bff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T12:23:40+02:00 ChangeLog: content updated for v5.4.5 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c46342653c6a1c614d43ce31e791bff… Patch: https://github.com/kamailio/kamailio/commit/c46342653c6a1c614d43ce31e791bff…

1 0

git:5.4:30a0d84d: Makefile.defs: version set to 5.4.5
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 30a0d84d1aae953bca79d38a5bda3523e896c59a URL: https://github.com/kamailio/kamailio/commit/30a0d84d1aae953bca79d38a5bda352… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T11:57:50+02:00 Makefile.defs: version set to 5.4.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/30a0d84d1aae953bca79d38a5bda352… Patch: https://github.com/kamailio/kamailio/commit/30a0d84d1aae953bca79d38a5bda352… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c51796568d..621f646b23 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

1 0

git:master:80689e22: pv_headers: safety check for xavi key count
by Victor Seva 15 Apr '21

15 Apr '21

Module: kamailio Branch: master Commit: 80689e22bc83aff78d8fd53d4a33bcb68c913c19 URL: https://github.com/kamailio/kamailio/commit/80689e22bc83aff78d8fd53d4a33bcb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-15T11:41:20+02:00 pv_headers: safety check for xavi key count * check that we have keys to put into the hash before allocating anything * check table field instead of size just to make analyzer happy --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/80689e22bc83aff78d8fd53d4a33bcb… Patch: https://github.com/kamailio/kamailio/commit/80689e22bc83aff78d8fd53d4a33bcb… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 90feddeefd..7afc39d1a8 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -174,6 +174,10 @@ int pvh_apply_headers(struct sip_msg *msg) return -1; } keys_count = pvh_xavi_keys_count(&sub); + if(keys_count <= 0) { + LM_ERR("no keys found: %.*s\n", xavi_name.len, xavi_name.s); + return -1; + } if(str_hash_alloc(&rm_hdrs, keys_count) < 0) { PKG_MEM_ERROR; return -1; @@ -294,7 +298,7 @@ int pvh_apply_headers(struct sip_msg *msg) res = 1; err: - if(rm_hdrs.size) + if(rm_hdrs.table) pvh_str_hash_free(&rm_hdrs); return res; }

1 0

git:5.4:38d72250: core: main - set ending 0 in allocated cfg file path
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 38d72250f4c9c77bee71262b6c340503cc9a92a2 URL: https://github.com/kamailio/kamailio/commit/38d72250f4c9c77bee71262b6c34050… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T10:29:43+02:00 core: main - set ending 0 in allocated cfg file path (cherry picked from commit 15f57ceae26b967ad92dd3a97ebcd869d1197244) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/38d72250f4c9c77bee71262b6c34050… Patch: https://github.com/kamailio/kamailio/commit/38d72250f4c9c77bee71262b6c34050… --- diff --git a/src/main.c b/src/main.c index ad83cff3a8..3a67f841e6 100644 --- a/src/main.c +++ b/src/main.c @@ -1281,7 +1281,7 @@ int fix_cfg_file(void) } if ((res = malloc(cfg_len + 1)) == NULL) goto error; memcpy(res, cfg_file, cfg_len); - cfg_file[cfg_len] = 0; + res[cfg_len] = 0; cfg_file = res; return 0; }

1 0

git:master:15f57cea: core: main - set ending 0 in allocated cfg file path
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: master Commit: 15f57ceae26b967ad92dd3a97ebcd869d1197244 URL: https://github.com/kamailio/kamailio/commit/15f57ceae26b967ad92dd3a97ebcd86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T10:28:24+02:00 core: main - set ending 0 in allocated cfg file path --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/15f57ceae26b967ad92dd3a97ebcd86… Patch: https://github.com/kamailio/kamailio/commit/15f57ceae26b967ad92dd3a97ebcd86… --- diff --git a/src/main.c b/src/main.c index 405b442158..71a024d5bb 100644 --- a/src/main.c +++ b/src/main.c @@ -1288,7 +1288,7 @@ int fix_cfg_file(void) } if ((res = malloc(cfg_len + 1)) == NULL) goto error; memcpy(res, cfg_file, cfg_len); - cfg_file[cfg_len] = 0; + res[cfg_len] = 0; cfg_file = res; return 0; }

1 0

git:5.4:3a9cf652: pkg/kamailio/deb: version set 5.4.5
by Victor Seva 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 3a9cf652716fdc3f5a679cf79c704daf43ac8783 URL: https://github.com/kamailio/kamailio/commit/3a9cf652716fdc3f5a679cf79c704da… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-15T09:51:16+02:00 pkg/kamailio/deb: version set 5.4.5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/3a9cf652716fdc3f5a679cf79c704da… Patch: https://github.com/kamailio/kamailio/commit/3a9cf652716fdc3f5a679cf79c704da…

1 0

git:5.4:9e6d4182: pkg/kamailio: version set to 5.4.5 for rpm specs and alpine
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 9e6d418212171f84236af4d537bae973de879fa9 URL: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T09:41:16+02:00 pkg/kamailio: version set to 5.4.5 for rpm specs and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… Patch: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 913168c652..e6576c616a 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.4 +pkgver=5.4.5 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 0bd9c0238a..ba4cb80618 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.4 +%define ver 5.4.5 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.4:1e6561f8: core: resolve - safety check for setting port
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 1e6561f86d4a139834952ff21b74ecca0b508966 URL: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:40+02:00 core: resolve - safety check for setting port (cherry picked from commit 703d6202e73e4e3778a2c66f4e29ae87dc6ac211) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… Patch: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 3796f05ceb..cfed6b5e1d 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1211,7 +1211,7 @@ int naptr_choose (struct naptr_rdata** crt, char* crt_proto, * and *proto!=0 or port==0 && proto==0) * when performing SRV lookup (*port==0) it will use *proto to look for * tcp or udp hosts, otherwise proto is unused; if proto==0 => no SRV lookup - * If zt is set, name will be assumed to be 0 terminated and some copy + * If zt is set, name will be assumed to be 0 terminated and some copy * operations will be avoided. * If is_srv is set it will assume name has the srv prefixes for sip already * appended and it's already 0-term'ed; if not it will append them internally. @@ -1299,7 +1299,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, do_srv: /* try to find the SRV records inside previous ARs first*/ for (l=ars; l; l=l->next){ - if (l->type!=T_SRV) continue; + if (l->type!=T_SRV) continue; srv=(struct srv_rdata*) l->rdata; if (srv==0){ LM_CRIT("null rdata\n"); @@ -1311,7 +1311,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("found SRV(%s) = %s:%d in AR\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1330,7 +1330,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("SRV(%s) = %s:%d\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1342,7 +1342,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, goto end; } /* cleanup on exit */ - LM_DBG("no SRV record found for %.*s," + LM_DBG("no SRV record found for %.*s," " trying 'normal' lookup...\n", name->len, name->s); } }

1 0

git:5.4:e5de8af6: avp: check for null string
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: e5de8af690af460f086c6191a7502c903ca55699 URL: https://github.com/kamailio/kamailio/commit/e5de8af690af460f086c6191a7502c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:14+02:00 avp: check for null string (cherry picked from commit c30cd3db7587a3c875770fbc558f4a5ad38b58bd) --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/e5de8af690af460f086c6191a7502c9… Patch: https://github.com/kamailio/kamailio/commit/e5de8af690af460f086c6191a7502c9… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f11d56baeb..63ce537d7a 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1359,7 +1359,7 @@ static int attr_hdr_body2attrs(struct sip_msg* m, char* header_, char* prefix_) } }; } - if (s.len && s.s[0] == header->field_delimiter) { + if (s.len && s.s && s.s[0] == header->field_delimiter) { s.s++; s.len--; }

1 0

git:5.4:98b091d1: seas: check when walking the list
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 98b091d16072bc767affde805c30c7ec4911b9ec URL: https://github.com/kamailio/kamailio/commit/98b091d16072bc767affde805c30c7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:23+02:00 seas: check when walking the list (cherry picked from commit 7231be0785009cb17581822f0765985eb7bdb243) --- Modified: src/modules/seas/seas_action.c --- Diff: https://github.com/kamailio/kamailio/commit/98b091d16072bc767affde805c30c7e… Patch: https://github.com/kamailio/kamailio/commit/98b091d16072bc767affde805c30c7e… --- diff --git a/src/modules/seas/seas_action.c b/src/modules/seas/seas_action.c index cd62848ab0..83be6307d0 100644 --- a/src/modules/seas/seas_action.c +++ b/src/modules/seas/seas_action.c @@ -1329,8 +1329,12 @@ int extract_allowed_headers(struct sip_msg *my_msg,int strip_top_vias,int allow_ }else{ assert(rtcnt>0); rb=hf->parsed; - while(--rtcnt) + while(rb && --rtcnt) rb=rb->next; + if(!rb) { + LM_ERR("no rr\n"); + goto error; + } k= (((rb->nameaddr.name.s) + rb->len)-hf->name.s) ; if(len+k+CRLF_LEN<headers_len){ memcpy(headers+len,hf->name.s,k);

1 0

git:5.4:a10a7b5b: core: updated onsend_route_enabled() macro condtition
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: a10a7b5ba0cba5c268ff04a71bdf318e05dd0068 URL: https://github.com/kamailio/kamailio/commit/a10a7b5ba0cba5c268ff04a71bdf318… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:32+02:00 core: updated onsend_route_enabled() macro condtition - detect when the kemi callbacks need to be executed for tm replies (cherry picked from commit 0640645efdbc1f7ce36750d5a784a4cfedc3f02f) --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/a10a7b5ba0cba5c268ff04a71bdf318… Patch: https://github.com/kamailio/kamailio/commit/a10a7b5ba0cba5c268ff04a71bdf318… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index 744becedce..a78927c190 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -57,7 +57,9 @@ extern onsend_info_t* p_onsend; * WARNING: buf must be 0 terminated (to allow regex matches on it) */ int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, char* buf, int len); -#define onsend_route_enabled(rtype) (onsend_rt.rlist[DEFAULT_RT]?((rtype==SIP_REPLY)?onsend_route_reply:1):0) +#define onsend_route_enabled(rtype) ((onsend_rt.rlist[DEFAULT_RT]? \ + ((rtype==SIP_REPLY)?onsend_route_reply:1):0) \ + || (kemi_onsend_route_callback.len>0 && sr_kemi_eng_get())) int run_onsend_evroute(onsend_info_t *sndinfo, int evrt, str *evcb, str *evname);

1 0

git:5.4:681952d1: sca: return on rpc fault
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 681952d1f1fc5d0226f4a7adb99e7cfefef8727b URL: https://github.com/kamailio/kamailio/commit/681952d1f1fc5d0226f4a7adb99e7cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:34:47+02:00 sca: return on rpc fault (cherry picked from commit 005f4468bc5873ea02b6c0d3d75baa49067e17c9) --- Modified: src/modules/sca/sca_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/681952d1f1fc5d0226f4a7adb99e7cf… Patch: https://github.com/kamailio/kamailio/commit/681952d1f1fc5d0226f4a7adb99e7cf… --- diff --git a/src/modules/sca/sca_rpc.c b/src/modules/sca/sca_rpc.c index f1882fa879..c3b9b0f2ba 100644 --- a/src/modules/sca/sca_rpc.c +++ b/src/modules/sca/sca_rpc.c @@ -184,6 +184,7 @@ void sca_rpc_deactivate_all_subscriptions(rpc_t *rpc, void *ctx) if((ht = sca->subscriptions) == NULL) { rpc->fault(ctx, 500, "Empty subscription table!"); + return; } for(i = 0; i < ht->size; i++) {

1 0

git:5.4:95bbb4f0: group: check if credentials are parsed
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 95bbb4f0b1784a20db5c76fdbdd4fc58a2250b6d URL: https://github.com/kamailio/kamailio/commit/95bbb4f0b1784a20db5c76fdbdd4fc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:34:56+02:00 group: check if credentials are parsed (cherry picked from commit e84c1985f1c3ed7a791660702b398b9ac1eb1f4a) --- Modified: src/modules/group/group.c --- Diff: https://github.com/kamailio/kamailio/commit/95bbb4f0b1784a20db5c76fdbdd4fc5… Patch: https://github.com/kamailio/kamailio/commit/95bbb4f0b1784a20db5c76fdbdd4fc5… --- diff --git a/src/modules/group/group.c b/src/modules/group/group.c index 329587a69c..af1c62c0f3 100644 --- a/src/modules/group/group.c +++ b/src/modules/group/group.c @@ -54,7 +54,7 @@ int get_username_domain(struct sip_msg *msg, group_check_p gcp, { struct sip_uri puri; struct sip_uri *turi; - struct hdr_field* h; + struct hdr_field* h = 0; struct auth_body* c = 0; pv_value_t value; @@ -89,15 +89,20 @@ int get_username_domain(struct sip_msg *msg, group_check_p gcp, get_authorized_cred( msg->proxy_auth, &h); if (!h) { LM_ERR("no authorized credentials found " - "(error in scripts)\n"); + "(error in script)\n"); return -1; } } + if(!h->parsed) { + LM_ERR("no parsed authorized credentials found " + "(error in script)\n"); + return -1; + } c = (auth_body_t*)(h->parsed); break; case 5: /* AVP spec */ - if(pv_get_spec_value( msg, &gcp->sp, &value)!=0 + if(pv_get_spec_value( msg, &gcp->sp, &value)!=0 || value.flags&PV_VAL_NULL || value.rs.len<=0) { LM_ERR("no AVP found (error in scripts)\n");

1 0

git:5.4:cbe81cd6: imc: safety checks for function parameters
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: cbe81cd6941c277893958d5be45655ac21c6890e URL: https://github.com/kamailio/kamailio/commit/cbe81cd6941c277893958d5be45655a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:05+02:00 imc: safety checks for function parameters (cherry picked from commit 6c8d61850aa662016d952f25dc510ed4d602e10c) --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/cbe81cd6941c277893958d5be45655a… Patch: https://github.com/kamailio/kamailio/commit/cbe81cd6941c277893958d5be45655a… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 94ddc38884..8d9c6f3ea1 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -488,6 +488,10 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, str body; struct imc_uri room; + if(cmd==NULL || src==NULL || dst==NULL) { + return -1; + } + memset(&room, '\0', sizeof(room)); if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, &dst->parsed)) goto error; @@ -537,12 +541,14 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, goto error; } - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, STR_FMT(format_uri(src->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, + STR_FMT(format_uri(src->uri))); } else { LM_DBG("Attept to join private room [%.*s] by [%.*s]\n", STR_FMT(&rm->uri), STR_FMT(&src->uri)); - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_join_attempt_bcast.s, STR_FMT(format_uri(src->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_join_attempt_bcast.s, + STR_FMT(format_uri(src->uri))); imc_send_message(&rm->uri, &src->uri, build_headers(msg), &msg_join_attempt_ucast); } @@ -563,7 +569,7 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, rv = 0; error: - if (room.uri.s) pkg_free(room.uri.s); + if (room.uri.s != NULL) pkg_free(room.uri.s); if (rm != NULL) imc_release_room(rm); return rv; }

1 0

git:5.4:782aae70: db_text: safety check for lres
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 782aae708701eaf8bfc97d72263d1e2e08569515 URL: https://github.com/kamailio/kamailio/commit/782aae708701eaf8bfc97d72263d1e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:34:26+02:00 db_text: safety check for lres (cherry picked from commit 8a5b764e77d009eb6f236e74d3462bfce0d57f07) --- Modified: src/modules/db_text/dbt_base.c Modified: src/modules/db_text/dbt_res.c --- Diff: https://github.com/kamailio/kamailio/commit/782aae708701eaf8bfc97d72263d1e2… Patch: https://github.com/kamailio/kamailio/commit/782aae708701eaf8bfc97d72263d1e2… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index 1e5dd01514..0b4437bced 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -258,7 +258,7 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, dbt_column_p pPrevCol = NULL; _tbc_temp->colv = (dbt_column_p*) shm_malloc(_nc*sizeof(dbt_column_p)); - for(i=0; i < _nc; i++) { + for(i=0; lres && i < _nc; i++) { dbt_column_p pCol = dbt_column_new(_tbc->colv[ lres[i] ]->name.s, _tbc->colv[ lres[i] ]->name.len); pCol->type = _tbc->colv[ lres[i] ]->type; pCol->flag = _tbc->colv[ lres[i] ]->flag; diff --git a/src/modules/db_text/dbt_res.c b/src/modules/db_text/dbt_res.c index 16a11f2695..87adc0b6bc 100644 --- a/src/modules/db_text/dbt_res.c +++ b/src/modules/db_text/dbt_res.c @@ -915,7 +915,7 @@ dbt_row_p dbt_result_extract_results(dbt_table_p _dtp, dbt_row_p* pRows, int _nr dbt_row_p pPrvRow=NULL; int i, n, r; - if(!_dtp || !pRows || _ncols<=0) + if(!_dtp || !pRows || _ncols<=0 || !_lres) return NULL; for(r=0; r < _nrows; r++) {

1 0

git:5.4:ce30413e: pike: safety check for ll variable
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: ce30413e6e60c1674d7200c32469779398860c40 URL: https://github.com/kamailio/kamailio/commit/ce30413e6e60c1674d7200c32469779… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:34:37+02:00 pike: safety check for ll variable (cherry picked from commit b123dec934769522407dad619bbb6c2074719884) --- Modified: src/modules/pike/pike_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/ce30413e6e60c1674d7200c32469779… Patch: https://github.com/kamailio/kamailio/commit/ce30413e6e60c1674d7200c32469779… --- diff --git a/src/modules/pike/pike_funcs.c b/src/modules/pike/pike_funcs.c index 804ebb6ec0..7a01739fe1 100644 --- a/src/modules/pike/pike_funcs.c +++ b/src/modules/pike/pike_funcs.c @@ -211,8 +211,10 @@ void clean_routine(unsigned int ticks , void *param) /* unlink the node -> the list will get shorter and it will be * faster for the next branches to process it */ - ll->prev->prev->next = ll; - ll->prev = ll->prev->prev; + if(ll) { + ll->prev->prev->next = ll; + ll->prev = ll->prev->prev; + } node->expires = 0; node->timer_ll.prev = node->timer_ll.next = 0; if ( node->flags&NODE_EXPIRED_FLAG )

1 0

git:master:703d6202: core: resolve - safety check for setting port
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: master Commit: 703d6202e73e4e3778a2c66f4e29ae87dc6ac211 URL: https://github.com/kamailio/kamailio/commit/703d6202e73e4e3778a2c66f4e29ae8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:32:38+02:00 core: resolve - safety check for setting port --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/703d6202e73e4e3778a2c66f4e29ae8… Patch: https://github.com/kamailio/kamailio/commit/703d6202e73e4e3778a2c66f4e29ae8… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index deb20a740c..c2ea36d9ec 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1225,7 +1225,7 @@ int naptr_choose (struct naptr_rdata** crt, char* crt_proto, * and *proto!=0 or port==0 && proto==0) * when performing SRV lookup (*port==0) it will use *proto to look for * tcp or udp hosts, otherwise proto is unused; if proto==0 => no SRV lookup - * If zt is set, name will be assumed to be 0 terminated and some copy + * If zt is set, name will be assumed to be 0 terminated and some copy * operations will be avoided. * If is_srv is set it will assume name has the srv prefixes for sip already * appended and it's already 0-term'ed; if not it will append them internally. @@ -1313,7 +1313,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, do_srv: /* try to find the SRV records inside previous ARs first*/ for (l=ars; l; l=l->next){ - if (l->type!=T_SRV) continue; + if (l->type!=T_SRV) continue; srv=(struct srv_rdata*) l->rdata; if (srv==0){ LM_CRIT("null rdata\n"); @@ -1325,7 +1325,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("found SRV(%s) = %s:%d in AR\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1344,7 +1344,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("SRV(%s) = %s:%d\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1356,7 +1356,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, goto end; } /* cleanup on exit */ - LM_DBG("no SRV record found for %.*s," + LM_DBG("no SRV record found for %.*s," " trying 'normal' lookup...\n", name->len, name->s); } }

1 0

Releasing Kamailio v5.4.5
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Hello, I am considering to release Kamailio v5.4.5 sometime next week, likely on Thursday, April 15, 2020. This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) -- June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev