- sr-dev - kamailio.org

git:master:ea30efdb: tcpops: added tcp_get_conid() for kemi
by Daniel-Constantin Mierla 30 Mar '23

30 Mar '23

Module: kamailio Branch: master Commit: ea30efdbae2b33988e6157ba5e17aba16db156d4 URL: https://github.com/kamailio/kamailio/commit/ea30efdbae2b33988e6157ba5e17aba… Author: Muhammad Shahzad Shafi <muhammad.shafi(a)1und1.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T21:07:19+02:00 tcpops: added tcp_get_conid() for kemi --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ea30efdbae2b33988e6157ba5e17aba… Patch: https://github.com/kamailio/kamailio/commit/ea30efdbae2b33988e6157ba5e17aba… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 8590e4b6b65..d5dac245024 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -601,6 +601,26 @@ static int ki_tcp_get_conid_helper(sip_msg_t* msg, str *saddr, pv_spec_t *pvs) return 1; } +/** + * + */ +static int ki_tcp_get_conid(sip_msg_t* msg, str *saddr, str *pvs) +{ + pv_spec_t *dst; + dst = pv_cache_get(pvs); + + if(dst==NULL) { + LM_ERR("failed to get pv spec for: %.*s\n", pvs->len, pvs->s); + return -1; + } + if(dst->setf==NULL) { + LM_ERR("target pv is not writable: %.*s\n", pvs->len, pvs->s); + return -1; + } + + return ki_tcp_get_conid_helper(msg, saddr, dst); +} + /** * */ @@ -855,6 +875,11 @@ static sr_kemi_t sr_kemi_tcpops_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tcpops"), str_init("tcp_get_conid"), + SR_KEMIP_INT, ki_tcp_get_conid, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tcpops"), str_init("tcp_set_otcpid"), SR_KEMIP_INT, ki_tcp_set_otcpid, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:6f8c1bf9: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 30 Mar '23

30 Mar '23

Module: kamailio Branch: master Commit: 6f8c1bf967ca3d101a70631df8d77cc7855b3a72 URL: https://github.com/kamailio/kamailio/commit/6f8c1bf967ca3d101a70631df8d77cc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-03-30T19:31:38+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/acc_json/README Modified: src/modules/acc_radius/README Modified: src/modules/alias_db/README Modified: src/modules/app_java/README Modified: src/modules/app_jsdt/README Modified: src/modules/app_lua/README Modified: src/modules/app_lua_sr/README Modified: src/modules/app_perl/README Modified: src/modules/app_python/README Modified: src/modules/app_ruby/README Modified: src/modules/app_sqlang/README Modified: src/modules/async/README Modified: src/modules/auth/README Modified: src/modules/auth_db/README Modified: src/modules/auth_ephemeral/README Modified: src/modules/auth_identity/README Modified: src/modules/auth_radius/README Modified: src/modules/avpops/README --- Diff: https://github.com/kamailio/kamailio/commit/6f8c1bf967ca3d101a70631df8d77cc… Patch: https://github.com/kamailio/kamailio/commit/6f8c1bf967ca3d101a70631df8d77cc…

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 30 Mar '23

30 Mar '23

- URL: https://github.com/kamailio/kamailio/commit/d394cc62e48fe4636d4c9b2cf9ca8d5… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 acc: typo - URL: https://github.com/kamailio/kamailio/commit/f5cfafa396c5925b8b4694c3e962564… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 acc_json: typos - URL: https://github.com/kamailio/kamailio/commit/63044aab8a915484f90fc21a16c5034… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 acc_radius: typo - URL: https://github.com/kamailio/kamailio/commit/7e6942f283237033da9c211d5342e96… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 alias_db: typo - URL: https://github.com/kamailio/kamailio/commit/0a062c9e52f61b48f6daf46756aeebb… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 app_java: typos - URL: https://github.com/kamailio/kamailio/commit/ca2c51143aab9ffafbb4f0a5474beb2… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 app_jsdt: typos - URL: https://github.com/kamailio/kamailio/commit/9083ee603161475e805beb729ce4d11… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 app_lua: typos - URL: https://github.com/kamailio/kamailio/commit/f066bc53bf64791719ee3f97f2641aa… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 app_lua_sr: typos - URL: https://github.com/kamailio/kamailio/commit/051af44ddb92a3b31f0236e4b430edc… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 app_mono: typos - URL: https://github.com/kamailio/kamailio/commit/f833583fb02a9d26665692b02b4a2cf… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 app_perl: typos - URL: https://github.com/kamailio/kamailio/commit/f57dae9081d54b364285fe4950426f8… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 app_python: typo - URL: https://github.com/kamailio/kamailio/commit/909e339becdc5db93830d9c3f0934a6… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 app_ruby: typos - URL: https://github.com/kamailio/kamailio/commit/fe06f13c4d41cff9ee2b0d62926102d… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 app_sqlang: typos - URL: https://github.com/kamailio/kamailio/commit/3f0c5103c661f73c9d172cd3728226e… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 async: typos - URL: https://github.com/kamailio/kamailio/commit/0cb433212526537624ff51eb659cb22… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 auth: typos - URL: https://github.com/kamailio/kamailio/commit/2d88dbe4dada18784a75cd228f55e8a… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 auth_db: typos - URL: https://github.com/kamailio/kamailio/commit/95b9ad47fbf4f8444aa94aeb39c8c44… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 auth_diameter: typos - URL: https://github.com/kamailio/kamailio/commit/22535e19236c1d1cefca02d0b1d50b5… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 auth_ephemeral: typos - URL: https://github.com/kamailio/kamailio/commit/da353c293ba46abbb21b5bcbbfa8e75… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 auth_identiy: typos - URL: https://github.com/kamailio/kamailio/commit/1fd32a957a136214ed7d521595eb135… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 auth_radius: typos - URL: https://github.com/kamailio/kamailio/commit/0b986aeeffa7faa14f7e954df01cfb0… Author: �� <git-dpa(a)aegee.org> Date: 2023-03-30T19:23:29+02:00 avpops: typos

1 0

[kamailio/kamailio] Typos (PR #3375)
by Дилян Палаузов 30 Mar '23

30 Mar '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3375 -- Commit Summary -- * acc: typo * acc_json: typos * acc_radius: typo * alias_db: typo * app_java: typos * app_jsdt: typos * app_lua: typos * app_lua_sr: typos * app_mono: typos * app_perl: typos * app_python: typo * app_ruby: typos * app_sqlang: typos * async: typos * auth: typos * auth_db: typos * auth_diameter: typos * auth_ephemeral: typos * auth_identiy: typos * auth_radius: typos * avpops: typos -- File Changes -- M src/modules/acc/doc/acc_admin.xml (2) M src/modules/acc_json/acc_json_mod.c (2) M src/modules/acc_json/doc/acc_json_admin.xml (2) M src/modules/acc_radius/doc/acc_radius_admin.xml (2) M src/modules/alias_db/doc/alias_db_admin.xml (2) M src/modules/app_java/README-draft (12) M src/modules/app_java/doc/app_java_admin.xml (4) M src/modules/app_java/kamailio_java_folder/java-untested/siprouter_src/SipMsg.java (2) M src/modules/app_java/kamailio_java_folder/java/siprouter_src/SipMsg.java (2) M src/modules/app_jsdt/app_jsdt_mod.c (8) M src/modules/app_jsdt/doc/app_jsdt_admin.xml (4) M src/modules/app_jsdt/duktape.c (10) M src/modules/app_lua/app_lua_mod.c (10) M src/modules/app_lua/doc/app_lua_admin.xml (2) M src/modules/app_lua_sr/doc/app_lua_sr_admin.xml (4) M src/modules/app_mono/app_mono_mod.c (4) M src/modules/app_perl/app_perl_mod.c (2) M src/modules/app_perl/doc/app_perl_admin.xml (4) M src/modules/app_perl/doc/app_perl_pod.xml (2) M src/modules/app_perl/doc/app_perl_samples.xml (2) M src/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConf.pm (4) M src/modules/app_python/doc/app_python_admin.xml (2) M src/modules/app_ruby/app_ruby_mod.c (2) M src/modules/app_ruby/doc/app_ruby_admin.xml (2) M src/modules/app_sqlang/app_sqlang_mod.c (8) M src/modules/app_sqlang/doc/app_sqlang_admin.xml (2) M src/modules/app_sqlang/squirrel/sqstdlib/sqstdrex.cpp (2) M src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp (6) M src/modules/async/doc/async_admin.xml (4) M src/modules/auth/auth.xml (18) M src/modules/auth/doc/auth_functions.xml (2) M src/modules/auth/doc/auth_params.xml (14) M src/modules/auth/nc.c (6) M src/modules/auth/nid.h (4) M src/modules/auth/ot_nonce.c (6) M src/modules/auth_db/authorize.c (2) M src/modules/auth_db/doc/auth_db_admin.xml (4) M src/modules/auth_diameter/authorize.c (2) M src/modules/auth_diameter/authorize.h (2) M src/modules/auth_diameter/avp.c (2) M src/modules/auth_diameter/defs.h (2) M src/modules/auth_diameter/message.c (2) M src/modules/auth_diameter/tcp_comm.c (2) M src/modules/auth_ephemeral/auth_ephemeral_mod.c (2) M src/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml (2) M src/modules/auth_identity/auth_hdrs.c (2) M src/modules/auth_identity/auth_identity.c (10) M src/modules/auth_identity/auth_tables.c (10) M src/modules/auth_identity/doc/auth_identity_functions.xml (2) M src/modules/auth_radius/doc/auth_radius_admin.xml (2) M src/modules/auth_radius/sterman.c (2) M src/modules/avpops/avpops.c (4) M src/modules/avpops/doc/avpops_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3375.patch https://github.com/kamailio/kamailio/pull/3375.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3375 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3375(a)github.com>

3 8

HTTPS for xHTTP module
by luca.nardin＠kontron.com 30 Mar '23

30 Mar '23

Hello, we need to use kamailio to handle some HTTP(S) GET requests coming from another REST client and we are considering to use the xHTTP module of kamailio. It seems this module only supports HTTP and not HTTPS connections, is that correct? Kind regards, Luca Nardin Kontron Transportation

3 3

[kamailio/kamailio] uac_redirect: Module fails to load [regression] (Issue #3188)
by Alex Hermann 30 Mar '23

30 Mar '23

The uac_redirect fails to load in 5.6. It used to load fine before. It is complaining about the acc API, which it never did before. I don't use the acc module and fail to see why uac_redirect would need it. ``` 2022-07-15T14:41:43.813169+02:00 pc1 proxy1[381424]: ERROR: uac_redirect [../../modules/acc/acc_api.h:191]: acc_load_api(): cannot find bind_acc 2022-07-15T14:41:43.813232+02:00 pc1 proxy1[381424]: ERROR: uac_redirect [uac_redirect.c:254]: redirect_init(): cannot bind to ACC API 2022-07-15T14:41:43.813283+02:00 pc1 proxy1[381424]: ERROR: <core> [core/sr_module.c:971]: init_mod(): Error while initializing module uac_redirect (/usr/lib/x86_64-linux-gnu/kamailio/modules/uac_redirect.so) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3188 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3188(a)github.com>

4 13

[kamailio/kamailio] core:tcp allow to handle TCP connections with tcp_accept_haproxy=yes flag even message does not contain PROXY protocol header (#2206)
by ovoshlook 30 Mar '23

30 Mar '23

Covers setups when kamailio behind the service with HAPROXY protocol support but in other hand it also serves requests from other services that available per direct connection (such as B2BUA in the same local network). #### Pre-Submission Checklist - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] 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 #### Description - function tcpconn_read_haproxy() returns 2 if PROXY header NOT found. - Message about no header shown at the debug level. - No errors - TCP connection successfully establishes You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2206 -- Commit Summary -- * handle tcp request with tcp_accept_haproxy even no PROXY header found * core:tcp allow to handle TCP connections even message does not contain PROXY protocol header * core:tcp allow to handle TCP connections even message does not contain PROXY protocol header -- File Changes -- M src/core/tcp_main.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2206.patch https://github.com/kamailio/kamailio/pull/2206.diff -- 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/pull/2206

3 6

git:5.5:bbb40895: ndb_redis: fix index on parsing sentinel address
by Daniel-Constantin Mierla 30 Mar '23

30 Mar '23

Module: kamailio Branch: 5.5 Commit: bbb40895bc74810b37df2760bee309025fca27af URL: https://github.com/kamailio/kamailio/commit/bbb40895bc74810b37df2760bee3090… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T12:54:26+02:00 ndb_redis: fix index on parsing sentinel address (cherry picked from commit 5c8eed0ce78d029f28a1819262516940b7dd749e) (cherry picked from commit d4ff1550a7c7f9647236f03559dc2fc3106a2b8d) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/bbb40895bc74810b37df2760bee3090… Patch: https://github.com/kamailio/kamailio/commit/bbb40895bc74810b37df2760bee3090… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index fd6e124bdc..50efb1906e 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -160,7 +160,7 @@ int redisc_init(void) port = 6379; if( (pos = strchr(sentinelAddr, ':')) != NULL ) { port = atoi(pos+1); - pos[i] = '\0'; + pos[0] = '\0'; } redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn);

1 0

git:5.5:31e116cc: ndb_redis: break on finding a server via sentinel
by Daniel-Constantin Mierla 30 Mar '23

30 Mar '23

Module: kamailio Branch: 5.5 Commit: 31e116ccf0ad444cef81d47f123a73038453667a URL: https://github.com/kamailio/kamailio/commit/31e116ccf0ad444cef81d47f123a730… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T12:54:21+02:00 ndb_redis: break on finding a server via sentinel (cherry picked from commit cc9501663d6dd0fa91aef23ce00a7cdf86319201) (cherry picked from commit 21fc0e010ef97d86093d7673b5038b2e65f839cb) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/31e116ccf0ad444cef81d47f123a730… Patch: https://github.com/kamailio/kamailio/commit/31e116ccf0ad444cef81d47f123a730… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index ccdff060bfd..fd6e124bdc0 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -153,6 +153,7 @@ int redisc_init(void) for(i= 0; i< sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; + int srvfound = 0; redisContext *redis; redisReply *res, *res2; @@ -174,9 +175,9 @@ int redisc_init(void) res->element[0]->len + 1); port = atoi(res->element[1]->str); LM_DBG("sentinel replied: %s:%d\n", addr, port); + srvfound = 1; } - } - else { + } else { res = redisCommand(redis, "SENTINEL slaves %s", sentinel_group); if( res && (res->type == REDIS_REPLY_ARRAY) ) { @@ -198,9 +199,13 @@ int redisc_init(void) } LM_DBG("slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound==1) { + break; + } } }

1 0

git:5.6:d4ff1550: ndb_redis: fix index on parsing sentinel address
by Daniel-Constantin Mierla 30 Mar '23

30 Mar '23

Module: kamailio Branch: 5.6 Commit: d4ff1550a7c7f9647236f03559dc2fc3106a2b8d URL: https://github.com/kamailio/kamailio/commit/d4ff1550a7c7f9647236f03559dc2fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T12:53:27+02:00 ndb_redis: fix index on parsing sentinel address (cherry picked from commit 5c8eed0ce78d029f28a1819262516940b7dd749e) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/d4ff1550a7c7f9647236f03559dc2fc… Patch: https://github.com/kamailio/kamailio/commit/d4ff1550a7c7f9647236f03559dc2fc… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 88a1347775..5c5ad3343a 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -162,7 +162,7 @@ int redisc_init(void) port = 6379; if( (pos = strchr(sentinelAddr, ':')) != NULL ) { port = atoi(pos+1); - pos[i] = '\0'; + pos[0] = '\0'; } redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn);

1 0

git:5.6:21fc0e01: ndb_redis: break on finding a server via sentinel
by Daniel-Constantin Mierla 30 Mar '23

30 Mar '23

Module: kamailio Branch: 5.6 Commit: 21fc0e010ef97d86093d7673b5038b2e65f839cb URL: https://github.com/kamailio/kamailio/commit/21fc0e010ef97d86093d7673b5038b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T12:53:12+02:00 ndb_redis: break on finding a server via sentinel (cherry picked from commit cc9501663d6dd0fa91aef23ce00a7cdf86319201) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/21fc0e010ef97d86093d7673b5038b2… Patch: https://github.com/kamailio/kamailio/commit/21fc0e010ef97d86093d7673b5038b2… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index c26154930b9..88a13477758 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -155,6 +155,7 @@ int redisc_init(void) for(i= 0; i< sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; + int srvfound = 0; redisContext *redis; redisReply *res, *res2; @@ -176,9 +177,9 @@ int redisc_init(void) res->element[0]->len + 1); port = atoi(res->element[1]->str); LM_DBG("sentinel replied: %s:%d\n", addr, port); + srvfound = 1; } - } - else { + } else { res = redisCommand(redis, "SENTINEL slaves %s", sentinel_group); if( res && (res->type == REDIS_REPLY_ARRAY) ) { @@ -200,9 +201,13 @@ int redisc_init(void) } LM_DBG("slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound==1) { + break; + } } }

1 0

git:master:5c8eed0c: ndb_redis: fix index on parsing sentinel address
by Daniel-Constantin Mierla 30 Mar '23

30 Mar '23

Module: kamailio Branch: master Commit: 5c8eed0ce78d029f28a1819262516940b7dd749e URL: https://github.com/kamailio/kamailio/commit/5c8eed0ce78d029f28a181926251694… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T12:49:27+02:00 ndb_redis: fix index on parsing sentinel address --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/5c8eed0ce78d029f28a181926251694… Patch: https://github.com/kamailio/kamailio/commit/5c8eed0ce78d029f28a181926251694… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index a3ee1c332d..08f6ad8fc6 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -163,7 +163,7 @@ int redisc_init(void) port = 6379; if( (pos = strchr(sentinelAddr, ':')) != NULL ) { port = atoi(pos+1); - pos[i] = '\0'; + pos[0] = '\0'; } redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn);

1 0

git:master:2c540b67: Revert "pike: use pkg_malloc/pkg_free instead of system malloc"
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 2c540b67a8a3f15835583926bfdef7cf6b71b4bf URL: https://github.com/kamailio/kamailio/commit/2c540b67a8a3f15835583926bfdef7c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T13:44:44Z Revert "pike: use pkg_malloc/pkg_free instead of system malloc" This reverts commit 6492a6f905075fa73d911c345fe784f2d3c085e5. --- Modified: src/modules/pike/pike_top.c --- Diff: https://github.com/kamailio/kamailio/commit/2c540b67a8a3f15835583926bfdef7c… Patch: https://github.com/kamailio/kamailio/commit/2c540b67a8a3f15835583926bfdef7c… --- diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index c7894604b6..6940e84ca6 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -79,10 +79,10 @@ int pike_top_add_entry( unsigned char *ip_addr, int addr_len, unsigned int expires, pike_node_status_t status ) { struct TopListItem_t *new_item - = (struct TopListItem_t *)pkg_malloc(sizeof(struct TopListItem_t)); + = (struct TopListItem_t *)malloc(sizeof(struct TopListItem_t)); if(!new_item) { - PKG_MEM_ERROR; + SYS_MEM_ERROR; return -1; } print_addr(ip_addr, addr_len); @@ -119,7 +119,7 @@ void pike_top_list_clear() top_list_iter = top_list_root; while (top_list_iter) { ptr = top_list_iter->next; - pkg_free(top_list_iter); + free(top_list_iter); top_list_iter = ptr; } top_list_root = 0;

1 0

Re: [kamailio/kamailio] pike: use pkg_malloc/pkg_free instead of system malloc (6492a6f)
by Daniel-Constantin Mierla 29 Mar '23

29 Mar '23

Probably this has to reverted, several rpc commands use system malloc on purpose if they might be returning a lot of data. Otherwise they will fail and allocating a lot of pkg at startup just for punctual needs of rpc commands is not recommended. So, do not blindly replace system malloc/free with pkg variants if it is about rpc. jsonrpcs also uses system malloc, ctl as well, iirc ... -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/6492a6f905075fa73d911c345fe784f… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/6492a6f905075fa73d911c345fe784f2d3c085e5/106580236(a)github.com>

2 1

git:master:18698fa9: gzcompress: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 18698fa9f8e242cf59273538baca448ea68d6194 URL: https://github.com/kamailio/kamailio/commit/18698fa9f8e242cf59273538baca448… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T11:36:15Z gzcompress: convert to memory logging helper --- Modified: src/modules/gzcompress/gzcompress_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/18698fa9f8e242cf59273538baca448… Patch: https://github.com/kamailio/kamailio/commit/18698fa9f8e242cf59273538baca448… --- diff --git a/src/modules/gzcompress/gzcompress_mod.c b/src/modules/gzcompress/gzcompress_mod.c index 3ff22d723de..4d7e24870f3 100644 --- a/src/modules/gzcompress/gzcompress_mod.c +++ b/src/modules/gzcompress/gzcompress_mod.c @@ -222,7 +222,7 @@ int gzc_set_msg_body(sip_msg_t *msg, str *obody, str *nbody) buf=pkg_malloc(nbody->len * sizeof(char)); if (buf==0) { - LM_ERR("out of pkg memory\n"); + PKG_MEM_ERROR; return -1; } memcpy(buf, nbody->s, nbody->len);

1 0

git:master:246e25f0: nathelper: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 246e25f0e8c6ca933accf1bd57fea1f43e8346f5 URL: https://github.com/kamailio/kamailio/commit/246e25f0e8c6ca933accf1bd57fea1f… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T11:27:56Z nathelper: convert to memory logging helper --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/246e25f0e8c6ca933accf1bd57fea1f… Patch: https://github.com/kamailio/kamailio/commit/246e25f0e8c6ca933accf1bd57fea1f…

1 0

git:master:41c814b7: imc: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 41c814b7cfbed2d89099840c29580d99b2a3cc47 URL: https://github.com/kamailio/kamailio/commit/41c814b7cfbed2d89099840c29580d9… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T11:32:56Z imc: convert to memory logging helper --- Modified: src/modules/imc/imc_cmd.c Modified: src/modules/imc/imc_mng.c --- Diff: https://github.com/kamailio/kamailio/commit/41c814b7cfbed2d89099840c29580d9… Patch: https://github.com/kamailio/kamailio/commit/41c814b7cfbed2d89099840c29580d9… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index ea76e79816..4e0925ac6b 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -172,7 +172,7 @@ static int build_uri(str *res, str value, struct sip_uri *template) } if ((res->s = (char*)pkg_malloc(len)) == NULL) { - LM_ERR("No memory left\n"); + PKG_MEM_ERROR; return -1; } res->len = len; @@ -716,7 +716,7 @@ int imc_handle_invite(struct sip_msg* msg, imc_cmd_t *cmd, LM_ERR("Truncated message '%.*s'\n", STR_FMT(&body)); if ((cback_param = (del_member_t*)shm_malloc(sizeof(del_member_t))) == NULL) { - LM_ERR("No shared memory left\n"); + SHM_MEM_ERROR; goto error; } memset(cback_param, 0, sizeof(del_member_t)); diff --git a/src/modules/imc/imc_mng.c b/src/modules/imc/imc_mng.c index 73c2d68caf..89c32c80cb 100644 --- a/src/modules/imc/imc_mng.c +++ b/src/modules/imc/imc_mng.c @@ -56,7 +56,7 @@ int imc_htable_init(void) _imc_htable = (imc_hentry_p)shm_malloc(imc_hash_size*sizeof(imc_hentry_t)); if(_imc_htable == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(_imc_htable, 0, imc_hash_size*sizeof(imc_hentry_t)); @@ -494,7 +494,7 @@ imc_room_p imc_add_room(str* name, str* domain, int flags) irp = (imc_room_p)shm_malloc(size); if(irp==NULL) { - LM_ERR("no more shm memory left\n"); + SHM_MEM_ERROR; return NULL; } memset(irp, 0, size); @@ -671,7 +671,7 @@ imc_member_p imc_add_member(imc_room_p room, str* user, str* domain, int flags) imp = (imc_member_p)shm_malloc(size); if(imp== NULL) { - LM_ERR("out of shm memory\n"); + SHM_MEM_ERROR; return NULL; } memset(imp, 0, size);

1 0

git:master:93011f82: misctest: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 93011f8292c568f67bf5127ae7e092ec773df1a7 URL: https://github.com/kamailio/kamailio/commit/93011f8292c568f67bf5127ae7e092e… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T11:34:50Z misctest: convert to memory logging helper --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/93011f8292c568f67bf5127ae7e092e… Patch: https://github.com/kamailio/kamailio/commit/93011f8292c568f67bf5127ae7e092e… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index e0108b5a76b..575bc618e8b 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -244,7 +244,11 @@ static int misctest_memory_init(void) { alloc_lst = shm_malloc(sizeof(*alloc_lst)); if(alloc_lst == 0) + { + SHM_MEM_ERROR; goto error; + } + alloc_lst->chunks = 0; atomic_set_long(&alloc_lst->size, 0); atomic_set_int(&alloc_lst->no, 0); @@ -252,7 +256,10 @@ static int misctest_memory_init(void) goto error; rndt_lst = shm_malloc(sizeof(*rndt_lst)); if(rndt_lst == 0) + { + SHM_MEM_ERROR; goto error; + } rndt_lst->tests = 0; atomic_set_int(&rndt_lst->last_id, 0); if(lock_init(&rndt_lst->lock) == 0) @@ -469,7 +476,10 @@ static int mem_track(void *addr, unsigned long size) mc = shm_malloc(sizeof(*mc)); if(mc == 0) + { + SHM_MEM_ERROR; goto error; + } mc->addr = addr; mc->size = size; mc->flags = 0; @@ -782,7 +792,10 @@ static int mem_leak_time_test(unsigned long min, unsigned long max, tst = shm_malloc(sizeof(*tst)); if(tst == 0) + { + SHM_MEM_ERROR; goto error; + } memset(tst, 0, sizeof(*tst)); id = tst->id = atomic_add_int(&rndt_lst->last_id, 1); tst->min = min;

1 0

git:master:7be6d78f: msrp: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 7be6d78f5f9ee7aacef1a73321d4a384a7722077 URL: https://github.com/kamailio/kamailio/commit/7be6d78f5f9ee7aacef1a73321d4a38… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:52:04Z msrp: convert to memory logging helper --- Modified: src/modules/msrp/msrp_cmap.c Modified: src/modules/msrp/msrp_parser.c Modified: src/modules/msrp/msrp_vars.c --- Diff: https://github.com/kamailio/kamailio/commit/7be6d78f5f9ee7aacef1a73321d4a38… Patch: https://github.com/kamailio/kamailio/commit/7be6d78f5f9ee7aacef1a73321d4a38… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index 2fc6a8d740b..42100f4f905 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -73,7 +73,7 @@ int msrp_cmap_init(int msize) _msrp_cmap_head = (msrp_cmap_t*)shm_malloc(sizeof(msrp_cmap_t)); if(_msrp_cmap_head==NULL) { - LM_ERR("no more shm\n"); + SHM_MEM_ERROR; return -1; } memset(_msrp_cmap_head, 0, sizeof(msrp_cmap_t)); @@ -83,7 +83,7 @@ int msrp_cmap_init(int msize) _msrp_cmap_head->mapsize*sizeof(msrp_centry_t) ); if(_msrp_cmap_head->cslots==NULL) { - LM_ERR("no more shm.\n"); + SHM_MEM_ERROR; shm_free(_msrp_cmap_head); _msrp_cmap_head = NULL; return -1; @@ -234,7 +234,7 @@ int msrp_cmap_save(msrp_frame_t *mf) it = (msrp_citem_t*)shm_malloc(msize); if(it==NULL) { - LM_ERR("no more shm\n"); + SHM_MEM_ERROR; return -1; } memset(it, 0, msize); diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index c701d6a6cad..0b36288b67c 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -270,7 +270,7 @@ int msrp_parse_headers(msrp_frame_t *mf) hdr = (msrp_hdr_t*)pkg_malloc(sizeof(msrp_hdr_t)); if(hdr==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } memset(hdr, 0, sizeof(msrp_hdr_t)); @@ -636,7 +636,7 @@ int msrp_explode_str(str_array_t *arr, str *in, str *del) larr = pkg_mallocxz(n * sizeof(str)); if(larr==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } @@ -712,7 +712,7 @@ int msrp_parse_hdr_uri_list(msrp_hdr_t *hdr) arr = pkg_mallocxz(sizeof(str_array_t)); if(arr==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } diff --git a/src/modules/msrp/msrp_vars.c b/src/modules/msrp/msrp_vars.c index 8384ff09107..b9d14b03b7a 100644 --- a/src/modules/msrp/msrp_vars.c +++ b/src/modules/msrp/msrp_vars.c @@ -339,7 +339,7 @@ int tr_msrp_eval_msrpuri(struct sip_msg *msg, tr_param_t *tp, int subtype, _tr_msrpuri.s = (char*)pkg_malloc((val->rs.len+1)*sizeof(char)); if(_tr_msrpuri.s==NULL) { - LM_ERR("no more private memory\n"); + PKG_MEM_ERROR; memset(&_tr_msrpuri, 0, sizeof(str)); memset(&_tr_parsed_msrpuri, 0, sizeof(msrp_uri_t)); return -1;

1 0

git:master:0f559ea7: ipops: convert to memory logging helper, add missing error logging
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 0f559ea761e2b1b140096d414b6f3d624068366b URL: https://github.com/kamailio/kamailio/commit/0f559ea761e2b1b140096d414b6f3d6… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T10:40:16Z ipops: convert to memory logging helper, add missing error logging --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/0f559ea761e2b1b140096d414b6f3d6… Patch: https://github.com/kamailio/kamailio/commit/0f559ea761e2b1b140096d414b6f3d6… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 4eabbcac86c..c8cd5994063 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -117,14 +117,14 @@ sr_dns_item_t *sr_dns_add_item(str *name) it = (sr_dns_item_t*)pkg_malloc(sizeof(sr_dns_item_t)); if(it==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return NULL; } memset(it, 0, sizeof(sr_dns_item_t)); it->name.s = (char*)pkg_malloc(name->len+1); if(it->name.s==NULL) { - LM_ERR("no more pkg.\n"); + PKG_MEM_ERROR; pkg_free(it); return NULL; } @@ -154,8 +154,10 @@ int pv_parse_dns_name(pv_spec_t *sp, str *in) dpv = (dns_pv_t*)pkg_malloc(sizeof(dns_pv_t)); if(dpv==NULL) + { + PKG_MEM_ERROR; return -1; - + } memset(dpv, 0, sizeof(dns_pv_t)); p = in->s; @@ -473,7 +475,7 @@ int hn_pv_data_init(void) _hn_data = (struct _hn_pv_data*)pkg_malloc(sizeof(struct _hn_pv_data)+46+2*(hlen+1)); if(_hn_data==NULL) { - LM_ERR("no more pkg to init hostname data\n"); + PKG_MEM_ERROR; return -1; } memset(_hn_data, 0, sizeof(struct _hn_pv_data)+46+2*(hlen+1)); @@ -672,13 +674,13 @@ sr_srv_item_t *sr_srv_add_item (str *pvid, int findflg) pitem = (sr_srv_item_t *) pkg_malloc (sizeof (sr_srv_item_t)); if (!pitem) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; return NULL; } memset (pitem, 0, sizeof (sr_srv_item_t)); pitem->pvid.s = (char *) pkg_malloc (pvid->len + 1); if (!pitem->pvid.s) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; pkg_free (pitem); return NULL; } @@ -879,7 +881,7 @@ int pv_parse_srv_name (pv_spec_t *sp, str *in) return -1; dpv = (srv_pv_t *) pkg_malloc (sizeof (srv_pv_t)); if (!dpv) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; return -1; } memset (dpv, 0, sizeof (srv_pv_t)); @@ -1227,14 +1229,14 @@ sr_naptr_item_t *sr_naptr_add_item(str *pvid, int findflg) pitem = (sr_naptr_item_t *)pkg_malloc(sizeof (sr_naptr_item_t)); if (!pitem) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; return NULL; } memset(pitem, 0, sizeof(sr_naptr_item_t)); pitem->pvid.s = (char *)pkg_malloc(pvid->len + 1); if (!pitem->pvid.s) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; pkg_free(pitem); return NULL; } @@ -1314,7 +1316,7 @@ int pv_parse_naptr_name(pv_spec_t *sp, str *in) /* alloc/init pvid structure */ dpv = (naptr_pv_t *)pkg_malloc(sizeof(naptr_pv_t)); if (!dpv) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; return -1; } memset(dpv, 0, sizeof(naptr_pv_t));

1 0

git:master:fb1f01c3: pike: convert to memory logging helper, return error in case of allocation problem
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: fb1f01c333f9fc7189b6b3b6e39ddd28d30a5046 URL: https://github.com/kamailio/kamailio/commit/fb1f01c333f9fc7189b6b3b6e39ddd2… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:44:07Z pike: convert to memory logging helper, return error in case of allocation problem --- Modified: src/modules/pike/ip_tree.c Modified: src/modules/pike/pike.c Modified: src/modules/pike/pike_top.c --- Diff: https://github.com/kamailio/kamailio/commit/fb1f01c333f9fc7189b6b3b6e39ddd2… Patch: https://github.com/kamailio/kamailio/commit/fb1f01c333f9fc7189b6b3b6e39ddd2… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index a54351adefe..1f60f25e63e 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -114,7 +114,7 @@ int init_ip_tree(int maximum_hits) /* create the pike_root */ pike_root = (pike_ip_tree_t*)shm_malloc(sizeof(pike_ip_tree_t)); if (pike_root==0) { - LM_ERR("shm malloc failed\n"); + SHM_MEM_ERROR; goto error; } memset(pike_root, 0, sizeof(pike_ip_tree_t)); @@ -200,7 +200,7 @@ static inline pike_ip_node_t *new_ip_node(unsigned char byte) new_node = (pike_ip_node_t*)shm_malloc(sizeof(pike_ip_node_t)); if (!new_node) { - LM_ERR("no more shm mem\n"); + SHM_MEM_ERROR; return 0; } memset( new_node, 0, sizeof(pike_ip_node_t)); diff --git a/src/modules/pike/pike.c b/src/modules/pike/pike.c index 33dcfd64204..89c79e95a85 100644 --- a/src/modules/pike/pike.c +++ b/src/modules/pike/pike.c @@ -126,7 +126,7 @@ static int pike_init(void) /* init timer list */ pike_timer = (pike_list_link_t*)shm_malloc(sizeof(pike_list_link_t)); if (pike_timer==0) { - LM_ERR("cannot alloc shm mem for timer!\n"); + SHM_MEM_ERROR_FMT("for timer!\n"); goto error3; } pike_timer->next = pike_timer->prev = pike_timer; diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index e0bc3074620..6940e84ca67 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -80,7 +80,11 @@ int pike_top_add_entry( unsigned char *ip_addr, int addr_len, { struct TopListItem_t *new_item = (struct TopListItem_t *)malloc(sizeof(struct TopListItem_t)); - + if(!new_item) + { + SYS_MEM_ERROR; + return -1; + } print_addr(ip_addr, addr_len); DBG("pike_top_add_enrty(ip: %s, leaf_hits[%d,%d], hits[%d,%d]," " expires: %d, status: %d)",

1 0

git:master:6492a6f9: pike: use pkg_malloc/pkg_free instead of system malloc
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 6492a6f905075fa73d911c345fe784f2d3c085e5 URL: https://github.com/kamailio/kamailio/commit/6492a6f905075fa73d911c345fe784f… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:50:20Z pike: use pkg_malloc/pkg_free instead of system malloc --- Modified: src/modules/pike/pike_top.c --- Diff: https://github.com/kamailio/kamailio/commit/6492a6f905075fa73d911c345fe784f… Patch: https://github.com/kamailio/kamailio/commit/6492a6f905075fa73d911c345fe784f… --- diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index 6940e84ca6..c7894604b6 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -79,10 +79,10 @@ int pike_top_add_entry( unsigned char *ip_addr, int addr_len, unsigned int expires, pike_node_status_t status ) { struct TopListItem_t *new_item - = (struct TopListItem_t *)malloc(sizeof(struct TopListItem_t)); + = (struct TopListItem_t *)pkg_malloc(sizeof(struct TopListItem_t)); if(!new_item) { - SYS_MEM_ERROR; + PKG_MEM_ERROR; return -1; } print_addr(ip_addr, addr_len); @@ -119,7 +119,7 @@ void pike_top_list_clear() top_list_iter = top_list_root; while (top_list_iter) { ptr = top_list_iter->next; - free(top_list_iter); + pkg_free(top_list_iter); top_list_iter = ptr; } top_list_root = 0;

1 0

git:master:19c9d56f: auth_ephemeral: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 19c9d56f3f6a53433949d2dac5494ad7b3b393a0 URL: https://github.com/kamailio/kamailio/commit/19c9d56f3f6a53433949d2dac5494ad… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:14:24Z auth_ephemeral: convert to memory logging helper --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/19c9d56f3f6a53433949d2dac5494ad… Patch: https://github.com/kamailio/kamailio/commit/19c9d56f3f6a53433949d2dac5494ad… --- diff --git a/src/modules/auth_ephemeral/auth_ephemeral_mod.c b/src/modules/auth_ephemeral/auth_ephemeral_mod.c index 2a00c7879d9..717432caa89 100644 --- a/src/modules/auth_ephemeral/auth_ephemeral_mod.c +++ b/src/modules/auth_ephemeral/auth_ephemeral_mod.c @@ -223,7 +223,7 @@ static inline int add_secret(str _secret_key) secret_struct = (struct secret *) shm_malloc(sizeof(struct secret)); if (secret_struct == NULL) { - LM_ERR("unable to allocate shared memory\n"); + SHM_MEM_ERROR; return -1; } @@ -313,7 +313,7 @@ static int secret_param(modparam_t _type, void *_val) sval.s = (char *) shm_malloc(sizeof(char) * sval.len); if (sval.s == NULL) { - LM_ERR("unable to allocate shared memory\n"); + SHM_MEM_ERROR; return -1; } memcpy(sval.s, (char *) _val, sval.len); @@ -363,7 +363,7 @@ void autheph_rpc_add_secret(rpc_t* rpc, void* ctx) sval.s = shm_malloc(sizeof(char) * sval.len); if (sval.s == NULL) { - LM_ERR("Unable to allocate shared memory\n"); + SHM_MEM_ERROR; rpc->fault(ctx, 500, "Not enough memory"); return; }

1 0

git:master:3d60451b: db_cluster: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 3d60451ba47b14ce5e406a62b18547ad7d7d9165 URL: https://github.com/kamailio/kamailio/commit/3d60451ba47b14ce5e406a62b18547a… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:16:31Z db_cluster: convert to memory logging helper --- Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_data.c --- Diff: https://github.com/kamailio/kamailio/commit/3d60451ba47b14ce5e406a62b18547a… Patch: https://github.com/kamailio/kamailio/commit/3d60451ba47b14ce5e406a62b18547a… --- diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index d1906e0f9d7..59449548b43 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -433,7 +433,7 @@ db1_con_t* db_cluster_init(const str* _dburl) cls->ref++; h = (db1_con_t*)pkg_malloc(sizeof(db1_con_t)); if (h==NULL) { - LM_ERR("out of pkg memory\n"); + PKG_MEM_ERROR; return NULL; } memset(h, 0, sizeof(db1_con_t)); diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index 6ff994974e9..af2d9459735 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -111,7 +111,7 @@ int dbcl_init_con(str *name, str *url) sc = (dbcl_con_t*)pkg_malloc(sizeof(dbcl_con_t)); if(sc==NULL) { - LM_ERR("no pkg memory\n"); + PKG_MEM_ERROR; return -1; } memset(sc, 0, sizeof(dbcl_con_t)); @@ -121,7 +121,7 @@ int dbcl_init_con(str *name, str *url) sc->sinfo = (dbcl_shared_t*)shm_malloc(sizeof(dbcl_shared_t)); if(sc->sinfo==NULL) { - LM_ERR("no shm memory\n"); + SHM_MEM_ERROR; pkg_free(sc); return -1; } @@ -357,7 +357,7 @@ int dbcl_init_cls(str *name, str *cons) sc = (dbcl_cls_t*)pkg_malloc(sizeof(dbcl_cls_t)); if(sc==NULL) { - LM_ERR("no pkg memory\n"); + PKG_MEM_ERROR; return -1; } memset(sc, 0, sizeof(dbcl_cls_t));

1 0

git:master:ab17b681: pdb: convert to memory logging helper, properly free memory in error cases
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: ab17b6811c94730f6428c218c9587d6365c9faa5 URL: https://github.com/kamailio/kamailio/commit/ab17b6811c94730f6428c218c9587d6… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:29:53Z pdb: convert to memory logging helper, properly free memory in error cases --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/ab17b6811c94730f6428c218c9587d6… Patch: https://github.com/kamailio/kamailio/commit/ab17b6811c94730f6428c218c9587d6… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index c6656ee62b5..e818b06efb3 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -541,6 +541,7 @@ static int add_server(char *host, char *port) server->host = pkg_malloc(strlen(host)+1); if (server->host == NULL) { PKG_MEM_ERROR; + pkg_free(server); return -1; } strcpy(server->host, host); @@ -798,9 +799,14 @@ static int mod_init(void) return -1; } - global_id = (uint16_t*)shm_malloc(sizeof(uint16_t)); - - return 0; + global_id = (uint16_t*)shm_malloc(sizeof(uint16_t)); + if(!global_id) + { + SHM_MEM_ERROR; + shm_free(active); + return -1; + } + return 0; } static int child_init (int rank)

1 0

git:master:811ede41: acc_diameter: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 811ede41167455369518adadff338a2064645d55 URL: https://github.com/kamailio/kamailio/commit/811ede41167455369518adadff338a2… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T08:26:53Z acc_diameter: convert to memory logging helper --- Modified: src/modules/acc_diameter/diam_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/811ede41167455369518adadff338a2… Patch: https://github.com/kamailio/kamailio/commit/811ede41167455369518adadff338a2… --- diff --git a/src/modules/acc_diameter/diam_avp.c b/src/modules/acc_diameter/diam_avp.c index aeb363f6430..6df88397fe4 100644 --- a/src/modules/acc_diameter/diam_avp.c +++ b/src/modules/acc_diameter/diam_avp.c @@ -150,7 +150,7 @@ AAA_AVP* AAACreateAVP( return avp; error: - LM_ERR("no more free memory for a new AVP!\n"); + PKG_MEM_ERROR_FMT("for a new AVP!\n"); if(avp) ad_free(avp); return 0; }

1 0

git:master:bc47875c: auth_diameter: add missing allocation checks, convert to memory logging helper, clarify logging
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: bc47875c2da39e755009c81ba1f2b4e7267b905e URL: https://github.com/kamailio/kamailio/commit/bc47875c2da39e755009c81ba1f2b4e… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:11:41Z auth_diameter: add missing allocation checks, convert to memory logging helper, clarify logging --- Modified: src/modules/auth_diameter/auth_diameter.c Modified: src/modules/auth_diameter/authorize.c Modified: src/modules/auth_diameter/avp.c Modified: src/modules/auth_diameter/message.c Modified: src/modules/auth_diameter/tcp_comm.c Modified: src/modules/auth_diameter/user_in.c --- Diff: https://github.com/kamailio/kamailio/commit/bc47875c2da39e755009c81ba1f2b4e… Patch: https://github.com/kamailio/kamailio/commit/bc47875c2da39e755009c81ba1f2b4e…

1 0

git:master:0b9442b1: acc: convert to memory logging helper, properly free memory in case of errors
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 0b9442b14adccdc7305ba222833a149e64488d66 URL: https://github.com/kamailio/kamailio/commit/0b9442b14adccdc7305ba222833a149… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T08:23:13Z acc: convert to memory logging helper, properly free memory in case of errors --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/0b9442b14adccdc7305ba222833a149… Patch: https://github.com/kamailio/kamailio/commit/0b9442b14adccdc7305ba222833a149… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index 6e9d8ed5a48..216ff7685fc 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -634,32 +634,37 @@ void acc_api_set_arrays(acc_info_t *inf) int acc_arrays_alloc(void) { if ((val_arr = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(str))) == NULL) { - LM_ERR("failed to alloc val_arr\n"); + PKG_MEM_ERROR_FMT("failed to alloc val_arr\n"); return -1; } if ((int_arr = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(int))) == NULL) { - LM_ERR("failed to alloc int_arr\n"); + PKG_MEM_ERROR_FMT("failed to alloc int_arr\n"); + acc_arrays_free(); return -1; } if ((type_arr = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(char))) == NULL) { - LM_ERR("failed to alloc type_arr\n"); + PKG_MEM_ERROR_FMT("failed to alloc type_arr\n"); + acc_arrays_free(); return -1; } if ((log_attrs = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(str))) == NULL) { - LM_ERR("failed to alloc log_attrs\n"); + PKG_MEM_ERROR_FMT("failed to alloc log_attrs\n"); + acc_arrays_free(); return -1; } if ((db_keys = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(db_key_t))) == NULL) { - LM_ERR("failed to alloc db_keys\n"); + PKG_MEM_ERROR_FMT("failed to alloc db_keys\n"); + acc_arrays_free(); return -1; } if ((db_vals = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(db_val_t))) == NULL) { - LM_ERR("failed to alloc db_vals\n"); + PKG_MEM_ERROR_FMT("failed to alloc db_vals\n"); + acc_arrays_free(); return -1; } diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index d15340b3481..0afa7630352 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -1028,32 +1028,37 @@ void cdr_api_set_arrays(cdr_info_t *inf) int cdr_arrays_alloc(void) { if ((cdr_attrs = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(str))) == NULL) { - LM_ERR("failed to alloc cdr_attrs\n"); + PKG_MEM_ERROR_FMT("failed to alloc cdr_attrs\n"); return -1; } if ((cdr_value_array = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(str))) == NULL) { - LM_ERR("failed to alloc cdr_value_array\n"); + PKG_MEM_ERROR_FMT("failed to alloc cdr_value_array\n"); + cdr_arrays_free(); return -1; } if ((cdr_int_array = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(int))) == NULL) { - LM_ERR("failed to alloc cdr_int_array\n"); + PKG_MEM_ERROR_FMT("failed to alloc cdr_int_array\n"); + cdr_arrays_free(); return -1; } if ((cdr_type_array = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(char))) == NULL) { - LM_ERR("failed to alloc cdr_type_array\n"); + PKG_MEM_ERROR_FMT("failed to alloc cdr_type_array\n"); + cdr_arrays_free(); return -1; } if ((db_cdr_keys = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(db_key_t))) == NULL) { - LM_ERR("failed to alloc db_cdr_keys\n"); + PKG_MEM_ERROR_FMT("failed to alloc db_cdr_keys\n"); + cdr_arrays_free(); return -1; } if ((db_cdr_vals = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(db_val_t))) == NULL) { - LM_ERR("failed to alloc db_cdr_vals\n"); + PKG_MEM_ERROR_FMT("failed to alloc db_cdr_vals\n"); + cdr_arrays_free(); return -1; } diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index 6205ba1a17d..dc0e1259990 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -386,7 +386,7 @@ int acc_extra_arrays_alloc(void) { } if ((int_buf = pkg_malloc((INT2STR_MAX_LEN * acc_int_buf_size) * sizeof(char))) == NULL) { - LM_ERR("failed to alloc int_buf\n"); + PKG_MEM_ERROR_FMT("failed to alloc int_buf\n"); return -1; }

1 0

OpenSSL 1.1 end of life
by Olle E. Johansson 29 Mar '23

29 Mar '23

https://www.openssl.org/blog/blog/2023/03/28/1.1.1-EOL/ Are we ready for OpenSSL 3 in production? /O

2 1

Changing location id from INT(10) to BIGINT
by Julius Flohr 29 Mar '23

29 Mar '23

Hi, we've been using kamailio successfully for many years now and we've noticed that the id field in the location database of our installation (userloc module) will overflow in the foreseeable future. Currently it is setup as a INT(10). Are there any reasons not to change it to BIGINT and upstream that change? Cheers Julius

2 2

git:master:ba365102: evapi: initialize internal message queue
by Daniel-Constantin Mierla 28 Mar '23

28 Mar '23

Module: kamailio Branch: master Commit: ba365102fe9faa403717eb30f36d363bad13114b URL: https://github.com/kamailio/kamailio/commit/ba365102fe9faa403717eb30f36d363… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-28T17:31:31+02:00 evapi: initialize internal message queue --- Modified: src/modules/evapi/evapi_dispatch.h Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ba365102fe9faa403717eb30f36d363… Patch: https://github.com/kamailio/kamailio/commit/ba365102fe9faa403717eb30f36d363… --- diff --git a/src/modules/evapi/evapi_dispatch.h b/src/modules/evapi/evapi_dispatch.h index 23b4c2565c..c96bcbf275 100644 --- a/src/modules/evapi/evapi_dispatch.h +++ b/src/modules/evapi/evapi_dispatch.h @@ -53,4 +53,6 @@ int pv_set_evapi(sip_msg_t *msg, pv_param_t *param, int op, int evapi_cfg_close(sip_msg_t *msg); int evapi_set_tag(sip_msg_t* msg, str* stag); +int evapi_queue_init(void); + #endif diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index 27b3582698..708159ba3a 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -163,6 +163,10 @@ static int mod_init(void) _evapi_bind_addr = _evapi_bind_param; } + if(evapi_queue_init() < 0) { + LM_ERR("failed to init faked internal message queue\n"); + return -1; + } /* add space for one extra process */ register_procs(1 + _evapi_workers);

1 0

git:master:cc950166: ndb_redis: break on finding a server via sentinel
by Daniel-Constantin Mierla 28 Mar '23

28 Mar '23

Module: kamailio Branch: master Commit: cc9501663d6dd0fa91aef23ce00a7cdf86319201 URL: https://github.com/kamailio/kamailio/commit/cc9501663d6dd0fa91aef23ce00a7cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-28T08:12:00+02:00 ndb_redis: break on finding a server via sentinel --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/cc9501663d6dd0fa91aef23ce00a7cd… Patch: https://github.com/kamailio/kamailio/commit/cc9501663d6dd0fa91aef23ce00a7cd… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index d6b7e0b95b9..a3ee1c332d4 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -156,6 +156,7 @@ int redisc_init(void) for(i= 0; i< sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; + int srvfound = 0; redisContext *redis; redisReply *res, *res2; @@ -177,9 +178,9 @@ int redisc_init(void) res->element[0]->len + 1); port = atoi(res->element[1]->str); LM_DBG("sentinel replied: %s:%d\n", addr, port); + srvfound = 1; } - } - else { + } else { res = redisCommand(redis, "SENTINEL slaves %s", sentinel_group); if( res && (res->type == REDIS_REPLY_ARRAY) ) { @@ -201,9 +202,13 @@ int redisc_init(void) } LOG(ndb_redis_debug, "slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound==1) { + break; + } } }

1 0

git:master:f5bd2748: evapi: remove static specifier for evapi workers variable
by Daniel-Constantin Mierla 27 Mar '23

27 Mar '23

Module: kamailio Branch: master Commit: f5bd2748a7d06d0592fc5ab835bf970b3c023eaa URL: https://github.com/kamailio/kamailio/commit/f5bd2748a7d06d0592fc5ab835bf970… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-27T16:36:41+02:00 evapi: remove static specifier for evapi workers variable - it is exposed with extern --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f5bd2748a7d06d0592fc5ab835bf970… Patch: https://github.com/kamailio/kamailio/commit/f5bd2748a7d06d0592fc5ab835bf970… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index e5ac255691..27b3582698 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -44,7 +44,7 @@ MODULE_VERSION -static int _evapi_workers = 1; +int _evapi_workers = 1; static char *_evapi_bind_addr = "127.0.0.1"; static int _evapi_bind_port = 8448; static char *_evapi_bind_param = NULL;

1 0

git:5.5:667eed70: carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2
by Henning Westerholt 24 Mar '23

24 Mar '23

Module: kamailio Branch: 5.5 Commit: 667eed709ac31589d6ed0c3bd1003babdc1152a1 URL: https://github.com/kamailio/kamailio/commit/667eed709ac31589d6ed0c3bd1003ba… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-24T14:22:34Z carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2 (cherry picked from commit f44e93a4171668d1c1182b186bea8c41db0a9300) (cherry picked from commit 7fcfc9ef6d624d7c817c83b5bb8008638d387e78) --- Modified: src/modules/carrierroute/cr_db.c --- Diff: https://github.com/kamailio/kamailio/commit/667eed709ac31589d6ed0c3bd1003ba… Patch: https://github.com/kamailio/kamailio/commit/667eed709ac31589d6ed0c3bd1003ba… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 0e59a681e4..04e3659dfe 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,11 +335,6 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } - if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { - LM_ERR("Database does not support required raw queries capability\n"); - return -1; - } - if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) {

1 0

git:5.6:7fcfc9ef: carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2
by Henning Westerholt 24 Mar '23

24 Mar '23

Module: kamailio Branch: 5.6 Commit: 7fcfc9ef6d624d7c817c83b5bb8008638d387e78 URL: https://github.com/kamailio/kamailio/commit/7fcfc9ef6d624d7c817c83b5bb80086… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-24T14:21:19Z carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2 (cherry picked from commit f44e93a4171668d1c1182b186bea8c41db0a9300) --- Modified: src/modules/carrierroute/cr_db.c --- Diff: https://github.com/kamailio/kamailio/commit/7fcfc9ef6d624d7c817c83b5bb80086… Patch: https://github.com/kamailio/kamailio/commit/7fcfc9ef6d624d7c817c83b5bb80086… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 0e59a681e4..04e3659dfe 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,11 +335,6 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } - if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { - LM_ERR("Database does not support required raw queries capability\n"); - return -1; - } - if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) {

1 0

git:master:f44e93a4: carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2
by Henning Westerholt 24 Mar '23

24 Mar '23

Module: kamailio Branch: master Commit: f44e93a4171668d1c1182b186bea8c41db0a9300 URL: https://github.com/kamailio/kamailio/commit/f44e93a4171668d1c1182b186bea8c4… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-24T14:20:49Z carrierroute: remove redundant capabilities check, related to commit cf147ab7888c4e2 --- Modified: src/modules/carrierroute/cr_db.c --- Diff: https://github.com/kamailio/kamailio/commit/f44e93a4171668d1c1182b186bea8c4… Patch: https://github.com/kamailio/kamailio/commit/f44e93a4171668d1c1182b186bea8c4… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 0e59a681e4..04e3659dfe 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,11 +335,6 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } - if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { - LM_ERR("Database does not support required raw queries capability\n"); - return -1; - } - if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) {

1 0

git:master:ef94da7b: app_lua: fix crash on exausted memory scenario
by Victor Seva 24 Mar '23

24 Mar '23

Module: kamailio Branch: master Commit: ef94da7bac8e2aaf5a452d7b7dc3e2b544153ff6 URL: https://github.com/kamailio/kamailio/commit/ef94da7bac8e2aaf5a452d7b7dc3e2b… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-24T10:33:41+01:00 app_lua: fix crash on exausted memory scenario --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/ef94da7bac8e2aaf5a452d7b7dc3e2b… Patch: https://github.com/kamailio/kamailio/commit/ef94da7bac8e2aaf5a452d7b7dc3e2b… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index b808d229d5a..df192b2b64e 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -912,6 +912,10 @@ void sr_kemi_lua_push_dict(lua_State *L, sr_kemi_dict_item_t *item) { void sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) { + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } switch(item->vtype) { case SR_KEMIP_NONE: LM_CRIT("BUG: vtype is NONE\n"); @@ -951,6 +955,10 @@ sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) */ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) { + if(!rx) { + LM_CRIT("BUG: xval field empty\n"); + return 0; + } switch(rx->vtype) { case SR_KEMIP_NONE: return 0;

1 0

git:5.5:3fed16c6: carrierroute: check during startup for required DB capabilities (GH #3405)
by Henning Westerholt 24 Mar '23

24 Mar '23

Module: kamailio Branch: 5.5 Commit: 3fed16c6eccbde99f4161af59318c94f6fa24a22 URL: https://github.com/kamailio/kamailio/commit/3fed16c6eccbde99f4161af59318c94… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-24T08:56:19Z carrierroute: check during startup for required DB capabilities (GH #3405) (cherry picked from commit cf147ab7888c4e2b26db9dd44e494001bb71a61c) (cherry picked from commit ce9c0e6715010c4403463b6d664b6e4a5632c04a) --- Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/db_carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/3fed16c6eccbde99f4161af59318c94… Patch: https://github.com/kamailio/kamailio/commit/3fed16c6eccbde99f4161af59318c94… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 04e3659dfe8..0e59a681e40 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,6 +335,11 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } + if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { + LM_ERR("Database does not support required raw queries capability\n"); + return -1; + } + if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) { diff --git a/src/modules/carrierroute/db_carrierroute.c b/src/modules/carrierroute/db_carrierroute.c index 99636b9c4d3..8d31f53008c 100644 --- a/src/modules/carrierroute/db_carrierroute.c +++ b/src/modules/carrierroute/db_carrierroute.c @@ -111,6 +111,10 @@ int carrierroute_db_init(void) { LM_ERR("can't connect to database.\n"); return -1; } + if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { + LM_ERR("database does not support required raw queries capability\n"); + return -1; + } if (db_check_table_version(&carrierroute_dbf, carrierroute_dbh, &carrierroute_table, carrierroute_version) < 0) { DB_TABLE_VERSION_ERROR(carrierroute_table);

1 0

git:5.6:ce9c0e67: carrierroute: check during startup for required DB capabilities (GH #3405)
by Henning Westerholt 24 Mar '23

24 Mar '23

Module: kamailio Branch: 5.6 Commit: ce9c0e6715010c4403463b6d664b6e4a5632c04a URL: https://github.com/kamailio/kamailio/commit/ce9c0e6715010c4403463b6d664b6e4… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-24T08:55:18Z carrierroute: check during startup for required DB capabilities (GH #3405) (cherry picked from commit cf147ab7888c4e2b26db9dd44e494001bb71a61c) --- Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/db_carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/ce9c0e6715010c4403463b6d664b6e4… Patch: https://github.com/kamailio/kamailio/commit/ce9c0e6715010c4403463b6d664b6e4… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 04e3659dfe8..0e59a681e40 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,6 +335,11 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } + if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { + LM_ERR("Database does not support required raw queries capability\n"); + return -1; + } + if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) { diff --git a/src/modules/carrierroute/db_carrierroute.c b/src/modules/carrierroute/db_carrierroute.c index 99636b9c4d3..8d31f53008c 100644 --- a/src/modules/carrierroute/db_carrierroute.c +++ b/src/modules/carrierroute/db_carrierroute.c @@ -111,6 +111,10 @@ int carrierroute_db_init(void) { LM_ERR("can't connect to database.\n"); return -1; } + if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { + LM_ERR("database does not support required raw queries capability\n"); + return -1; + } if (db_check_table_version(&carrierroute_dbf, carrierroute_dbh, &carrierroute_table, carrierroute_version) < 0) { DB_TABLE_VERSION_ERROR(carrierroute_table);

1 0

[kamailio/kamailio] carrierroute: crush when database is not initialized (Issue #3405)
by sergey-safarov 23 Mar '23

23 Mar '23

### Description When I start Kamailio with not initialized Redis database I expect an error message but catch a crush. #### Debugging Data bt ``` (gdb) bt #0 0x0000000000000000 in ?? () #1 0x0000fffff24b64e4 in load_route_data_db (rd=0xfffff32243e0) at cr_db.c:314 #2 0x0000fffff24a718c in reload_route_data () at cr_data.c:178 #3 0x0000fffff2498340 in mod_init () at carrierroute.c:239 #4 0x00000000006996bc in init_mod (m=0xfffff76336e8) at core/sr_module.c:971 #5 0x0000000000699b24 in init_modules () at core/sr_module.c:1002 #6 0x000000000043e36c in main (argc=5, argv=0xfffffffff438) at main.c:3024 ``` bt full ``` (gdb) bt full #0 0x0000000000000000 in ?? () No symbol table info available. #1 0x0000fffff24b64e4 in load_route_data_db (rd=0xfffff32243e0) at cr_db.c:314 res = 0x0 row = 0x0 i = 0 j = -215858208 ret = 56 tmp_carrier_data = 0xfffff2fb96c8 query_str = {s = 0xfffff2521d60 <query> "SELECT DISTINCT domain FROM carrierroute WHERE carrier=1", len = 56} tmp_scan_prefix = {s = 0x8 <error: Cannot access memory at address 0x8>, len = 1} tmp_rewrite_host = {s = 0xfffff24f55b0 <__func__.12> "init_route_data", len = -218392888} tmp_rewrite_prefix = {s = 0xfffff24f39e8 "carrierroute", len = 8763264} tmp_rewrite_suffix = {s = 0xfffff7ed1520 <_IO_2_1_stderr_> "\207(\255", <incomplete sequence \373>, len = 0} tmp_host_name = {s = 0x40 <error: Cannot access memory at address 0x40>, len = -218628096} tmp_reply_code = {s = 0xfffff24f5608 <__func__.8> "reload_route_data", len = -229688464} tmp_comment = {s = 0xfffff24f39e8 "carrierroute", len = 9832376} p_tmp_comment = 0xffffffffeb80 __func__ = "load_route_data_db" n = 65535 #2 0x0000fffff24a718c in reload_route_data () at cr_data.c:178 old_data = 0x2008e4e98 new_data = 0xfffff32243e0 i = 3 __func__ = "reload_route_data" #3 0x0000fffff2498340 in mod_init () at carrierroute.c:239 fs = {st_dev = 9547688, st_ino = 268435456, st_mode = 0, st_nlink = 0, st_uid = 4294962480, st_gid = 65535, st_rdev = 268435456, __pad1 = 0, st_size = 281474976706104, st_blksize = -4768, __pad2 = 65535, st_blocks = 6918840, st_atim = {tv_sec = 969, tv_nsec = 5}, st_mtim = {tv_sec = 37199812, tv_nsec = 281474831794664}, st_ctim = {tv_sec = 4294967295, tv_nsec = 281474839572424}, __glibc_reserved = {-134251712, 65535}} uid = 4 gid = 261 __func__ = "mod_init" #4 0x00000000006996bc in init_mod (m=0xfffff76336e8) at core/sr_module.c:971 ret = -134225920 __func__ = "init_mod" #5 0x0000000000699b24 in init_modules () at core/sr_module.c:1002 t = 0x20ffffffff i = -1 __func__ = "init_modules" #6 0x000000000043e36c in main (argc=5, argv=0xfffffffff438) at main.c:3024 cfg_stream = 0xab3380 c = -1 r = 0 tmp = 0xfffff7fccde4 <_dl_fixup+244> "\367\003" tmp_len = 65535 port = -3376 proto = 65535 ahost = 0x0 aport = 0 options = 0x8d0fe0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 160181580 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0xfffff7ff0760 p = 0xfffff7d4b544 <__libc_start_call_main+52> "\237$\003\325 \002" st = {st_dev = 26, st_ino = 1030, st_mode = 16832, st_nlink = 2, st_uid = 977, st_gid = 977, st_rdev = 0, __pad1 = 0, st_size = 40, st_blksize = 4096, __pad2 = 0, st_blocks = 0, st_atim = {tv_sec = 1679590104, tv_nsec = 869999991}, st_mtim = {tv_sec = 1679590104, tv_nsec = 869999991}, st_ctim = {tv_sec = 1679590104, tv_nsec = 869999991}, __glibc_reserved = {0, 0}} tbuf = "\254\202\226\006\000\000\000\000(\315\375\367\377\377\000\000\030\315\375\367\377\377\000\000\205\317c\t\000\000\000\000\000\367\377\367\377\377\000\000\240\357\377\377\377\377\000\000\bb\345\367\377\377\000\000\001\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\200\002\000\000\000\000\000g\303\317*\031z\n\360\357\377\377\377\377\000\000Xt\375\367\377\377\000\000\000\340\377\367\377\377\000\000\000\000\000\000\000\000\000\000\360\357\377\377\377\377\000\000\204t\375\367\377\377\000\000\250\361\377\367\377\377", '\000' <repeats 26 times>, "\340\362\377\377\377\377\000\000DB\375\367\377\377\000\000(\333\377\367\377\377\000\000\000\320\377\367\377\377\000\000"... option_index = 0 long_options = {{name = 0x8d3520 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x8ce2d0 "version", has_arg = 0, flag = 0x0, val = 118}, { name = 0x8d3528 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x8d3530 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x8d3538 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x8d3548 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x8d3558 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x8d3568 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x8d3578 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x8d3588 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x8d3598 "debug", has_arg = 1, flag = 0x0, val = 1032}, { name = 0x8d35a0 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x8d35b0 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` info locals ``` (gdb) f 1 #1 0x0000fffff24b64e4 in load_route_data_db (rd=0xfffff32243e0) at cr_db.c:314 314 if (carrierroute_dbf.raw_query(carrierroute_dbh, &query_str, &res) < 0) { (gdb) info locals res = 0x0 row = 0x0 i = 0 j = -215858208 ret = 56 tmp_carrier_data = 0xfffff2fb96c8 query_str = {s = 0xfffff2521d60 <query> "SELECT DISTINCT domain FROM carrierroute WHERE carrier=1", len = 56} tmp_scan_prefix = {s = 0x8 <error: Cannot access memory at address 0x8>, len = 1} tmp_rewrite_host = {s = 0xfffff24f55b0 <__func__.12> "init_route_data", len = -218392888} tmp_rewrite_prefix = {s = 0xfffff24f39e8 "carrierroute", len = 8763264} tmp_rewrite_suffix = {s = 0xfffff7ed1520 <_IO_2_1_stderr_> "\207(\255", <incomplete sequence \373>, len = 0} tmp_host_name = {s = 0x40 <error: Cannot access memory at address 0x40>, len = -218628096} tmp_reply_code = {s = 0xfffff24f5608 <__func__.8> "reload_route_data", len = -229688464} tmp_comment = {s = 0xfffff24f39e8 "carrierroute", len = 9832376} p_tmp_comment = 0xffffffffeb80 __func__ = "load_route_data_db" n = 65535 ``` list ``` (gdb) list 309 goto errout; 310 } 311 query_str.s = query; 312 query_str.len = ret; 313 314 if (carrierroute_dbf.raw_query(carrierroute_dbh, &query_str, &res) < 0) { 315 LM_ERR("Failed to query database.\n"); 316 goto errout; 317 } 318 LM_INFO("carrier '%.*s' (id %i) has %i domains\n", rd->carrier_map[i].name.len, rd->carrier_map[i].name.s, rd->carrier_map[i].id, RES_ROW_N(res)); ``` #### Log Messages ``` 0(969) INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Listening on udp: 158.51.225.1:5060 name ipv4_udp udp: 2605:84c0:40:2:278a:4bc8:76c1:1585:5060 name ipv6_udp tcp: 158.51.225.1:5060 name ipv4_tcp tcp: 158.51.225.1:2855 name ipv4_msrp tcp: 2605:84c0:40:2:278a:4bc8:76c1:1585:5060 name ipv6_tcp Aliases: tcp: linux.local:5060 tcp: linux:5060 tcp: localhost:2855 tcp: localhost:5060 udp: linux.local:5060 udp: linux:5060 udp: localhost:5060 0(969) INFO: <core> [core/tcp_main.c:5071]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(969) NOTICE: regex [regex_mod.c:168]: mod_init(): 'file' parameter is not set, group matching disabled 0(969) INFO: carrierroute [carrierroute.c:185]: mod_init(): use database as configuration source Program received signal SIGSEGV, Segmentation fault. ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` here is cutomized 54a9c15a5ebdaa1df82e4526534be930e0f8ca71 ``` [root@localhost sipagg2]# kamailio -v version: kamailio 5.6.2 (aarch64/linux) 42c09c-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT-NOSMP, 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: 42c09c -dirty compiled on 00:00:00 Sep 13 2022 with gcc 12.2.1 ``` * **Operating System**: ``` [root@sbc-stage-a0 kamailio]# cat /etc/os-release NAME="CentOS Stream" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Stream 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux 8" REDHAT_SUPPORT_PRODUCT_VERSION="CentOS Stream" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3405 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3405(a)github.com>

2 6

git:master:cf147ab7: carrierroute: check during startup for required DB capabilities (GH #3405)
by Henning Westerholt 23 Mar '23

23 Mar '23

Module: kamailio Branch: master Commit: cf147ab7888c4e2b26db9dd44e494001bb71a61c URL: https://github.com/kamailio/kamailio/commit/cf147ab7888c4e2b26db9dd44e49400… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-23T18:21:26Z carrierroute: check during startup for required DB capabilities (GH #3405) --- Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/db_carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/cf147ab7888c4e2b26db9dd44e49400… Patch: https://github.com/kamailio/kamailio/commit/cf147ab7888c4e2b26db9dd44e49400… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 04e3659dfe8..0e59a681e40 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -335,6 +335,11 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } + if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { + LM_ERR("Database does not support required raw queries capability\n"); + return -1; + } + if (DB_CAPABILITY(carrierroute_dbf, DB_CAP_FETCH)) { if (carrierroute_dbf.query(carrierroute_dbh, NULL, NULL, NULL, (db_key_t *) columns, 0, columns_load_num, NULL, NULL) < 0) { diff --git a/src/modules/carrierroute/db_carrierroute.c b/src/modules/carrierroute/db_carrierroute.c index 99636b9c4d3..8d31f53008c 100644 --- a/src/modules/carrierroute/db_carrierroute.c +++ b/src/modules/carrierroute/db_carrierroute.c @@ -111,6 +111,10 @@ int carrierroute_db_init(void) { LM_ERR("can't connect to database.\n"); return -1; } + if (!DB_CAPABILITY(carrierroute_dbf, DB_CAP_RAW_QUERY)) { + LM_ERR("database does not support required raw queries capability\n"); + return -1; + } if (db_check_table_version(&carrierroute_dbf, carrierroute_dbh, &carrierroute_table, carrierroute_version) < 0) { DB_TABLE_VERSION_ERROR(carrierroute_table);

1 0

$avp(id) - AVPs - Problem
by Scherney Theodor 23 Mar '23

23 Mar '23

Hello, http://www.kamailio.org/wiki/cookbooks/5.5.x/pseudovariables#avp_id_-_avps AVPs are special variables that are attached to SIP transactions. It is R/W variable (you can assign values to it directly in configuration file). Call scenario: Alice calls Bob. Here I set the AVP: route[REQINIT] { if (is_method("INVITE")){ $avp(ICID_AVP) = $hdr(P-Charging-Vector); } Receiving 200 Ok at onreply_route[term_reply] { } I can access the AVP. Other scenario: Alice calls Bob. Alice cancels the call. In this case I can't access the AVP. route[term_subsequent] { if (is_method("CANCEL")){ if (t_lookup_cancel()) { xlog("L_INFO", "INVITE transaction exists"); xlog("L_INFO", "ICID_AVP [$avp(ICID_AVP)]\n"); } } } 2023-03-23T09:11:56.332778+01:00 172.29.21.53 vict2-scscf[44536] - [logSDID@20306 resource="xlog"] INFO: <script>: INVITE transaction exists 2023-03-23T09:11:56.333292+01:00 172.29.21.53 vict2-scscf[44536] - [logSDID@20306 resource="xlog"] INFO: <script>: ICID_AVP [<null>] What could be the problem? Thanks! BR Theo

2 1

[kamailio/kamailio] CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 41 (Issue #3395)
by sznoname 22 Mar '23

22 Mar '23

### Description  ### Troubleshooting ``` -->sip invite t_suspend() nats publish--->routeserver <---route result t_continue() but kamailio crash ``` #### Reproduction  ``` wget http://220.231.180.131:12295/kamailio-nats-routeserver.tar.gz nats_url: nats://127.0.0.1:4222 start kamailio go run routeserver.go uac sip call kamailio, and kamailio crash ``` #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` kamailio[2037]: INFO: <script>: nats payload received [{"jsonrpc":"2.0","method":"route","tindex":52750,"tlabel":650229805,"destination":"sip: kamailio[2037]: INFO: <script>: tindex = 52750, tlabel = 650229805, destination = sip:192.168.31.96:5080 kamailio[2048]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 41 kamailio[2048]: DEBUG: <core> [core/tcp_main.c:3854]: handle_ser_child(): dead child 23, pid 2037 (shutting down?) kamailio[2048]: DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0x557342d36be0, 41, -1, 0x0) fd_no=37 called kamailio[2011]: ALERT: <core> [main.c:774]: handle_sigs(): child process 2037 exited by a signal 11 kamailio[2011]: ALERT: <core> [main.c:777]: handle_sigs(): core was generated kamailio[2011]: INFO: <core> [main.c:799]: handle_sigs(): terminating due to SIGCHLD kamailio[2048]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2047]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2041]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2039]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2035]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2018]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2033]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2016]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2031]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2015]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2029]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2036]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2027]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2020]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2025]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2042]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2023]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2021]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2017]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2038]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2030]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2019]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2022]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2040]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2024]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2028]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2026]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2032]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2034]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received kamailio[2011]: DEBUG: <core> [core/sr_module.c:835]: destroy_modules(): starting modules destroy phase ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.6.4 (x86_64/linux) nats-server: v2.9.15 nats.c: 3.6.1 libuv1-dev:amd64:1.44.2-1 ``` * **Operating System**:  ``` Debian11 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3395 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3395(a)github.com>

3 9

git:master:ffbb6ad2: nats: register cfg child procs and trigger init
by Daniel-Constantin Mierla 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: ffbb6ad2837326e7309be342ce62527c16f6db16 URL: https://github.com/kamailio/kamailio/commit/ffbb6ad2837326e7309be342ce62527… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-22T19:40:22+01:00 nats: register cfg child procs and trigger init - GH #3395 --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ffbb6ad2837326e7309be342ce62527… Patch: https://github.com/kamailio/kamailio/commit/ffbb6ad2837326e7309be342ce62527… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 5cf635e0fac..053ad8c8ba2 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -182,6 +182,7 @@ static int mod_init(void) return -1; } register_procs(total_procs); + cfg_register_child(total_procs); nats_pub_worker_pipes_fds = (int *)shm_malloc(sizeof(int) * (nats_pub_workers_num)*2); @@ -369,6 +370,8 @@ static int mod_child_init(int rank) LM_ERR("failed to fork worker process %d\n", i); return -1; } else if(newpid == 0) { + if(cfg_child_init()) + return -1; worker_loop(i); } else { nats_workers[i].pid = newpid;

1 0

git:master:b9de5009: benchmark: fix order of free operation
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: b9de5009f81e27934a2108c06eae27ea748ead37 URL: https://github.com/kamailio/kamailio/commit/b9de5009f81e27934a2108c06eae27e… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:58:56Z benchmark: fix order of free operation --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/b9de5009f81e27934a2108c06eae27e… Patch: https://github.com/kamailio/kamailio/commit/b9de5009f81e27934a2108c06eae27e… --- diff --git a/src/modules/benchmark/benchmark.c b/src/modules/benchmark/benchmark.c index 09af04abf8..08e7c1ccc4 100644 --- a/src/modules/benchmark/benchmark.c +++ b/src/modules/benchmark/benchmark.c @@ -443,8 +443,8 @@ int _bm_register_timer(char *tname, int mode, unsigned int *id) if(bm_mycfg->tindex==0) { SHM_MEM_ERROR; - shm_free(bmt); pkg_free(bmt->start); + shm_free(bmt); if(tidx!=0) shm_free(tidx); return -1;

1 0

Re: [kamailio/kamailio] benchmark: properly free previous allocated memory in case of error (d7770ca)
by Victor Seva 22 Mar '23

22 Mar '23

@henningw this is wrong no? it should be ``` pkg_free(bmt->start); shm_free(bmt); ``` instead. you can't access ``bmt->start`` if you freed ``bmt`` first, no? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0ba3ebb47d/105547932(a)github.com>

2 1

Re: [kamailio/kamailio] app_sqlang: convert to memory logging helper (0702a7e)
by Daniel-Constantin Mierla 22 Mar '23

22 Mar '23

In the above case, `SHM_MEM_ERROR` is losing the usefulness of the previous version of the log message, there is `SHM_MEM_ERROR_FMT` that should be used. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d953… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d95363d484d5a/105546658(a)github.com>

2 1

git:master:43751e7b: app_sqlang: restore some details related to one memory error log
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 43751e7b0071135d433258cc0423cc00546a31e6 URL: https://github.com/kamailio/kamailio/commit/43751e7b0071135d433258cc0423cc0… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:52:09Z app_sqlang: restore some details related to one memory error log --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/43751e7b0071135d433258cc0423cc0… Patch: https://github.com/kamailio/kamailio/commit/43751e7b0071135d433258cc0423cc0… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index fd2a81f759b..d0df44cb63d 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -583,7 +583,7 @@ int sqlang_sr_init_mod(void) if(_sr_sqlang_reload_version == NULL) { _sr_sqlang_reload_version = (int*)shm_malloc(sizeof(int)); if(_sr_sqlang_reload_version == NULL) { - SHM_MEM_ERROR; + SHM_MEM_ERROR_FMT("reload version\n");; return -1; } *_sr_sqlang_reload_version = 0;

1 0

Re: [kamailio/kamailio] auth_db: fix goto for memory allocation error, convert to memory logging helper (01e82b3)
by Daniel-Constantin Mierla 22 Mar '23

22 Mar '23

Probably the `parse_error` label should be replaced by `error` and all `goto`'s point to it. `parse_error` is used for other cases like target pv not being writeable, it's difference comparing with `error` is printing more context info about the position in the string where the error happens. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… You are receiving this because you commented. Message ID: <kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981ef0ce4318/105547846(a)github.com>

1 0

git:master:7378aa0f: cfgutils: convert to memory error logging helper, add missing free in error case
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 7378aa0f7dcbde237bb5701f40b8a2d008d78b45 URL: https://github.com/kamailio/kamailio/commit/7378aa0f7dcbde237bb5701f40b8a2d… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:15:35Z cfgutils: convert to memory error logging helper, add missing free in error case --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/7378aa0f7dcbde237bb5701f40b8a2d… Patch: https://github.com/kamailio/kamailio/commit/7378aa0f7dcbde237bb5701f40b8a2d… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 9a77b40aed8..bf4b0680bbc 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -884,14 +884,15 @@ static int mod_init(void) probability=(int *) shm_malloc(sizeof(int)); if (!probability) { - LM_ERR("no shmem available\n"); + SHM_MEM_ERROR; return -1; } *probability = initial_prob; gflags=(unsigned int *) shm_malloc(sizeof(unsigned int)); if (!gflags) { - LM_ERR(" no shmem available\n"); + SHM_MEM_ERROR; + shm_free(probability); return -1; } *gflags=initial_gflags;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev