- sr-dev - kamailio.org

[kamailio/kamailio] tcpops: added tcp_get_conid() for kemi (PR #3402)
by Muhammad Shahzad Shafi 30 Mar '23

30 Mar '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  In `tcpops` module, the method `tcp_get_conid()` was missing which may be needed to trace, track and log TCP connections, especially for UDP to TCP reply route in KEMI. The patch is tested to work with `master` and `5.6` and above branches. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3402 -- Commit Summary -- * tcpops: added tcp_get_conid() for kemi -- File Changes -- M src/modules/tcpops/tcpops_mod.c (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3402.patch https://github.com/kamailio/kamailio/pull/3402.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3402 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3402(a)github.com>

2 2

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev