sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
319 discussions

git:master:b6c3a155: kafka: convert to memory error logging helper

by Henning Westerholt

Module: kamailio Branch: master Commit: b6c3a15518e9b6c7259be7c906193aa0cd510449 URL: https://github.com/kamailio/kamailio/commit/b6c3a15518e9b6c7259be7c906193aa… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-05-04T08:06:37Z kafka: convert to memory error logging helper --- Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/b6c3a15518e9b6c7259be7c906193aa… Patch: https://github.com/kamailio/kamailio/commit/b6c3a15518e9b6c7259be7c906193aa… --- diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index 555351710b7..4b892942af1 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -352,7 +352,7 @@ int kfk_conf_parse(char *spec) kconf = (kfk_conf_t*)pkg_malloc(sizeof(kfk_conf_t)); if (kconf == NULL) { - LM_ERR("No more pkg memory\n"); + PKG_MEM_ERROR; goto error; } memset(kconf, 0, sizeof(kfk_conf_t)); @@ -364,7 +364,7 @@ int kfk_conf_parse(char *spec) kfk_conf_node_t *knode = NULL; knode = (kfk_conf_node_t*)pkg_malloc(sizeof(kfk_conf_node_t)); if (knode == NULL) { - LM_ERR("No more pkg memory\n"); + PKG_MEM_ERROR; goto error; } memset(knode, 0, sizeof(kfk_conf_node_t)); @@ -504,7 +504,7 @@ int kfk_topic_parse(char *spec) ktopic = (kfk_topic_t*)pkg_malloc(sizeof(kfk_topic_t)); if (ktopic == NULL) { - LM_ERR("No more pkg memory\n"); + PKG_MEM_ERROR; goto error; } memset(ktopic, 0, sizeof(kfk_topic_t)); @@ -527,7 +527,7 @@ int kfk_topic_parse(char *spec) kfk_conf_node_t *knode = NULL; knode = (kfk_conf_node_t*)pkg_malloc(sizeof(kfk_conf_node_t)); if (knode == NULL) { - LM_ERR("No more pkg memory\n"); + PKG_MEM_ERROR; goto error; } memset(knode, 0, sizeof(kfk_conf_node_t)); @@ -898,7 +898,7 @@ int kfk_stats_init() stats_general = shm_malloc(sizeof(kfk_stats_t)); if (!stats_general) { - LM_ERR("Out of shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(stats_general, 0, sizeof(kfk_stats_t)); @@ -971,21 +971,21 @@ static kfk_stats_t* kfk_stats_topic_new(const char *topic, rd_kafka_resp_err_t e st = shm_malloc(sizeof(kfk_stats_t)); if (!st) { - LM_ERR("Out of shared memory\n"); + SHM_MEM_ERROR; goto error; } memset(st, 0, sizeof(kfk_stats_t)); st->topic_name = shm_malloc(sizeof(str)); if (!st->topic_name) { - LM_ERR("Out of shared memory\n"); + SHM_MEM_ERROR; goto error; } memset(st->topic_name, 0, sizeof(str)); st->topic_name->s = shm_malloc(topic_len + 1); if (!st->topic_name->s) { - LM_ERR("Out of shared memory\n"); + SHM_MEM_ERROR; goto error; } memcpy(st->topic_name->s, topic, topic_len);

12 months

git:master:40b18ddf: secfilter: convert to memory error logging helper, add missing mem cleanup on errors

by Henning Westerholt

Module: kamailio Branch: master Commit: 40b18ddfe3eca3170ef6c535d39332b2e3c6ce5d URL: https://github.com/kamailio/kamailio/commit/40b18ddfe3eca3170ef6c535d39332b… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-05-04T08:06:37Z secfilter: convert to memory error logging helper, add missing mem cleanup on errors --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/40b18ddfe3eca3170ef6c535d39332b… Patch: https://github.com/kamailio/kamailio/commit/40b18ddfe3eca3170ef6c535d39332b… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 5e967b2204b..061a1eb7445 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -276,7 +276,7 @@ static int w_check_sqli(str val) cval = (char *)pkg_malloc(val.len + 1); if(cval == NULL) { - LM_CRIT("Cannot allocate pkg memory\n"); + PKG_MEM_CRITICAL; return -2; } memset(cval, 0, val.len + 1); @@ -752,6 +752,7 @@ int secf_init_data(void) secf_data_2 = (secf_data_p)shm_malloc(sizeof(secf_data_t)); if(!secf_data_2) { SHM_MEM_ERROR; + shm_free(secf_data_1); return -1; } memset(secf_data_2, 0, sizeof(secf_data_t)); @@ -759,10 +760,20 @@ int secf_init_data(void) secf_data = shm_malloc(sizeof(secf_data_t)); if(secf_data == NULL) { SHM_MEM_ERROR; + shm_free(secf_data_1); + shm_free(secf_data_2); return -1; } secf_stats = shm_malloc(total_data * sizeof(int)); + if(!secf_stats) + { + SHM_MEM_ERROR; + shm_free(secf_data_1); + shm_free(secf_data_2); + shm_free(secf_data); + return -1; + } memset(secf_stats, 0, total_data * sizeof(int)); if(secf_dst_exact_match != 0)

12 months

git:master:d031d1e4: ims_registrar_pcscf: convert to memory error log helper, add missing mem cleanup during errors

by Henning Westerholt

Module: kamailio Branch: master Commit: d031d1e483f4c025074e6a6bc95728dc88193c7b URL: https://github.com/kamailio/kamailio/commit/d031d1e483f4c025074e6a6bc95728d… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-05-04T08:06:37Z ims_registrar_pcscf: convert to memory error log helper, add missing mem cleanup during errors --- Modified: src/modules/ims_registrar_pcscf/async_reginfo.c Modified: src/modules/ims_registrar_pcscf/sec_agree.c Modified: src/modules/ims_registrar_pcscf/service_routes.c Modified: src/modules/ims_registrar_pcscf/subscribe.c Modified: src/modules/ims_registrar_pcscf/ul_callback.c --- Diff: https://github.com/kamailio/kamailio/commit/d031d1e483f4c025074e6a6bc95728d… Patch: https://github.com/kamailio/kamailio/commit/d031d1e483f4c025074e6a6bc95728d…

12 months

git:master:8b9e4dbc: lcr: convert to memory error logging helper, add some missing mem cleanup on error

by Henning Westerholt

Module: kamailio Branch: master Commit: 8b9e4dbcc29a4ff913039adf1ce1eae941976533 URL: https://github.com/kamailio/kamailio/commit/8b9e4dbcc29a4ff913039adf1ce1eae… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-05-04T08:06:37Z lcr: convert to memory error logging helper, add some missing mem cleanup on error --- Modified: src/modules/lcr/hash.c Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8b9e4dbcc29a4ff913039adf1ce1eae… Patch: https://github.com/kamailio/kamailio/commit/8b9e4dbcc29a4ff913039adf1ce1eae…

12 months

RFC: selective backports to latest stable as a dedicated git branch

by Daniel-Constantin Mierla

Hello, during past on-site/online devel meetings as well as on mailing lists or tracker, there were various discussions around the idea or requests to make new features available quicker to stable branches. Of course, one can do local git cherry-picking, but I thought to bring this in discussion and see if makes sense to get something more coordinated between developers and community. Therefore I am cross-posting to sr-dev and sr-users to see if there is interest for it from both communities. Somehow inspired from Debian, my first idea would be to create a "x.y-backports" branch, where "x.y" is the branch for the stable release series. For example, with 5.6 release series built from branch "5.6", there could be "5.6-backports" branch which is kept in sync in "5.6" but also can get "selected" new features from devel (master branch) backported. The "selected" new features should be mostly a matter of the people willing to put effort in backporting, but I would consider a list recommendations not to end up with devel and backports branches being more or less the same. For example, in the "no-backporting" list: - no backporting of completely new modules - no backporting of significant changes to the config file language and native scripting interpreter In the "ok-to-backport": - updates to enable use with newer versions of external libraries - changes to make some functions/modules to cope better with the core infrastructure or end points Commits to the backports branch can be proposed via pull requests. The backports branch should be done only for latest stable version, picking from the development version. Right now it would be 5.6, but we can wait till 5.7 is released and then have it for it. No packaging and no official releases should be made from backports branch, only a git branch to be maintained as a community effort. Of course, if someone wants to put more resources into it, we can discuss about. Anyhow, the first questions would be if such branch sounds good to have and if there are people that think they can also contribute to maintain it. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com

12 months

Contribute to the project and getting developer git permission

by heni wael

Good morning everyone , My name is Wael Heni : https://www.linkedin.com/in/heniwael/ I would like to contribute to the project , i will start by resolving bugs , then may be i will try to add feature but i need a few docs about installing the dev env and getting the permission to pushing to github repository Any help is appreciated Regards Wael

12 months

Rebooting kamailio.org server

by Daniel-Constantin Mierla

Hello, in about 1 hour the kamailio.org server will be rebooted for some system upgrades, it should be quickly back running, but if anyone accesses the web/wiki or mailing lists archives exactly during that time, they might not respond -- just wait for a minute and try again. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com

12 months

git:master:b002a5dc: auth_db: exported www_authenticate() to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b002a5dcde1f14850ddfc620ed5b9d0a7e8e5962 URL: https://github.com/kamailio/kamailio/commit/b002a5dcde1f14850ddfc620ed5b9d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-02T08:51:10+02:00 auth_db: exported www_authenticate() to kemi --- Modified: src/modules/auth_db/auth_db_mod.c Modified: src/modules/auth_db/authorize.c Modified: src/modules/auth_db/authorize.h --- Diff: https://github.com/kamailio/kamailio/commit/b002a5dcde1f14850ddfc620ed5b9d0… Patch: https://github.com/kamailio/kamailio/commit/b002a5dcde1f14850ddfc620ed5b9d0… --- diff --git a/src/modules/auth_db/auth_db_mod.c b/src/modules/auth_db/auth_db_mod.c index 49556cd71de..55bb395a925 100644 --- a/src/modules/auth_db/auth_db_mod.c +++ b/src/modules/auth_db/auth_db_mod.c @@ -452,6 +452,11 @@ static sr_kemi_t sr_kemi_auth_db_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth_db"), str_init("www_authenticate"), + SR_KEMIP_INT, ki_www_authenticate, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("auth_db"), str_init("www_authenticate_method"), SR_KEMIP_INT, ki_www_authenticate_method, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, diff --git a/src/modules/auth_db/authorize.c b/src/modules/auth_db/authorize.c index 5fd7cce61ad..74a151d4297 100644 --- a/src/modules/auth_db/authorize.c +++ b/src/modules/auth_db/authorize.c @@ -402,6 +402,14 @@ int www_authenticate(struct sip_msg* _m, char* _realm, char* _table) &_m->first_line.u.request.method); } +int ki_www_authenticate(struct sip_msg* _m, str *realm, str *table) +{ + LM_DBG("realm value [%.*s]\n", realm->len, realm->s); + + return digest_authenticate(_m, realm, table, HDR_AUTHORIZATION_T, + &_m->first_line.u.request.method); +} + int www_authenticate2(struct sip_msg* _m, char* _realm, char* _table, char *_method) { str srealm; diff --git a/src/modules/auth_db/authorize.h b/src/modules/auth_db/authorize.h index b67ba7121f9..5653fd452f5 100644 --- a/src/modules/auth_db/authorize.h +++ b/src/modules/auth_db/authorize.h @@ -46,6 +46,7 @@ int proxy_authenticate(struct sip_msg* _msg, char* _realm, char* _table); int www_authenticate(struct sip_msg* _msg, char* _realm, char* _table); int www_authenticate2(struct sip_msg* _msg, char* _realm, char* _table, char *_method); +int ki_www_authenticate(struct sip_msg* _m, str *realm, str *table); int ki_www_authenticate_method(sip_msg_t *msg, str *realm, str *table, str *method); /*

12 months

Building with clang

by Ivan Ribakov

Hi all, I looked at Kamailio 5.6.3 makefiles and saw mention of clang being supported. Yet when I try to build it with clang (more precisely, I build a C++ module using clang that includes some Kamailio C headers via "extern C") I get following error: In file included from /tmp/kamailio/kamailio/modules/tm/t_funcs.h:45: /tmp/kamailio/kamailio/modules/tm/timer.h:204:2: error: no matching function for call to 'atomic_cmpxchg_int' Any suggestions on how to overcome this error or any general suggestions for using Kamailio + clang? clang version 14.0.6 (Red Hat 14.0.6-4.el9_1) -- Ivan Ribakov Software Engineer www.zaleos.net

12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2023