sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
304 discussions

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

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021