- sr-dev - kamailio.org

[kamailio/kamailio] core: fix a seg while t_continue with nats module (PR #3396)
by Seven Du 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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  segfault ``` #0 0x0000ffffb9934840 in cfg_update_local (no_cbs=0) at ../../core/cfg/cfg_struct.h:366 366 cfg_child_cb = cfg_child_cb->next; (gdb) print cfg_child_cb $1 = (cfg_child_cb_t *) 0x0 ``` example lua: ``` function ksr_route_nats() KSR.tm.t_newtran() local tindex = KSR.pv.gete("$T(id_index)") local tlabel = KSR.pv.gete("$T(id_label)") KSR.tmx.t_suspend() local req = { jsonrpc = "2.0", method = "route", id = tindex .. ':' .. tlabel, params = { from = KSR.pv.gete("$fu"), to = KSR.pv.gete("$tu"), } } local rpc = cjson.encode(req) KSR.info("rpc: " .. rpc .. "\n") KSR.nats.publish("cn.xswitch.ctrl.route", rpc) KSR.x.exit(); end function handle_nats_response(data) msg = cjson.decode(data) if (not msg) or (not msg.id) then return end KSR.info("========= msg.id: " .. msg.id .. "\n") if not msg.result then KSR.error("response has no result\n") return end tindex, tlabel = msg.id:match("(.+):(.+)") if tindex and tlabel then KSR.pv.sets('$var(nats_response)', data) KSR.tmx.t_continue(tindex, tlabel, 'ksr_nats_continue') end end ``` I'm not sure if it's the proper fix, but this pr fixed the seg. Thanks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3396 -- Commit Summary -- * core: fix a seg while t_continue with nats module -- File Changes -- M src/core/cfg/cfg_struct.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3396.patch https://github.com/kamailio/kamailio/pull/3396.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3396 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3396(a)github.com>

4 7

[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

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

git:master:d7770cae: benchmark: properly free previous allocated memory in case of error
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: d7770cae2ee68be7184298b2bb41cb0ba3ebb47d URL: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T11:20:08Z benchmark: properly free previous allocated memory in case of error --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… Patch: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… --- diff --git a/src/modules/benchmark/benchmark.c b/src/modules/benchmark/benchmark.c index cb1e288be16..09af04abf88 100644 --- a/src/modules/benchmark/benchmark.c +++ b/src/modules/benchmark/benchmark.c @@ -443,6 +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); if(tidx!=0) shm_free(tidx); return -1;

1 0

git:master:af9f95da: cplc: convert to memory error logging helper, add one missing free in error case
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: af9f95da42bd07ea9bf3de0ea5cbd264f384bc02 URL: https://github.com/kamailio/kamailio/commit/af9f95da42bd07ea9bf3de0ea5cbd26… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:13:47Z cplc: convert to memory error logging helper, add one missing free in error case --- Modified: src/modules/cplc/cpl_db.c Modified: src/modules/cplc/cpl_loader.c Modified: src/modules/cplc/cpl_log.c Modified: src/modules/cplc/cpl_nonsig.c Modified: src/modules/cplc/cpl_proxy.h Modified: src/modules/cplc/cpl_run.c Modified: src/modules/cplc/cpl_time.c Modified: src/modules/cplc/cplc.c Modified: src/modules/cplc/loc_set.h Modified: src/modules/cplc/sub_list.c --- Diff: https://github.com/kamailio/kamailio/commit/af9f95da42bd07ea9bf3de0ea5cbd26… Patch: https://github.com/kamailio/kamailio/commit/af9f95da42bd07ea9bf3de0ea5cbd26…

1 0

git:master:9e001534: avpops: convert to memory error logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 9e001534589a3428cd5f8908e84fe327ffc20fb6 URL: https://github.com/kamailio/kamailio/commit/9e001534589a3428cd5f8908e84fe32… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T11:17:22Z avpops: convert to memory error logging helper --- Modified: src/modules/avpops/avpops.c Modified: src/modules/avpops/avpops_db.c Modified: src/modules/avpops/avpops_parse.c --- Diff: https://github.com/kamailio/kamailio/commit/9e001534589a3428cd5f8908e84fe32… Patch: https://github.com/kamailio/kamailio/commit/9e001534589a3428cd5f8908e84fe32…

1 0

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

22 Mar '23

Is it intended to jump to `error` instead of `parse_error` now? @pantelisk98 @henningw -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981ef0ce4318/105530322(a)github.com>

2 1

git:master:d45eb770: auth_xkeys: convert to memory logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: d45eb770b0a8e17533f12e16dfc1d23dc5e7d951 URL: https://github.com/kamailio/kamailio/commit/d45eb770b0a8e17533f12e16dfc1d23… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T10:14:39Z auth_xkeys: convert to memory logging helper --- Modified: src/modules/auth_xkeys/auth_xkeys.c --- Diff: https://github.com/kamailio/kamailio/commit/d45eb770b0a8e17533f12e16dfc1d23… Patch: https://github.com/kamailio/kamailio/commit/d45eb770b0a8e17533f12e16dfc1d23… --- diff --git a/src/modules/auth_xkeys/auth_xkeys.c b/src/modules/auth_xkeys/auth_xkeys.c index 6963d4e3132..3f02f0d9bce 100644 --- a/src/modules/auth_xkeys/auth_xkeys.c +++ b/src/modules/auth_xkeys/auth_xkeys.c @@ -61,7 +61,7 @@ int auth_xkeys_list_init(void) return 0; _auth_xkeys_list = shm_malloc(sizeof(auth_xkey_t*)); if(_auth_xkeys_list==NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(_auth_xkeys_list, 0, sizeof(auth_xkey_t*)); @@ -88,7 +88,7 @@ int authx_xkey_insert(auth_xkey_t *nkey) + nkey->kvalue.len + 3; ukey = (auth_xkey_t*)shm_malloc(ksize); if(ukey==NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(ukey, 0, ksize); @@ -269,7 +269,7 @@ int auth_xkeys_add(sip_msg_t* msg, str *hdr, str *key, } p = (char*)pkg_malloc(xdata.len+1); if(p==NULL) { - LM_ERR("no more pkg memory\n"); + PKG_MEM_ERROR; return -2; } memcpy(p, xdata.s, xdata.len);

1 0

git:master:fcf733ce: db_flatstore: convert to memory logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: fcf733ce205221a40f68414662f841b918dea48f URL: https://github.com/kamailio/kamailio/commit/fcf733ce205221a40f68414662f841b… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T10:19:30Z db_flatstore: convert to memory logging helper --- Modified: src/modules/db_flatstore/db_flatstore.c Modified: src/modules/db_flatstore/flat_cmd.c Modified: src/modules/db_flatstore/flat_con.c Modified: src/modules/db_flatstore/km_flat_con.c Modified: src/modules/db_flatstore/km_flat_id.c Modified: src/modules/db_flatstore/km_flatstore.c Modified: src/modules/db_flatstore/km_flatstore_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fcf733ce205221a40f68414662f841b… Patch: https://github.com/kamailio/kamailio/commit/fcf733ce205221a40f68414662f841b…

1 0

git:master:0702a7e0: app_sqlang: convert to memory logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 0702a7e0d9df2867cbc86188c06d95363d484d5a URL: https://github.com/kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d953… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T09:55:14Z app_sqlang: convert to memory logging helper --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d953… Patch: https://github.com/kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d953… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index a1d195bace2..fd2a81f759b 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -362,7 +362,7 @@ static SQInteger sqlang_sr_modf (HSQUIRRELVM J) if(sqlangv[i]!=NULL) { argv[i] = (char*)pkg_malloc(strlen(sqlangv[i])+1); if(argv[i]==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; goto error; } strcpy(argv[i], sqlangv[i]); @@ -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) { - LM_ERR("failed to allocated reload version\n"); + SHM_MEM_ERROR; return -1; } *_sr_sqlang_reload_version = 0; @@ -1085,7 +1085,7 @@ SQInteger sqlang_open_KSR(HSQUIRRELVM J) _sr_J_KSRMethods = malloc(SR_SQLANG_KSR_METHODS_SIZE * sizeof(SQRegFunction)); if(_sr_J_KSRMethods==NULL) { - LM_ERR("no more pkg memory\n"); + SYS_MEM_ERROR ; return 0; } memset(_sr_J_KSRMethods, 0, SR_SQLANG_KSR_METHODS_SIZE * sizeof(SQRegFunction));

1 0

git:master:01e82b38: auth_db: fix goto for memory allocation error, convert to memory logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 01e82b38c41d344c1e94b2e0f574981ef0ce4318 URL: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T10:07:02Z auth_db: fix goto for memory allocation error, convert to memory logging helper --- Modified: src/modules/auth_db/auth_db_mod.c Modified: src/modules/auth_db/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… Patch: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… --- diff --git a/src/modules/auth_db/auth_db_mod.c b/src/modules/auth_db/auth_db_mod.c index ce8baae8381..5d54bdf4bd4 100644 --- a/src/modules/auth_db/auth_db_mod.c +++ b/src/modules/auth_db/auth_db_mod.c @@ -359,7 +359,7 @@ int parse_aaa_pvs(char *definition, pv_elem_t **pv_def, int *cnt) while ( (end=strchr(p,';'))!=0 || (end=p+strlen(p))!=p ) { /* new pv_elem_t */ if ( (pve=(pv_elem_t*)pkg_malloc(sizeof(pv_elem_t)))==0 ) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; goto error; } memset( pve, 0, sizeof(pv_elem_t)); @@ -394,8 +394,8 @@ int parse_aaa_pvs(char *definition, pv_elem_t **pv_def, int *cnt) /* create an avp definition for the spec parser */ pv.s = (char*)pkg_malloc(pve->text.len + 7); if (pv.s == NULL) { - LM_ERR("no more pkg mem\n"); - goto parse_error; + PKG_MEM_ERROR; + goto error; } pv.len = snprintf(pv.s, pve->text.len + 7, "$avp(%.*s)", pve->text.len, pve->text.s); diff --git a/src/modules/auth_db/authorize.c b/src/modules/auth_db/authorize.c index 4f8d9674549..dfaf8f92bbf 100644 --- a/src/modules/auth_db/authorize.c +++ b/src/modules/auth_db/authorize.c @@ -59,7 +59,7 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table, int fl } col = pkg_malloc(sizeof(*col) * (nc+1)); if (col == NULL) { - LM_ERR("no more pkg memory\n"); + PKG_MEM_ERROR; return -1; } @@ -140,7 +140,7 @@ static inline int get_ha1(struct username* _username, str* _domain, col = pkg_malloc(sizeof(*col) * (credentials_n + 1)); if (col == NULL) { - LM_ERR("no more pkg memory\n"); + PKG_MEM_ERROR; return -1; }

1 0

git:master:66e9b02f: app_lua_sr: convert to memory logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 66e9b02f7fc99084341d6519ac94cd580b334ac7 URL: https://github.com/kamailio/kamailio/commit/66e9b02f7fc99084341d6519ac94cd5… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T09:52:17Z app_lua_sr: convert to memory logging helper --- Modified: src/modules/app_lua_sr/app_lua_sr_api.c --- Diff: https://github.com/kamailio/kamailio/commit/66e9b02f7fc99084341d6519ac94cd5… Patch: https://github.com/kamailio/kamailio/commit/66e9b02f7fc99084341d6519ac94cd5… --- diff --git a/src/modules/app_lua_sr/app_lua_sr_api.c b/src/modules/app_lua_sr/app_lua_sr_api.c index dc1e14f17fc..7e9fc023656 100644 --- a/src/modules/app_lua_sr/app_lua_sr_api.c +++ b/src/modules/app_lua_sr/app_lua_sr_api.c @@ -276,7 +276,7 @@ static int lua_sr_modf (lua_State *L) argv[i] = (char*)pkg_malloc(strlen(luav[i])+1); if(argv[i]==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; goto error; } strcpy(argv[i], luav[i]);

1 0

git:master:8bf54822: app_jsdt: fix log message for system memory allocation
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 8bf54822b9f610eceae1b5c6006ab6cc5ed96d00 URL: https://github.com/kamailio/kamailio/commit/8bf54822b9f610eceae1b5c6006ab6c… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T09:49:48Z app_jsdt: fix log message for system memory allocation --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/8bf54822b9f610eceae1b5c6006ab6c… Patch: https://github.com/kamailio/kamailio/commit/8bf54822b9f610eceae1b5c6006ab6c… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 5df1b2db716..548b27690fb 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -868,7 +868,7 @@ duk_ret_t dukopen_KSR(duk_context *J) _sr_J_KSRMethods = malloc(SR_JSDT_KSR_METHODS_SIZE * sizeof(duk_function_list_entry)); if(_sr_J_KSRMethods==NULL) { - LM_ERR("no more pkg memory\n"); + SYS_MEM_ERROR; return 0; } memset(_sr_J_KSRMethods, 0, SR_JSDT_KSR_METHODS_SIZE * sizeof(duk_function_list_entry));

1 0

git:master:eef779ca: app_java: add missing free in error case
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: eef779ca7b5b203d216f76fbec56025d595f6e6d URL: https://github.com/kamailio/kamailio/commit/eef779ca7b5b203d216f76fbec56025… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T09:48:05Z app_java: add missing free in error case --- Modified: src/modules/app_java/java_native_methods.c --- Diff: https://github.com/kamailio/kamailio/commit/eef779ca7b5b203d216f76fbec56025… Patch: https://github.com/kamailio/kamailio/commit/eef779ca7b5b203d216f76fbec56025… --- diff --git a/src/modules/app_java/java_native_methods.c b/src/modules/app_java/java_native_methods.c index bb2ebe6be70..a73fdc313de 100644 --- a/src/modules/app_java/java_native_methods.c +++ b/src/modules/app_java/java_native_methods.c @@ -1002,6 +1002,7 @@ JNIEXPORT jint JNICALL Java_org_siprouter_CoreMethods_force_1send_1socket( si = (struct socket_id *)pkg_malloc(sizeof(struct socket_id)); if(!si) { PKG_MEM_ERROR; + pkg_free(nl); return -1; }

1 0

[kamailio/kamailio] With TOPOH module enabled, transferred call hangup from callee side does not hang up the call (Issue #3398)
by akabihno 21 Mar '23

21 Mar '23

### Description We have faced an issue which appears when TOPOH module is enabled, call is made from WebRTC client, then transferred by callee. #### Scenario WebRTC client behind load balancer makes call to softphone, call from softphone is transferred to external number using Asterisk. #### Expected result When call is hanged up on external number side, call should be hanged up on WebRTC client side. #### Actual result When call is hanged up on external number side, call is not hanged up on WebRTC client side. ### Troubleshooting #### Legend 10.5.0.145 - load balancer 10.128.150.67 - WebRTC client 10.181.0.1 - kamailio 10.5.2.192 - asterisk #### Log Messages On transfer: https://pastebin.com/H3FQ4Kpj On hangup from external number side: https://pastebin.com/wgfRzGbd On hangup from WebRTC client side: https://pastebin.com/sE0yhBae #### SIP Traffic Faulty case with TOPOH module enabled: [topoh_on.csv](https://github.com/kamailio/kamailio/files/11028205/topoh_on.… Normal behavior with TOPOH module disabled: [topoh_off.csv](https://github.com/kamailio/kamailio/files/11028206/topoh_of… #### Config files kamailio.cfg: [kamailio.txt](https://github.com/kamailio/kamailio/files/11028283/kamailio.… kamailio-local.cfg enabled toggles: #!define WITH_MYSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_DISPATCHER #!define WITH_HOMER #!define WITH_PSTN #!define WITH_TOPOH #!define WITH_CUSTOM_HEADERS #!define WITH_PROM #!define WITH_DMQ #!define WITH_NAT #!define WITH_XXXX_HEADERS #!define WITH_TLS #!define WITH_WEBSOCKET #!define WITH_VOIP_AUTH #!define WITH_ADVERTISE #!define WITH_JSONRPC #!define WITH_TCP #!define WITH_DIALOG #!define WITH_DIFF_PROVIDER_SRC_IP #!define WITH_UAC #!define WITH_DEV ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (x86_64/linux) 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, 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: unknown compiled on 09:11:15 Nov 15 2022 with gcc 9.3.0 ``` * **Operating System**: ``` dockerized kamailio running on Ubuntu 16.04.3 LTS Docker version 18.03.1-ce, build 9ee9f40 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3398 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3398(a)github.com>

2 2

[kamailio/kamailio] Missing from: tag creates ERROR: log (Issue #3399)
by CarlWickbom 21 Mar '23

21 Mar '23

Hi Kamailio, We have noticed that a request not belonging to a dialog (e.g. a SIP MESSAGE) missing the tag= parameter in the from: header will trigger an ERROR: message like. ```` Mar 21 14:40:23 ip-10-85-164-143 /usr/sbin/kamailio[172]: ERROR: dialog [dlg_handlers.c:726]: pre_match_parse(): failed to get From header ```` ```` Mar 21 14:42:31 ip-10-85-165-13 /usr/sbin/kamailio[183]: ERROR: tmx [tmx_pretran.c:227]: tmx_check_pretran(): failed to get From header ```` According to our interpretation of 3261 section 12.1.1 ```` "A UAS MUST be prepared to receive a request without a tag in the From field, in which case the tag is considered to have a value of null." ```` this should not be the case. Also the BNF states no from: tag: is mandatory ``` From = ( "From" / "f" ) HCOLON from-spec from-spec = ( name-addr / addr-spec ) *( SEMI from-param ) from-param = tag-param / generic-param tag-param = "tag" EQUAL token ``` We believe this to be implemented in at least two places where one example is in the `dlg_handler` where `pre_match_parse` check ``` if (parse_from_header(req) < 0 || get_from(req)->tag_value.len == 0) { LM_ERR("failed to get From header\n"); return -1; } ``` As our interpretation of the standard is that the from: tag is not mandatory, hence we can't require our customer to change their behaviour, we consider this as a bug. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3399 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3399(a)github.com>

2 3

git:master:b9d397c8: async: convert to memory error logging helper
by Henning Westerholt 21 Mar '23

21 Mar '23

Module: kamailio Branch: master Commit: b9d397c84cb3e0911e9823386b6eb4944b02c9ed URL: https://github.com/kamailio/kamailio/commit/b9d397c84cb3e0911e9823386b6eb49… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-21T16:22:24Z async: convert to memory error logging helper --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/b9d397c84cb3e0911e9823386b6eb49… Patch: https://github.com/kamailio/kamailio/commit/b9d397c84cb3e0911e9823386b6eb49… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 3b18eda9570..3075bf61d00 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -289,7 +289,7 @@ static int fixup_async_sleep(void **param, int param_no) return 0; ap = (async_param_t *)pkg_malloc(sizeof(async_param_t)); if(ap == NULL) { - LM_ERR("no more pkg memory available\n"); + PKG_MEM_ERROR; return -1; } memset(ap, 0, sizeof(async_param_t)); diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index d6dd41d3f17..c19f05bbe67 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -109,7 +109,7 @@ int async_init_timer_list(void) _async_list_head = (struct async_list_head *)shm_malloc( sizeof(struct async_list_head)); if(_async_list_head == NULL) { - LM_ERR("no more shm\n"); + SHM_MEM_ERROR; return -1; } memset(_async_list_head, 0, sizeof(struct async_list_head)); @@ -135,7 +135,7 @@ int async_init_ms_timer_list(void) _async_ms_list = (struct async_ms_list *)shm_malloc( sizeof(struct async_ms_list)); if(_async_ms_list == NULL) { - LM_ERR("no more shm\n"); + SHM_MEM_ERROR; return -1; } memset(_async_ms_list, 0, sizeof(struct async_ms_list)); @@ -247,7 +247,7 @@ int async_sleep(sip_msg_t *msg, int seconds, cfg_action_t *act, str *cbname) slot = ticks % ASYNC_RING_SIZE; ai = (async_item_t *)shm_malloc(sizeof(async_item_t)); if(ai == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(ai, 0, sizeof(async_item_t)); @@ -454,7 +454,7 @@ int async_ms_sleep(sip_msg_t *msg, int milliseconds, cfg_action_t *act, str *cbn at = (async_task_t *)shm_malloc(dsize); if(at == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(at, 0, dsize); @@ -517,7 +517,7 @@ int async_send_task(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname) dsize = sizeof(async_task_t) + sizeof(async_task_param_t); at = (async_task_t *)shm_malloc(dsize); if(at == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(at, 0, dsize); @@ -614,7 +614,7 @@ int async_send_data(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, dsize = sizeof(async_task_t) + sizeof(async_data_param_t) + sdata->len + 1; at = (async_task_t *)shm_malloc(dsize); if(at == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(at, 0, dsize);

1 0

git:master:9cc9a177: p_usrloc: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture
by Victor Seva 20 Mar '23

20 Mar '23

Module: kamailio Branch: master Commit: 9cc9a177daf6d5ce11fbdef714bd576716dc5a2f URL: https://github.com/kamailio/kamailio/commit/9cc9a177daf6d5ce11fbdef714bd576… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-20T16:56:03+01:00 p_usrloc: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture --- Modified: src/modules/p_usrloc/ul_check.c --- Diff: https://github.com/kamailio/kamailio/commit/9cc9a177daf6d5ce11fbdef714bd576… Patch: https://github.com/kamailio/kamailio/commit/9cc9a177daf6d5ce11fbdef714bd576… --- diff --git a/src/modules/p_usrloc/ul_check.c b/src/modules/p_usrloc/ul_check.c index dfc062f266..0ed32dc99f 100644 --- a/src/modules/p_usrloc/ul_check.c +++ b/src/modules/p_usrloc/ul_check.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <stdint.h> #include "../../core/mem/shm_mem.h" @@ -136,7 +137,7 @@ int must_retry(time_t *timer, time_t interval){ if(!timer){ return -1; } - LM_DBG("must_retry: time is at %llu, retry at %llu.\n", (uint64_t)time(NULL), + LM_DBG("must_retry: time is at %" PRIu64 ", retry at %" PRIu64 ".\n", (uint64_t)time(NULL), (uint64_t)(*timer)); if(*timer <= time(NULL)){ *timer = time(NULL) + interval;

1 0

git:master:1b3224c5: rtpengine: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture
by Victor Seva 20 Mar '23

20 Mar '23

Module: kamailio Branch: master Commit: 1b3224c514105d69c3099c11edc5ef20ca02c567 URL: https://github.com/kamailio/kamailio/commit/1b3224c514105d69c3099c11edc5ef2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-20T16:53:15+01:00 rtpengine: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/1b3224c514105d69c3099c11edc5ef2… Patch: https://github.com/kamailio/kamailio/commit/1b3224c514105d69c3099c11edc5ef2… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 58c96efc0d..51bd9e380a 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> @@ -1337,7 +1338,7 @@ static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) _rtpe_list_version->vernum += 1; _rtpe_list_version->vertime = time(NULL); - LM_DBG("current rtpengines list version: %d (%llu)\n", + LM_DBG("current rtpengines list version: %d (%" PRIu64 ")\n", _rtpe_list_version->vernum, (uint64_t)_rtpe_list_version->vertime); rpc->rpl_printf(ctx, "Ok. Reload successful."); @@ -1857,7 +1858,7 @@ static int build_rtpp_socks(int lmode, int rtest) { if(_rtpe_list_vernum_local == _rtpe_list_version->vernum) { /* same version for the list of rtpengines */ - LM_DBG("same rtpengines list version: %d (%llu)\n", + LM_DBG("same rtpengines list version: %d (%" PRIu64 ")\n", _rtpe_list_version->vernum, (uint64_t)_rtpe_list_version->vertime); return 0;

1 0

git:master:452af935: modules: readme files regenerated - evapi ... [skip ci]
by Kamailio Dev 20 Mar '23

20 Mar '23

Module: kamailio Branch: master Commit: 452af935fbcc60572541941612091cbc0535a310 URL: https://github.com/kamailio/kamailio/commit/452af935fbcc60572541941612091cb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-03-20T16:31:24+01:00 modules: readme files regenerated - evapi ... [skip ci] --- Modified: src/modules/evapi/README Modified: src/modules/jsonrpcs/README Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/452af935fbcc60572541941612091cb… Patch: https://github.com/kamailio/kamailio/commit/452af935fbcc60572541941612091cb…

1 0

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

20 Mar '23

- URL: https://github.com/kamailio/kamailio/commit/926ba9473775878d8f38b175764a50d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 rtpengine: cast to uint64_t when using time_t value - URL: https://github.com/kamailio/kamailio/commit/e29ce594466385a7c35634fda4b4664… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 p_usrloc: cast to uint64_t when using time_t value - URL: https://github.com/kamailio/kamailio/commit/161ec6d14b702cb92406171152d127b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 jsonrpcs: protocol extended to allow storing response in a file - implemented for udp sockets - URL: https://github.com/kamailio/kamailio/commit/4fec664327410db4e5ff7036a459e99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 jsonrpcs: implemented result storing for rpc over fifo - URL: https://github.com/kamailio/kamailio/commit/1b5caab3479bb32c2986906e6e07ea9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 kamctl: option to set store path for rpc commands - URL: https://github.com/kamailio/kamailio/commit/e27823f746eb8fca834474945e45bfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 pipelimit: added rpc command pl.rm_pipe - URL: https://github.com/kamailio/kamailio/commit/6c0b62c464bcbc67e485c1e2193b7a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 pipelimit: docs for rpc command pl.rm_pipe - URL: https://github.com/kamailio/kamailio/commit/e0713531bf6ea2aa9b249503dc346ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 pipelimit: new rpc command pl.reset_pipe - reset associated values - URL: https://github.com/kamailio/kamailio/commit/569db2eeaef17f3034f692e808f3401… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 pipelimit: docs for rpc command pl.reset_pipe - URL: https://github.com/kamailio/kamailio/commit/4c998de5f54ee941f7516e589e29405… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: wait when idle made a modparam - URL: https://github.com/kamailio/kamailio/commit/3b99e09dc10ff38024b2821b26f2efe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: docs for wait_idle modparam - URL: https://github.com/kamailio/kamailio/commit/3bff060dcb74a081782abdbdade830b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: use internal workers to handle client messages - URL: https://github.com/kamailio/kamailio/commit/b34e24770a6435577097b173cafab30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 jsonrpcs: initial support for tcp transport - one rpc command per connection, which is closed after the response is sent - URL: https://github.com/kamailio/kamailio/commit/1400e8cb6aebdd93a5b0c6979a444a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 jsonrpcs: more debug messages when handling tcp commands - URL: https://github.com/kamailio/kamailio/commit/7000f437ac8f3fb40c7a55c8c7a3c2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 jsonrpcs: docs for tcp_socket parameter - URL: https://github.com/kamailio/kamailio/commit/58bd64200e4d2f237f192acf6f88074… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: support for adaptive wait on idle to spare cpu when not busy - URL: https://github.com/kamailio/kamailio/commit/6e4ba9bd7421bf483cdbc7e5484f21d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: wait increase limit made modparam - URL: https://github.com/kamailio/kamailio/commit/b044c33c72318c12de78c0d8b7f8ac5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: docs for wait_increase parameter - URL: https://github.com/kamailio/kamailio/commit/1dc0eac9a3a3abd6e128aa5f1d17d5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: if workers is 0, execute callback by evapi receiver - URL: https://github.com/kamailio/kamailio/commit/d4be0b2ec72159c5769fc6d7d0cee57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: docs - updates to workers parameter - URL: https://github.com/kamailio/kamailio/commit/ab1831efc20816e18a89e6322d16c8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 core: skip warning for atomic ops with locking for some dev os-es - do not print the compile warning for non-native memory barier/atomic ops on some devel platforms, for now macos with apple silicon cpu

1 0

git:master:135f7b5e: modules: readme files regenerated - ims_registrar_pcscf ... [skip ci]
by Kamailio Dev 20 Mar '23

20 Mar '23

Module: kamailio Branch: master Commit: 135f7b5e2114617b0bc408175ec146d248d01d3a URL: https://github.com/kamailio/kamailio/commit/135f7b5e2114617b0bc408175ec146d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-03-20T11:01:25+01:00 modules: readme files regenerated - ims_registrar_pcscf ... [skip ci] --- Modified: src/modules/ims_registrar_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/135f7b5e2114617b0bc408175ec146d… Patch: https://github.com/kamailio/kamailio/commit/135f7b5e2114617b0bc408175ec146d… --- diff --git a/src/modules/ims_registrar_pcscf/README b/src/modules/ims_registrar_pcscf/README index 3bfb0e6003..02327a005c 100644 --- a/src/modules/ims_registrar_pcscf/README +++ b/src/modules/ims_registrar_pcscf/README @@ -312,6 +312,33 @@ pcscf_save("location"); * domain - Logical domain within the registrar. If a database is used then this must be name of the table which stores the contacts. + The return code may have the following values: + * ( 1) OK + * (-1) Parsing of contact data failed + * (-2) Deregistration in progress + + For db_mode = DB_ONLY (3) setting for ims_usrloc_pcscf module modparam + following logic is implemented: + * To avoid race time conditions between a REREGISTER and the expiry + handler state machine in the scscf an approach is chosen to refuse + a REREGISTER in time window of 20 seconds after pcontact expiry on + the pcscf (thus allowing expiry handling to finish). REREGISTER is + refused in this scenario with return code -2. + * In case a REREGISTER arrives at pcscf and the respective pcontact + is expired longer than time window of 20 seconds registration also + is refused with return code -2 and additionaly PUBLISH is sent to + scscf with expiry = 0. + * The rc -2 shall be handled in register.cfg script as follows: + pcscf_save_pending("location"); + switch ($retcode) { + case -1: + ....... + case -2: + send_reply("500", "Deregister in progress - Please try again"); + exit; + break; + } + 4.3. pcscf_follows_service_routes(domain) Returns true, if the request is following the "learned" service-routes

1 0

git:master:38d72c3f: ims_registrar_pcscf: changes for ul db_mode DB_ONLY
by Henning Westerholt 20 Mar '23

20 Mar '23

Module: kamailio Branch: master Commit: 38d72c3f8248b32b3ba0ff24abd1f2f7407f9d8f URL: https://github.com/kamailio/kamailio/commit/38d72c3f8248b32b3ba0ff24abd1f2f… Author: Annemarie Mandl <mandl(a)rpmbld.novalocal> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-20T10:57:21+01:00 ims_registrar_pcscf: changes for ul db_mode DB_ONLY Enable registration of pcscf contact callback during download from db location table and inserting pcontact (normally this callback is registered during handling of REGISTER). Refuse REGISTER when pcontact is expired since [0 to 20] seconds. Within this time window a NOTIFY is expected from scscf and in order to avoid race time conditions between scscf and pcscf REGISTER will be refused. Refuse REGISTER when pcontact is expired longer than 20 seconds - send PUBLISH (contact expired) to scscf to trigger NOTIFY. In both REGISTER refused scenarios routing script should reply 500 - Deregistration in progress. undo changes in ul_callback.c & ul_callback.h corrections after comments from Henning --- Modified: src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c Modified: src/modules/ims_registrar_pcscf/notify.c Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/38d72c3f8248b32b3ba0ff24abd1f2f… Patch: https://github.com/kamailio/kamailio/commit/38d72c3f8248b32b3ba0ff24abd1f2f…

1 0

[kamailio/kamailio] ims_registrar_pcscf: changes for ul db_mode DB_ONLY (PR #3317)
by petermarianF 20 Mar '23

20 Mar '23

Enable registration of pcscf contact callback during download from db location table and inserting pcontact (normally this callback is registered during handling of REGISTER). Refuse REGISTER when pcontact is expired since [0 to 20] seconds. Within this time window a NOTIFY is expected from scscf and in order to avoid race time conditions between scscf and pcscf REGISTER will be refused. Refuse REGISTER when pcontact is expired longer than 20 seconds - send PUBLISH (contact expired) to scscf to trigger NOTIFY. In both REGISTER refused scenarios routing script should reply 500 - Deregister in progress.   #### 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 case a pcontact found in location db has to be inserted into pcscf cache depending on contact state also callbacks have to be registered for this pcontact. Registering of callback_pcscf_contact_cb is enabled in this module. Handling of contact expiry is usually triggered in the scscf (mem_timer_udomain which runs every 10 secs). Sending of NOTIFY to pcscf may take up to 20 seconds from start of expiry due to timing conditions. To avoid race time conditions between a REREGISTER and the expiry handler state machine in the scscf an approach is chosen to refuse a REREGISTER in time window of 20 seconds after pcontact expiry on the pcscf (thus allowing expiry handling to finish). REREGISTER is refused in this scenario with new return_code -2. In case a REREGISTER arrives at pcscf and the respective pcontact is expired longer than time window of 20 seconds registration also is refused with rc -2 and additionaly PUBLISH is sent to scscf with expiry = 0. The rc -2 shall be handled in register.cfg script as follows: pcscf_save_pending("location"); switch ($retcode) { case -1: # Missing/wrong Information in REGISTER. send_reply("400", "Information wrong - See log."); exit; break; case -2: # De-Register in Progress, or PUBLISH ongoing due to registration expiry, # or new REGISTER blocked because registration just expired (up to 20sec). append_to_reply("Retry-After: 30\r\n"); send_reply("500", "Deregister in progress - Please try again"); exit; break; } You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3317 -- Commit Summary -- * ims_registrar_pcscf: changes for ul db_mode DB_ONLY -- File Changes -- M src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c (21) M src/modules/ims_registrar_pcscf/notify.c (4) M src/modules/ims_registrar_pcscf/save.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3317.patch https://github.com/kamailio/kamailio/pull/3317.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3317 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3317(a)github.com>

2 11

Dialog-Module and CSeq tracking
by Carsten Bock 17 Mar '23

17 Mar '23

Hi, Quick question: Looking at the Dialog module and CSeq tracking functionality, I've noticed the following: - on the one hand, we are storing the current CSeq for each direction in the Dialog structure - on the other hand, we are storing a "Delta" of the received vs. updated CSeq as a Dialog Variable Does replacing the Delta with the CSeq already stored with the Dialog structure make sense? I am asking because of my latest changes, where there may be more sources for an updated CSeq (e.g., when sending a Request from script within the Dialog) and more use cases for an updated CSeq (Up and Downstream). I've updated the dialog module for my use already accordingly https://github.com/kamailio/kamailio/compare/master...carstenbock/dialog_cs… I wanted to hear other opinions and possible pitfalls as well... Thanks, Carsten -- Carsten Bock I CTO & Founder ng-voice GmbH Trostbrücke 1 I 20457 Hamburg I Germany T +49 179 2021244 I www.ng-voice.com Registry Office at Local Court Hamburg, HRB 120189 Managing Directors: Dr. David Bachmann, Carsten Bock

3 3

git:master:e8520177: auth_identity: add missing error handling for allocation errors, convert to memory log macros
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: e8520177f6fd70676251cfd2307c0ab40701a701 URL: https://github.com/kamailio/kamailio/commit/e8520177f6fd70676251cfd2307c0ab… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T21:14:20Z auth_identity: add missing error handling for allocation errors, convert to memory log macros --- Modified: src/modules/auth_identity/auth_dynstr.c Modified: src/modules/auth_identity/auth_hdrs.c Modified: src/modules/auth_identity/auth_http.c Modified: src/modules/auth_identity/auth_identity.c Modified: src/modules/auth_identity/auth_tables.c --- Diff: https://github.com/kamailio/kamailio/commit/e8520177f6fd70676251cfd2307c0ab… Patch: https://github.com/kamailio/kamailio/commit/e8520177f6fd70676251cfd2307c0ab…

1 0

git:master:7e617ab8: dmq: add missing memory allocation checks, convert to memory log macros
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 7e617ab89f5275f1b269382ae2c1fee508854cf1 URL: https://github.com/kamailio/kamailio/commit/7e617ab89f5275f1b269382ae2c1fee… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T21:10:04Z dmq: add missing memory allocation checks, convert to memory log macros --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/message.c Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/peer.c Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/7e617ab89f5275f1b269382ae2c1fee… Patch: https://github.com/kamailio/kamailio/commit/7e617ab89f5275f1b269382ae2c1fee…

1 0

git:master:aa4d015a: dispatcher: small formatting adaption related to 6aee3bd7c
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: aa4d015a58bb24ba5bda6e6133b0e9f314e2318e URL: https://github.com/kamailio/kamailio/commit/aa4d015a58bb24ba5bda6e6133b0e9f… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T17:20:14Z dispatcher: small formatting adaption related to 6aee3bd7c --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/aa4d015a58bb24ba5bda6e6133b0e9f… Patch: https://github.com/kamailio/kamailio/commit/aa4d015a58bb24ba5bda6e6133b0e9f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 50ad98dc0f..d79fb7a6d3 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -4039,8 +4039,7 @@ ds_set_t *ds_avl_insert(ds_set_t **root, int id, int *setn) } if(!node) { node = shm_malloc(sizeof(ds_set_t)); - if(!(node)) - { + if(!(node)) { SHM_MEM_ERROR; return NULL; } diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8ccc86fedc..5cb3d7aba2 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -360,15 +360,13 @@ static int mod_init(void) /* Initialize the counter */ ds_ping_reply_codes = (int **)shm_malloc(sizeof(unsigned int *)); - if(!(ds_ping_reply_codes)) - { + if(!(ds_ping_reply_codes)) { SHM_MEM_ERROR; return -1; } *ds_ping_reply_codes = 0; ds_ping_reply_codes_cnt = (int *)shm_malloc(sizeof(int)); - if(!(ds_ping_reply_codes_cnt)) - { + if(!(ds_ping_reply_codes_cnt)) { shm_free(ds_ping_reply_codes); SHM_MEM_ERROR; return -1;

1 0

git:master:6aee3bd7: dispatcher: add missing memory allocation checks, convert to memory log macros
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 6aee3bd7c86a1874cc140a7874b740981f14f5f5 URL: https://github.com/kamailio/kamailio/commit/6aee3bd7c86a1874cc140a7874b7409… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T17:17:28Z dispatcher: add missing memory allocation checks, convert to memory log macros --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/ds_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/6aee3bd7c86a1874cc140a7874b7409… Patch: https://github.com/kamailio/kamailio/commit/6aee3bd7c86a1874cc140a7874b7409…

1 0

Re: [kamailio/kamailio] nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c (6e03201)
by Victor Seva 14 Mar '23

14 Mar '23

@rfuchs Thanks! Pushed the PRIu64 macro versions -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/6e032019d992625abc2a3739423df9ea1c964356/104410654(a)github.com>

1 0

git:master:ef0427ea: nat_traversal:
by Victor Seva 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: ef0427ead03bfb738b6214b91c1763913e70a52d URL: https://github.com/kamailio/kamailio/commit/ef0427ead03bfb738b6214b91c17639… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T17:08:46+01:00 nat_traversal: --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/ef0427ead03bfb738b6214b91c17639… Patch: https://github.com/kamailio/kamailio/commit/ef0427ead03bfb738b6214b91c17639… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d21a8b7e01..28456c77d4 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -43,6 +43,7 @@ #include <ctype.h> #include <errno.h> #include <time.h> +#include <inttypes.h> #include <sys/types.h> #include <arpa/inet.h> @@ -923,7 +924,7 @@ static time_t get_register_expire( } } - LM_DBG("maximum expire for all contacts: %lu\n", (uint64_t)expire); + LM_DBG("maximum expire for all contacts: %" PRIu64 "\n", (uint64_t)expire); return (expire ? expire + now : 0); }

1 0

git:master:88412576: core: use PRIu64 macro to find out what format is needed for uint64_t
by Victor Seva 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 8841257671b6c5f3c4cfee3f1b7bb46d54faaf65 URL: https://github.com/kamailio/kamailio/commit/8841257671b6c5f3c4cfee3f1b7bb46… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T17:03:45+01:00 core: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture --- Modified: src/core/utils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/8841257671b6c5f3c4cfee3f1b7bb46… Patch: https://github.com/kamailio/kamailio/commit/8841257671b6c5f3c4cfee3f1b7bb46… --- diff --git a/src/core/utils/tmrec.c b/src/core/utils/tmrec.c index 205866163f..14e9243914 100644 --- a/src/core/utils/tmrec.c +++ b/src/core/utils/tmrec.c @@ -32,6 +32,7 @@ #include <string.h> #include <time.h> #include <stdint.h> +#include <inttypes.h> #include "../../core/mem/mem.h" #include "tmrec.h" @@ -272,7 +273,7 @@ int ac_print(ac_tm_t *_atp) return -1; } - printf("\nSys time: %lu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, + printf("\nSys time: %" PRIu64 "\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year+1900, _atp->t.tm_mon+1, _atp->t.tm_mday); @@ -512,15 +513,15 @@ int tr_print(tmrec_t *_trp) return -1; } printf("Recurrence definition\n-- start time ---\n"); - printf("Sys time: %lu\n", (uint64_t)_trp->dtstart); + printf("Sys time: %" PRIu64 "\n", (uint64_t)_trp->dtstart); printf("Time: %02d:%02d:%02d\n", _trp->ts.tm_hour, _trp->ts.tm_min, _trp->ts.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_trp->ts.tm_wday], _trp->ts.tm_year+1900, _trp->ts.tm_mon+1, _trp->ts.tm_mday); printf("---\n"); - printf("End time: %lu\n", (uint64_t)_trp->dtend); - printf("Duration: %lu\n", (uint64_t)_trp->duration); - printf("Until: %lu\n", (uint64_t)_trp->until); + printf("End time: %" PRIu64 "\n", (uint64_t)_trp->dtend); + printf("Duration: %" PRIu64 "\n", (uint64_t)_trp->duration); + printf("Until: %" PRIu64 "\n", (uint64_t)_trp->until); printf("Freq: %d\n", (int)_trp->freq); printf("Interval: %d\n", (int)_trp->interval); if(_trp->byday)

1 0

Re: [kamailio/kamailio] nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c (6e03201)
by Richard Fuchs 14 Mar '23

14 Mar '23

Eh, these are arch dependent. "long int" on 32-bit platforms is only 32 bits. Either use %llu and cast to "long long" or use the PRIu64 macro. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/6e032019d992625abc2a3739423df9ea1c964356/104404760(a)github.com>

1 0

[kamailio/kamailio] Statistic counters for LCR module (Issue #3372)
by Alessio Garzi 14 Mar '23

14 Mar '23

### Description I am in need to get some statistic counters related to each lcr gw currently loaded in Kamailio. Kamailio already provides the counters I need inside the KEX module with the following command: ``` kamcmd> stats.get_statistics core: core:bad_URIs_rcvd = 69 core:bad_msg_hdr = 2 core:drop_replies = 0 core:drop_requests = 8499 core:err_replies = 0 core:err_requests = 0 core:fwd_replies = 4 core:fwd_requests = 65 core:rcv_replies = 502088 ... ``` Here kamailio doing exactly what i want, it's exposing the counter data via xmlrpc which is great for attaching an external tool to build statistics. Unfortunately Kamailio KEX module is counting every single request/reply hitting the proxy server, the idea is to have the above stats related to the gateways currently loaded by the lcr module. In this way, for example I can tell how many request/replies I got from gw id X or gw id Y and produce gw based stats. Unfortunately the KEX module has no "concept" of "GW" and "LCR", so the idea is to implement the same counting logic inside LCR module. The counting should not be persistent (counters must go to zero every time kamailio restarts). When adding or deleting a new gateway, the counting in memory must reflect the status of the internal state or lcr gatewas, so, for example, after adding a new gateway and reloading lcr tables, the new counters must be immediately available through xmlrpc without a new kamailio restart. The same concept applies when the gateway is removed from the list. ### Expected behavior A possible implementation should give the user to query counters in a way similar to this: ``` # kamcmd lcr.stats { gw: { { gw_id: <id of lcr mysql table here> gw_name: <description of lcr mysql table here> requests: 0 requests_invite: 0 requests_cancel: 0 ... } { gw_id: <id of lcr mysql table here> gw_name: <description of lcr mysql table here> requests: 0 requests_invite: 0 requests_cancel: 0 ... } } } ``` Additionally, it would be helpful to set a gw id as argument in order to filter, for example: ``` # kamcmd lcr.stats 95 { gw: { { gw_id: 95 gw_name: <description of gw id 95> requests: 222 requests_invite: 1 requests_cancel: 1 requests_ack: 1 ... } } } ``` #### Actual observed behavior To my knowledge, nothing related to this issue has been implemented in Kamailio so far -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3372 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3372(a)github.com>

3 6

[kamailio/kamailio] lcr: add counters per gateway (PR #3391)
by Alessio Garzi 14 Mar '23

14 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 - [x] Related to issue #3372 #### Description Implementing the suggesting lcr counters per gateway You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3391 -- Commit Summary -- * lcr: add counters per gateway -- File Changes -- M src/modules/lcr/lcr_mod.c (306) M src/modules/lcr/lcr_mod.h (52) M src/modules/lcr/lcr_rpc.c (460) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3391.patch https://github.com/kamailio/kamailio/pull/3391.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3391 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3391(a)github.com>

3 10

git:master:6e032019: nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c
by Victor Seva 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 6e032019d992625abc2a3739423df9ea1c964356 URL: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T12:01:32+01:00 nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c > nat_traversal.c: In function 'get_register_expire': > ../../core/parser/../dprint.h:321:73: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 11 has type 'long unsigned int' [-Wformat=] > 321 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ > | ^~~~~~~~~~~~~~~~~~~~~~~~ --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… Patch: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d659aced45..d21a8b7e01 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -923,7 +923,7 @@ static time_t get_register_expire( } } - LM_DBG("maximum expire for all contacts: %llu\n", (uint64_t)expire); + LM_DBG("maximum expire for all contacts: %lu\n", (uint64_t)expire); return (expire ? expire + now : 0); }

1 0

git:master:ebfacdb7: core: tmrec fix build warning introduced at dd6339f817822cd0590aec2a9a467330bde499dd
by Victor Seva 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: ebfacdb7d7c3dfceb68e9550eec72b89d695fd4b URL: https://github.com/kamailio/kamailio/commit/ebfacdb7d7c3dfceb68e9550eec72b8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T12:07:27+01:00 core: tmrec fix build warning introduced at dd6339f817822cd0590aec2a9a467330bde499dd > core/utils/tmrec.c: In function 'ac_print': > core/utils/tmrec.c:275:32: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] > 275 | printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, > | ~~~^ ~~~~~~~~~~~~~~~~~~~~ > | | | > | long long unsigned int long unsigned int > | %lu --- Modified: src/core/utils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/ebfacdb7d7c3dfceb68e9550eec72b8… Patch: https://github.com/kamailio/kamailio/commit/ebfacdb7d7c3dfceb68e9550eec72b8… --- diff --git a/src/core/utils/tmrec.c b/src/core/utils/tmrec.c index adae68edbf..205866163f 100644 --- a/src/core/utils/tmrec.c +++ b/src/core/utils/tmrec.c @@ -272,7 +272,7 @@ int ac_print(ac_tm_t *_atp) return -1; } - printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, + printf("\nSys time: %lu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year+1900, _atp->t.tm_mon+1, _atp->t.tm_mday); @@ -512,15 +512,15 @@ int tr_print(tmrec_t *_trp) return -1; } printf("Recurrence definition\n-- start time ---\n"); - printf("Sys time: %llu\n", (uint64_t)_trp->dtstart); + printf("Sys time: %lu\n", (uint64_t)_trp->dtstart); printf("Time: %02d:%02d:%02d\n", _trp->ts.tm_hour, _trp->ts.tm_min, _trp->ts.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_trp->ts.tm_wday], _trp->ts.tm_year+1900, _trp->ts.tm_mon+1, _trp->ts.tm_mday); printf("---\n"); - printf("End time: %llu\n", (uint64_t)_trp->dtend); - printf("Duration: %llu\n", (uint64_t)_trp->duration); - printf("Until: %llu\n", (uint64_t)_trp->until); + printf("End time: %lu\n", (uint64_t)_trp->dtend); + printf("Duration: %lu\n", (uint64_t)_trp->duration); + printf("Until: %lu\n", (uint64_t)_trp->until); printf("Freq: %d\n", (int)_trp->freq); printf("Interval: %d\n", (int)_trp->interval); if(_trp->byday)

1 0

git:master:781ee072: lcr: fix building warnings initializating values
by Victor Seva 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 781ee072593f16a100ef00b5ef71fcfd6f8ded2b URL: https://github.com/kamailio/kamailio/commit/781ee072593f16a100ef00b5ef71fcf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T11:55:34+01:00 lcr: fix building warnings initializating values > https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… > [...] > lcr_mod.c:2630:9: warning: 'tmp_tag.len' may be used uninitialized [-Wmaybe-uninitialized] --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/781ee072593f16a100ef00b5ef71fcf… Patch: https://github.com/kamailio/kamailio/commit/781ee072593f16a100ef00b5ef71fcf… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index b668160cb33..80b62f5d4c7 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2526,10 +2526,21 @@ static int generate_uris(struct sip_msg *_m, char *r_uri, str *r_uri_user, { int_str gw_uri_val; struct usr_avp *gu_avp; - str scheme, prefix, hostname, port, params, transport, addr_str, tmp_tag; + str scheme = STR_NULL; + str prefix = STR_NULL; + str hostname = STR_NULL; + str port = STR_NULL; + str params = STR_NULL; + str transport = STR_NULL; + str addr_str = STR_NULL; + str tmp_tag = STR_NULL; char *at; - unsigned int strip; + unsigned int strip = 0; + if(!tag) { + LM_ERR("tag parameter is empty\n"); + return -1; + } gu_avp = search_first_avp(gw_uri_avp_type, gw_uri_avp, &gw_uri_val, 0); if(!gu_avp)

1 0

Re: [kamailio/kamailio] nat_traversal: cast to uint64_t when using time_t value (f301ca9)
by Victor Seva 14 Mar '23

14 Mar '23

From https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… ``` nat_traversal.c: In function 'get_register_expire': ../../core/parser/../dprint.h:321:73: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 11 has type 'long unsigned int' [-Wformat=] 321 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/parser/../dprint.h:345:25: note: in expansion of macro 'LOG_FX' 345 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:401:45: note: in expansion of macro 'LOG' 401 | # define DBG(fmt, args...) LOG(L_DBG, fmt , ## args) | ^~~ ../../core/parser/../dprint.h:405:36: note: in expansion of macro 'DBG' 405 | # define DEBUG(fmt, args...) DBG(fmt , ## args) | ^~~ ../../core/parser/../dprint.h:422:16: note: in expansion of macro 'DEBUG' 422 | #define LM_DBG DEBUG | ^~~~~ nat_traversal.c:926:9: note: in expansion of macro 'LM_DBG' 926 | LM_DBG("maximum expire for all contacts: %llu\n", (uint64_t)expire); | ^~~~~~ ``` @miconda same here -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f301ca9cdcc044dd05e9d82139e1db3… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f301ca9cdcc044dd05e9d82139e1db368be6dc5c/104360216(a)github.com>

1 0

Re: [kamailio/kamailio] core: sruid - cast to uint64_t when using time_t value (33b3193)
by Victor Seva 14 Mar '23

14 Mar '23

From https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… ``` core/utils/tmrec.c: In function 'ac_print': core/utils/tmrec.c:275:32: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] 275 | printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, | ~~~^ ~~~~~~~~~~~~~~~~~~~~ | | | | long long unsigned int long unsigned int | %lu core/utils/tmrec.c: In function 'tr_print': core/utils/tmrec.c:515:30: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] 515 | printf("Sys time: %llu\n", (uint64_t)_trp->dtstart); | ~~~^ ~~~~~~~~~~~~~~~~~~~~~~~ | | | | | long unsigned int | long long unsigned int | %lu core/utils/tmrec.c:521:30: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] 521 | printf("End time: %llu\n", (uint64_t)_trp->dtend); | ~~~^ ~~~~~~~~~~~~~~~~~~~~~ | | | | | long unsigned int | long long unsigned int | %lu core/utils/tmrec.c:522:30: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] 522 | printf("Duration: %llu\n", (uint64_t)_trp->duration); | ~~~^ ~~~~~~~~~~~~~~~~~~~~~~~~ | | | | | long unsigned int | long long unsigned int | %lu core/utils/tmrec.c:523:27: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] 523 | printf("Until: %llu\n", (uint64_t)_trp->until); | ~~~^ ~~~~~~~~~~~~~~~~~~~~~ | | | | | long unsigned int | long long unsigned int | %lu ``` @miconda it seems we need just ``%lu`` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/33b319353a097ba8fd80e45dc4f008c… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/33b319353a097ba8fd80e45dc4f008c2e9dfe813/104359936(a)github.com>

1 0

Re: [kamailio/kamailio] Fix for incorrect Flow-description in AAR Media (1a1c2cf)
by Guille0007 12 Mar '23

12 Mar '23

Thanks Herle for your answer, And indeed I made it work using your scripts. Where you only rewrite SDP Offer on Orig Invite and SDP Answer on Terminating183 Session Progress. And where it does not work anymore when you try to rewrite SDP offer at both Orig and Term Invite and SDP Answer on both Orig and term 183 Session Progress. Which is what would happen when *IMS *core uses a separate VRF from access. But anyway, thanks for your answer and thank you for the dockerized environment you made available to test VoLTE with Kamailio. Regards Le dim. 12 mars 2023 à 13:01, Supreeth Herle ***(a)***.***> a écrit : > Hey @Guille0007 <https://github.com/Guille0007> > > I cant recollect completely about the AAR fix I did. But, AAR works in the > docker_open5gs repo for a call. > > — > Reply to this email directly, view it on GitHub > <https://github.com/kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab…>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/A6NCYHDHEGSLIASOJ4C5FPLW3…> > . > You are receiving this because you were mentioned.Message ID: > <kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab7b89b386a/104093331 > @github.com> > -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab7b89b386a/104131881(a)github.com>

1 0

Re: [kamailio/kamailio] Fix for incorrect Flow-description in AAR Media (1a1c2cf)
by Supreeth Herle 12 Mar '23

12 Mar '23

Hey @Guille0007 I cant recollect completely about the AAR fix I did. But, AAR works in the docker_open5gs repo for a call. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab7b89b386a/104093331(a)github.com>

1 0

[kamailio/kamailio] Modified ruri-user and dispatcher failover (Issue #3388)
by mtryfoss 11 Mar '23

11 Mar '23

### Description We've got a situation where we use t_send_reply() to generate early 100 Trying, before an operation that might have a small delay. The result of this operation might lead to a change which adds parameters to ruri-user. This works as expected for normal operations, but when calling ds_next_dst()/ds_next_domain() the change to $rU is lost. ### Troubleshooting I then noticed that this is because t_send_reply() indirectly does a t_newtran() before change to $rU. If it's done in the opposite order, everything works as expected. A workaround is to use for example sl_send_reply() and t_set_auto_inv_100(0), which works for me. However, I'm unsure if this revert of user is expected behaviour? #### Reproduction $rU = $rU + ";npdi"; .. ds_select_dst(..); then trigger a condition which executes failure_route and then use ds_next_dst() to fork serially. $rU is then reverted to the original value in outgoing INVITE. ### Additional Information Reproduced in master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3388 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3388(a)github.com>

2 3

Re: [kamailio/kamailio] Fix for incorrect Flow-description in AAR Media (1a1c2cf)
by Guille0007 10 Mar '23

10 Mar '23

Hello Herlesupreth, I am struggling with pcscf Rx. At termination, PCSCF seems to request QoS for a flow between the IP/port of the SDP offer it receives and the IP/Port of the SDP Answer it receives. While it should request QoS for a flow between the IP/Port of the SDP offer it generates (after rewriting SDP) and the IP/Port of the SDP answer it receives from B. Is it why in the rtp.cfg from https://github.com/herlesupreeth/docker_open5gs you do not invoke rtpmanage on invite at termination? Does the fix you posted there solve that? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab7b89b386a/103929108(a)github.com>

1 0

KEMI python 'KSR' has no attribute 'sanity'
by agural5＠gmail.com 10 Mar '23

10 Mar '23

Hello, I am trying to use KEMI KSR.sanity in python but got error: AttributeError: module 'KSR' has no attribute 'sanity' appreciate your help for solve this. Thanks!

3 2

[kamailio/kamailio] auth_ephemeral: fix authentication with secrets added at runtime (PR #3390)
by Dennis 10 Mar '23

10 Mar '23

- proper way to work with shm pointer to secret list   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description In case of adding secrets at runtime with autheph.add_secret rpc, authentication with new secrets not work, this is because rpc process modify local pointer to secret list, instead shm. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3390 -- Commit Summary -- * auth_ephemeral: fix authentication with secrets added at runtime -- File Changes -- M src/modules/auth_ephemeral/auth_ephemeral_mod.c (48) M src/modules/auth_ephemeral/auth_ephemeral_mod.h (1) M src/modules/auth_ephemeral/authorize.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3390.patch https://github.com/kamailio/kamailio/pull/3390.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3390 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3390(a)github.com>

3 6

git:master:6fa5a8fa: auth_ephemeral: fix authentication with secrets added at runtime (#3390)
by GitHub 10 Mar '23

10 Mar '23

Module: kamailio Branch: master Commit: 6fa5a8fa8ddfe09bdab2fb445bee94e51d86b7fc URL: https://github.com/kamailio/kamailio/commit/6fa5a8fa8ddfe09bdab2fb445bee94e… Author: Dennis <dennis_y(a)mail.ru> Committer: GitHub <noreply(a)github.com> Date: 2023-03-10T15:46:21+01:00 auth_ephemeral: fix authentication with secrets added at runtime (#3390) * auth_ephemeral: fix authentication with secrets added at runtime - proper way to work with shm pointer to secret list * fix: free secret_struct shm Free shm secret_struct in case the allocation error of secret_list pointer. --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/6fa5a8fa8ddfe09bdab2fb445bee94e… Patch: https://github.com/kamailio/kamailio/commit/6fa5a8fa8ddfe09bdab2fb445bee94e…

1 0

git:master:e3b8b76d: utils/kamctl: allow the definition of a specific startup file at start process
by Daniel-Constantin Mierla 10 Mar '23

10 Mar '23

Module: kamailio Branch: master Commit: e3b8b76d7a8773af4e10ce011682931429cd4a87 URL: https://github.com/kamailio/kamailio/commit/e3b8b76d7a8773af4e10ce011682931… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-10T15:38:33+01:00 utils/kamctl: allow the definition of a specific startup file at start process - Added the possibility to specify an alternative file different from the default: kamailio.cfg, when starting kamailio, using the kamctl tool. This makes it possible to start kamailio by passing a startup file located in a specific folder (via ETCDIR env variable) and with a specific name, instead of using the default name: kamailio.cfg. --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/e3b8b76d7a8773af4e10ce011682931… Patch: https://github.com/kamailio/kamailio/commit/e3b8b76d7a8773af4e10ce011682931… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index fbb237eb00..214cd21e5a 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -73,6 +73,10 @@ if [ -z "$MYLIBDIR" ] ; then fi fi +if [ -z "$STARTUP_CONFIG_FILE" ]; then + STARTUP_CONFIG_FILE="kamailio.cfg" +fi + ##### ------------------------------------------------ ##### ### load base functions # @@ -2007,9 +2011,9 @@ kamailio_start() { exit 1 fi if [ $SYSLOG = 1 ] ; then - $KAMBIN -P $PID_FILE -f $ETCDIR/kamailio.cfg $STARTOPTIONS 1>/dev/null 2>/dev/null + $KAMBIN -P $PID_FILE -f $ETCDIR/$STARTUP_CONFIG_FILE $STARTOPTIONS 1>/dev/null 2>/dev/null else - $KAMBIN -P $PID_FILE -E -f $ETCDIR/kamailio.cfg $STARTOPTIONS + $KAMBIN -P $PID_FILE -E -f $ETCDIR/$STARTUP_CONFIG_FILE $STARTOPTIONS fi sleep 3 if [ ! -s $PID_FILE ] ; then diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index fe9cc1fc48..ce0bd9d93b 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -159,6 +159,10 @@ ## PID file path - default is: /run/kamailio/kamailio.pid # PID_FILE=/run/kamailio/kamailio.pid +## Kamailio Startup Configuration File +## Default is: kamailio.cfg +# STARTUP_CONFIG_FILE=kamailio.cfg + ## Extra start options - default is: not set ## example: start Kamailio with 64MB shared memory: STARTOPTIONS="-m 64" # STARTOPTIONS=

1 0

[kamailio/kamailio] utils/kamctl: allow the definition of a specific startup file at star… (PR #3387)
by Gustavo Almeida 10 Mar '23

10 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:  - [x ] PR should be backported to stable branches - [x ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Added the possibility to specify an alternative file different from the default: `kamailio.cfg`, when starting `kamailio`, using the `kamctl` tool. This makes it possible to start `kamailio` by passing a startup file located in a specific folder (via `ETCDIR` env variable) and with a specific name, instead of using the default name: `kamailio.cfg`. Several local tests have been performed and it has been verified that it is now possible to perform the basic start/stop/restart operations of `kamailio` via `kamctl`, considering the use of a startup file other than the default: `kamailio.cfg`. Example of `.kamctlrc` used: ```sh ETCDIR="/etc/my-component/confs" RPCFIFOPATH="/run/my-component/my-component_rpc.fifo" PID_FILE="/run/my-component/my-component.pid" STARTUP_CONFIG_FILE="starter.cfg" STARTOPTIONS="-m 512 -M 64 -u user -g group" ``` Tested on `CentOS Linux release 7.9.2009 (Core)`. I think this change will be interesting for many users. Thanks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3387 -- Commit Summary -- * utils/kamctl: allow the definition of a specific startup file at start process -- File Changes -- M utils/kamctl/kamctl (8) M utils/kamctl/kamctlrc (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3387.patch https://github.com/kamailio/kamailio/pull/3387.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3387 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3387(a)github.com>

3 4

Handling socket packet reception time (SO_TIMESTAMPNS) in Kamailio - possible new feature ?
by Chaigneau, Nicolas 09 Mar '23

09 Mar '23

Hello, I'm interested in retrieving the reception time, in the UDP buffer, of the SIP packets handled by Kamailio. I see there is a "struct timeval tval" in "struct sip_msg", but this is the timestamp of reading the packet by Kamailio, so not what I'm looking for. According to the kernel documentation, this could be achieved using SO_TIMESTAMPNS on the socket: https://www.kernel.org/doc/Documentation/networking/timestamping.txt Do you think adding this feature to Kamailio could be useful ? To implement this we would need, I think: - Only buid this if SO_TIMESTAMPNS is supported (Linux >= 2.6.22) - Add a configuration to enable / disable this feature - Set the SO_TIMESTAMPNS flag when creating the socket - Add a field in "struct sip_msg" to store the new timestamp - When receiving a packet, read the ancillary data, extract the SO_TIMESTAMPNS information and store the timestamp in "struct sip_msg" - Provide a new PV to make this accessible from Kamailio script What do you think ? Regards, Nicolas. This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message.

1 0

[kamailio/kamailio] kamailio 5.2.3(commit c36229) crash at free_cell_helper (Issue #3379)
by polite 08 Mar '23

08 Mar '23

### Description kamailio 5.2.3 crash at free_cell_helper ### Troubleshooting #### Reproduction This cannot be reproduced at will. #### Debugging Data ``` [root@VM-110-141-centos /data/coredump]# gdb -c core_kamailio_1676550458 /usr/local/services/kamailio/sbin/kamailio GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-120.tl2 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/local/services/kamailio/sbin/kamailio...done. [New LWP 4452] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Missing separate debuginfo for /usr/local/services/kamailio/lib64/kamailio/libjansson.so.4 Try: yum --enablerepo='*debug*' install /usr/lib/debug/.build-id/fc/cf02c89115bf860ddba32e8b703205ffeeabf1.debug Core was generated by `/usr/local/services/kamailio/sbin/kamailio -f /usr/local/services/kamailio/etc/'. Program terminated with signal 11, Segmentation fault. #0 0x00007f8ede8e113a in free_cell_helper (dead_cell=0x7f8eb7dcb1b8, silent=0, fname=0x7f8ede9ece02 "timer.c", fline=689) at h_table.c:182 182 h_table.c: No such file or directory. Missing separate debuginfos, use: debuginfo-install bash-4.2.46-34.tl2.3.x86_64 cyrus-sasl-lib-2.1.26-23.el7.x86_64 glibc-2.17-323.tl2.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-51.tl2.x86_64 libcom_err-1.42.9-19.tl2.x86_64 libcurl-7.29.0-59.tl2.1.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-44.tl2.1.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-15.tl2.x86_64 libssh2-1.8.0-4.tl2.x86_64 libstdc++-4.8.5-44.tl2.1.x86_64 mariadb-libs-5.5.68-1.tl2.x86_64 nspr-4.32.0-1.tl2.x86_64 nss-3.67.0-4.tl2.x86_64 nss-softokn-freebl-3.67.0-3.tl2.x86_64 nss-util-3.67.0-1.tl2.x86_64 openldap-2.4.44-24.tl2.x86_64 openssl-libs-1.0.2k-22.tl2.1.x86_64 pcre-8.32-17.el7.x86_64 python-libs-2.7.5-90.tl2.1.x86_64 zlib-1.2.7-19.tl2.x86_64 (gdb) bt full #0 0x00007f8ede8e113a in free_cell_helper (dead_cell=0x7f8eb7dcb1b8, silent=0, fname=0x7f8ede9ece02 "timer.c", fline=689) at h_table.c:182 b = 0x7f8ede8decc4 <futex_release+29> "\211E\374\203}\374\002\017\224\300\017\266\300H\205\300t3H\213E\350\307\004$" i = 1 rpl = 0x7fffb5166580 tt = 0x7fffb51665a0 foo = 0x100000000 cbs = 0x7f8e00000001 cbs_tmp = 0x7f8e00000001 __FUNCTION__ = "free_cell_helper" #1 0x00007f8ede99381e in wait_handler (ti=367281959, wait_tl=0x7f8eb7dcb240, data=0x7f8eb7dcb1b8) at timer.c:689 p_cell = 0x7f8eb7dcb1b8 ret = 3080640456 unlinked = 0 rcount = 1 __FUNCTION__ = "wait_handler" #2 0x0000000000487769 in timer_list_expire (t=367281959, h=0x7f8eb7a318a8, slow_l=0x7f8eb7a34d70, slow_mark=42793) at core/timer.c:874 tl = 0x7f8eb7dcb240 ret = 0 #3 0x0000000000487bca in timer_handler () at core/timer.c:939 saved_ticks = 367281959 run_slow_timer = 0 i = 809 __FUNCTION__ = "timer_handler" #4 0x0000000000488074 in timer_main () at core/timer.c:978 No locals. #5 0x0000000000425a31 in main_loop () at main.c:1727 i = 8 pid = 0 si = 0x0 si_desc = "udp receiver child=7 sock=11.177.110.141:35560\000(175.27.32.249:15060)\000\177\000\000\223U{\000\000\000\000\000-\000\000\000\000\000\000\000\000\000\000 \000\000\000\000\000\000\000\004\000\000\000\000\257*\245\346\216\177\000\000\360\260y\000\000\000\000\000\000\227\265\342\216\177\000" nrprocs = 8 woneinit = 1 __FUNCTION__ = "main_loop" #6 0x000000000042c72d in main (argc=13, argv=0x7fffb5166bd8) at main.c:2696 cfg_stream = 0xfdc010 c = -1 r = 0 tmp = 0x7fffb5168757 "" tmp_len = 0 port = 0 proto = 2496 options = 0x76a700 ":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 = 99772630 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7fffb5166a90 p = 0x7f8ee6a00d2d <intel_check_word+173> "H\205\300t\025\017\266P\003\017\266\312D9\371\017\204\316" st = {st_dev = 21, st_ino = 32759713, st_nlink = 2, st_mode = 16877, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1671615993, tv_nsec = 68240759}, st_mtim = {tv_sec = 1671620803, tv_nsec = 306084978}, st_ctim = {tv_sec = 1671620803, tv_nsec = 306084978}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) info locals cfg_stream = 0xfdc010 c = -1 r = 0 tmp = 0x7fffb5168757 "" tmp_len = 0 port = 0 proto = 2496 options = 0x76a700 ":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 = 99772630 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7fffb5166a90 p = 0x7f8ee6a00d2d <intel_check_word+173> "H\205\300t\025\017\266P\003\017\266\312D9\371\017\204\316" st = {st_dev = 21, st_ino = 32759713, st_nlink = 2, st_mode = 16877, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1671615993, tv_nsec = 68240759}, st_mtim = {tv_sec = 1671620803, tv_nsec = 306084978}, st_ctim = {tv_sec = 1671620803, tv_nsec = 306084978}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) list 177 in h_table.c (gdb) ``` #### Log Messages kamailio.log ``` Feb 16 20:27:33 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4434]: INFO: {10 OPTIONS 3c7f4fb43ea4086d-4451(a)11.177.110.141} <script>: keepalive-host is up: OPTIONS sip:9.137.223.152:50180 (<null>) Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4425]: ALERT: <core> [main.c:756]: handle_sigs(): child process 4452 exited by a signal 11 Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4425]: ALERT: <core> [main.c:759]: handle_sigs(): core was generated Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4425]: INFO: <core> [main.c:781]: handle_sigs(): terminating due to SIGCHLD Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4470]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4469]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4462]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4466]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4467]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4468]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4464]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4449]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4460]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4465]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4461]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4440]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4459]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4429]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4457]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4430]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4456]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4442]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4432]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4458]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4437]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4444]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4463]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4439]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4454]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4434]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4448]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4451]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4436]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4447]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4450]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4435]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4431]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4441]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4446]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4428]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4445]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4427]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4453]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4438]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4455]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4433]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4443]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Feb 16 20:27:41 VM-110-141-centos /usr/local/services/kamailio/sbin/kamailio[4425]: CRITICAL: <core> [core/mem/q_malloc.c:137]: qm_debug_check_frag(): BUG: qm: fragm. 0x7f8eb7d04778 (address 0x7f8eb7d047b0) end overwritten (1, abcdefed)! Memory allocator was called from dialplan: dp_db.c:687. Fragment marked by dialplan: dp_db.c:400. Exec from core/mem/q_malloc.c:504. ``` messages ``` [Thu Feb 16 20:27:44 2023] kamailio[4452]: segfault at 7f8e00000021 ip 00007f8ede8e113a sp 00007fffb51664a0 error 4 in tm.so[7f8ede8c5000+13a000] ``` #### SIP Traffic ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@VM-110-141-centos /usr/local/services/kamailio/sbin]# ./kamailio -version version: kamailio 5.2.3 (x86_64/linux) c36229 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES 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: c36229 compiled on 16:50:57 Jul 16 2019 with gcc 4.8.5 ``` * **Operating System**: ``` [root@VM-110-141-centos /data/coredump]# uname -a Linux VM-110-141-centos 4.14.105-1-tlinux3-0023 #1 SMP Mon Jan 10 18:17:33 CST 2022 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3379 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3379(a)github.com>

2 2

git:master:b15db86e: sqlops: do not allow empty name component in URL
by Henning Westerholt 06 Mar '23

06 Mar '23

Module: kamailio Branch: master Commit: b15db86e93120824dcfc879099432f3ec1c3b0c7 URL: https://github.com/kamailio/kamailio/commit/b15db86e93120824dcfc879099432f3… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-06T10:44:19Z sqlops: do not allow empty name component in URL --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/b15db86e93120824dcfc879099432f3… Patch: https://github.com/kamailio/kamailio/commit/b15db86e93120824dcfc879099432f3… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 237ddd8c1e..eaa03de6fd 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -677,6 +677,9 @@ int sql_parse_param(char *val) if(p>in.s+in.len || *p=='\0') goto error; name.len = p - name.s; + if(name.len==0) { + goto error; + } if(*p!='=') { while(p<in.s+in.len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))

1 0

Kamailio v5.5.6 Released
by Daniel-Constantin Mierla 02 Mar '23

02 Mar '23

Hello, Kamailio SIP Server v5.5.6 stable release is out. This is a maintenance release of the stable branch 5.5 that includes fixes since the release of v5.5.5. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.6. Note that 5.5 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.6, with v5.6.4 being release out of it. For more details about version 5.5.6 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2023/03/kamailio-v5-5-6-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com Kamailio Advanced Training - Online - March 27-30, 2023 - www.asipto.com

1 0

git:5.5:72dbb099: ChangeLog: content updated for v5.5.6
by Daniel-Constantin Mierla 02 Mar '23

02 Mar '23

Module: kamailio Branch: 5.5 Commit: 72dbb099774a57393106d2101d990ed8557dbdc6 URL: https://github.com/kamailio/kamailio/commit/72dbb099774a57393106d2101d990ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-02T11:26:18+01:00 ChangeLog: content updated for v5.5.6 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/72dbb099774a57393106d2101d990ed… Patch: https://github.com/kamailio/kamailio/commit/72dbb099774a57393106d2101d990ed…

1 0

git:5.5:7b3d89cf: Makefile.defs: version set to 5.5.6
by Daniel-Constantin Mierla 02 Mar '23

02 Mar '23

Module: kamailio Branch: 5.5 Commit: 7b3d89cf0fc8284546e650198c79141839c6e094 URL: https://github.com/kamailio/kamailio/commit/7b3d89cf0fc8284546e650198c79141… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-02T10:40:39+01:00 Makefile.defs: version set to 5.5.6 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/7b3d89cf0fc8284546e650198c79141… Patch: https://github.com/kamailio/kamailio/commit/7b3d89cf0fc8284546e650198c79141… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 0e49c6f0c4..5ec3536ea3 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:6e4d4045: pkg/kamailio/deb: version set 5.5.6
by Daniel-Constantin Mierla 02 Mar '23

02 Mar '23

Module: kamailio Branch: 5.5 Commit: 6e4d404566ad498eb97c5dcf604cd352882c4fa2 URL: https://github.com/kamailio/kamailio/commit/6e4d404566ad498eb97c5dcf604cd35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-02T10:27:59+01:00 pkg/kamailio/deb: version set 5.5.6 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/6e4d404566ad498eb97c5dcf604cd35… Patch: https://github.com/kamailio/kamailio/commit/6e4d404566ad498eb97c5dcf604cd35…

1 0

git:5.5:8042aa4b: pkg: version set to 5.5.6 for rpm and alpine specs
by Daniel-Constantin Mierla 02 Mar '23

02 Mar '23

Module: kamailio Branch: 5.5 Commit: 8042aa4b29f5ff0c570ca926e8087b01266290af URL: https://github.com/kamailio/kamailio/commit/8042aa4b29f5ff0c570ca926e8087b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-02T10:26:52+01:00 pkg: version set to 5.5.6 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/8042aa4b29f5ff0c570ca926e8087b0… Patch: https://github.com/kamailio/kamailio/commit/8042aa4b29f5ff0c570ca926e8087b0… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e35b095c359..462dd82cf14 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.5 +pkgver=5.5.6 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 58b0e572cf2..27e32dc2bfc 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.5 +%define ver 5.5.6 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing Kamailio v5.5.6
by Daniel-Constantin Mierla 02 Mar '23

02 Mar '23

Hello, I am considering to release Kamailio v5.5.6 soon, branch on branch 5.5, likely on Thursday or Wednesday next week (Mar 2/3, 2023). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com Kamailio Advanced Training - Online - March 27-30, 2023 - www.asipto.com

1 1

Re: [kamailio/kamailio] rtpengine: doc add codec-accept with an example (e8c294f)
by Ihor Olkhovskyi 01 Mar '23

01 Mar '23

Small typo here `codec-accept=opus` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/e8c294f33f8b867b0f67d78c14b7327… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/e8c294f33f8b867b0f67d78c14b7327dc22dd726/102410069(a)github.com>

2 1

git:master:212675d3: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 01 Mar '23

01 Mar '23

Module: kamailio Branch: master Commit: 212675d350b64b5c9abb6a6eb844f41b6efb8693 URL: https://github.com/kamailio/kamailio/commit/212675d350b64b5c9abb6a6eb844f41… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-03-01T13:46:32+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/212675d350b64b5c9abb6a6eb844f41… Patch: https://github.com/kamailio/kamailio/commit/212675d350b64b5c9abb6a6eb844f41…

1 0

[kamailio/kamailio] rtpengine: document options SDES-pad and SDES-nonew (PR #3369)
by Дилян Палаузов 01 Mar '23

01 Mar '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3369 -- Commit Summary -- * rtpengine: document options SDES-pad and SDES-nonew -- File Changes -- M src/modules/rtpengine/bencode.h (2) M src/modules/rtpengine/doc/rtpengine_admin.xml (36) M src/modules/rtpengine/rtpengine.c (4) M src/modules/rtpengine/rtpengine_funcs.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3369.patch https://github.com/kamailio/kamailio/pull/3369.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3369 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3369(a)github.com>

3 3

git:master:5a9d8634: rtpengine: docs for SDES-nonew and SDES-pad flags
by Daniel-Constantin Mierla 01 Mar '23

01 Mar '23

Module: kamailio Branch: master Commit: 5a9d8634e742fe28b3b5c733b9e727b1dc7917ce URL: https://github.com/kamailio/kamailio/commit/5a9d8634e742fe28b3b5c733b9e727b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-01T13:29:47+01:00 rtpengine: docs for SDES-nonew and SDES-pad flags - spell fixes --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5a9d8634e742fe28b3b5c733b9e727b… Patch: https://github.com/kamailio/kamailio/commit/5a9d8634e742fe28b3b5c733b9e727b…

1 0

git:master:bd497411: rtpengine: spell fixes in the comments
by Daniel-Constantin Mierla 01 Mar '23

01 Mar '23

Module: kamailio Branch: master Commit: bd497411f2e8e9ee6bd7e47d838add607019e761 URL: https://github.com/kamailio/kamailio/commit/bd497411f2e8e9ee6bd7e47d838add6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-01T13:31:12+01:00 rtpengine: spell fixes in the comments --- Modified: src/modules/rtpengine/bencode.h Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/bd497411f2e8e9ee6bd7e47d838add6… Patch: https://github.com/kamailio/kamailio/commit/bd497411f2e8e9ee6bd7e47d838add6… --- diff --git a/src/modules/rtpengine/bencode.h b/src/modules/rtpengine/bencode.h index f2efb742cc..df7fa8be66 100644 --- a/src/modules/rtpengine/bencode.h +++ b/src/modules/rtpengine/bencode.h @@ -220,7 +220,7 @@ struct iovec *bencode_iovec(bencode_item_t *root, int *cnt, unsigned int head, u /* Similar to bencode_iovec(), but instead returns the encoded document as a null-terminated string. * Memory for the string is allocated from the same bencode_buffer_t object as the "root" object - * was allocated from. If "len" is a non-NULL pointer, the length of the genrated string is returned + * was allocated from. If "len" is a non-NULL pointer, the length of the generated string is returned * in *len. This is important if the encoded document contains binary data, in which case null * termination cannot be trusted. The returned string is freed when the corresponding * bencode_buffer_t object is destroyed. */ diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 46640a5d3d..d0199ec04f 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1147,8 +1147,8 @@ int add_rtpengine_socks(struct rtpp_set *rtpp_list, char *rtpengine, } -/* 0 - succes - * -1 - erorr +/* 0 - success + * -1 - error * */ static int rtpengine_add_rtpengine_set(char * rtp_proxies, unsigned int weight, int disabled, unsigned int ticks) { diff --git a/src/modules/rtpengine/rtpengine_funcs.c b/src/modules/rtpengine/rtpengine_funcs.c index 598af6360e..4863ec662c 100644 --- a/src/modules/rtpengine/rtpengine_funcs.c +++ b/src/modules/rtpengine/rtpengine_funcs.c @@ -178,8 +178,8 @@ int extract_body(struct sip_msg *msg, str *body ) /* * Better use the content-len value - no need of any explicit - * parcing as get_body() parsed all headers and Conten-Length - * body header is automaticaly parsed when found. + * parsing as get_body() parsed all headers and Content-Length + * body header is automatically parsed when found. */ if (msg->content_length==0) { LM_ERR("failed to get the content length in message\n");

1 0

[kamailio/kamailio] RPC command sl.stats does not work correctly with large values (exceeding 4 bytes) (Issue #3386)
by Nicolas C 01 Mar '23

01 Mar '23

### Description Using kamcmd to obtain statistics of SIP replies, for large values (exceeding 4 bytes) : Example : ``` kamcmd> sl.stats { (...) 302: -1294967293 } ``` The variable is an unsigned long, it can store values up to 2^64-1. But RPC command **sl.stats** does not support this. ### Possible Solutions I think the fix is simple, we should just replace "d" by "j" when using "rpc->struct_add" (function "rpc_stats" in file src/modules/sl/sl_stats.c). E.g. : ``` rpc->struct_add(st, "jjjj", "300", total.err[RT_300], "301", total.err[RT_301], "302", total.err[RT_302], "3xx", total.err[RT_3xx]); ``` I found a commit that did something similar with the shared memory stats : https://github.com/kamailio/kamailio/commit/f619cae55ffeb4596da852d9ed75773… ### Additional Information Kamailio 5.6.4 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3386 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3386(a)github.com>

2 2

git:master:1f2622fc: sl: print rpc result fields as unsigned long
by Daniel-Constantin Mierla 01 Mar '23

01 Mar '23

Module: kamailio Branch: master Commit: 1f2622fc7e0d7b81bab311728b1b3b6856790ace URL: https://github.com/kamailio/kamailio/commit/1f2622fc7e0d7b81bab311728b1b3b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-01T13:20:41+01:00 sl: print rpc result fields as unsigned long - GH #3386 --- Modified: src/modules/sl/sl_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/1f2622fc7e0d7b81bab311728b1b3b6… Patch: https://github.com/kamailio/kamailio/commit/1f2622fc7e0d7b81bab311728b1b3b6… --- diff --git a/src/modules/sl/sl_stats.c b/src/modules/sl/sl_stats.c index 079786aade..9b7cf51259 100644 --- a/src/modules/sl/sl_stats.c +++ b/src/modules/sl/sl_stats.c @@ -36,7 +36,7 @@ static void add_sl_stats( struct sl_stats *t, struct sl_stats *i) { enum reply_type rt; - for (rt=0; rt<RT_END; rt++) { + for (rt=0; rt<RT_END; rt++) { t->err[rt]+=i->err[rt]; t->all_replies+=i->err[rt]; } @@ -67,19 +67,19 @@ static void rpc_stats(rpc_t* rpc, void* c) } if (rpc->add(c, "{", &st) < 0) return; - - rpc->struct_add(st, "ddd", + + rpc->struct_add(st, "jjj", "200", total.err[RT_200], "202", total.err[RT_202], "2xx", total.err[RT_2xx]); - rpc->struct_add(st, "dddd", + rpc->struct_add(st, "jjjj", "300", total.err[RT_300], "301", total.err[RT_301], "302", total.err[RT_302], "3xx", total.err[RT_3xx]); - rpc->struct_add(st, "dddddddd", + rpc->struct_add(st, "jjjjjjjj", "400", total.err[RT_400], "401", total.err[RT_401], "403", total.err[RT_403], @@ -89,12 +89,12 @@ static void rpc_stats(rpc_t* rpc, void* c) "483", total.err[RT_483], "4xx", total.err[RT_4xx]); - rpc->struct_add(st, "dd", + rpc->struct_add(st, "jj", "500", total.err[RT_500], "5xx", total.err[RT_5xx]); - rpc->struct_add(st, "d", "6xx", total.err[RT_6xx]); - rpc->struct_add(st, "d", "xxx", total.err[RT_xxx]); + rpc->struct_add(st, "j", "6xx", total.err[RT_6xx]); + rpc->struct_add(st, "j", "xxx", total.err[RT_xxx]); } @@ -105,7 +105,7 @@ void sl_stats_destroy(void) shm_free(sl_stats); } -int init_sl_stats(void) +int init_sl_stats(void) { sl_stats = (struct sl_stats**)shm_malloc(sizeof(struct sl_stats*)); if (!sl_stats) { @@ -148,7 +148,7 @@ void update_sl_filtered_acks( void ) (*sl_stats)[process_no].filtered_acks++; } -void update_sl_stats( int code ) +void update_sl_stats( int code ) { struct sl_stats *my_stats; @@ -206,7 +206,7 @@ void update_sl_stats( int code ) break; } } - + } rpc_export_t sl_rpc[] = {

1 0

git:master:9a7c4025: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 01 Mar '23

01 Mar '23

Module: kamailio Branch: master Commit: 9a7c4025b6a4b90125c1c30dfd1d994100ae965e URL: https://github.com/kamailio/kamailio/commit/9a7c4025b6a4b90125c1c30dfd1d994… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-03-01T08:46:34+01:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/9a7c4025b6a4b90125c1c30dfd1d994… Patch: https://github.com/kamailio/kamailio/commit/9a7c4025b6a4b90125c1c30dfd1d994…

1 0

git:master:714c9eb9: rtpengine: small spelling fix related to codec-mask example, related to e8c294f33f8b
by Henning Westerholt 01 Mar '23

01 Mar '23

Module: kamailio Branch: master Commit: 714c9eb99e6ba73e05a98df2bc6f4b339e9a97c9 URL: https://github.com/kamailio/kamailio/commit/714c9eb99e6ba73e05a98df2bc6f4b3… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-01T07:37:53Z rtpengine: small spelling fix related to codec-mask example, related to e8c294f33f8b --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/714c9eb99e6ba73e05a98df2bc6f4b3… Patch: https://github.com/kamailio/kamailio/commit/714c9eb99e6ba73e05a98df2bc6f4b3… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 99f97305c2..1d5ad12477 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2715,7 +2715,7 @@ route { ... if (is_method("INVITE")) { if (has_body("application/sdp")) { - if (rtpengine_offer("codec-mask=opus codec-accept-opus codec-strip=PCMU codec-transcode=PCMU")) + if (rtpengine_offer("codec-mask=opus codec-accept=opus codec-strip=PCMU codec-transcode=PCMU")) t_on_reply("1"); } }

1 0

git:master:70d8308b: htable: fix XML syntax errors introduced in 23c67322c244fc4bf
by Henning Westerholt 01 Mar '23

01 Mar '23

Module: kamailio Branch: master Commit: 70d8308bbf849b00be69d5c3091b57dfe214b81b URL: https://github.com/kamailio/kamailio/commit/70d8308bbf849b00be69d5c3091b57d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-01T07:34:43Z htable: fix XML syntax errors introduced in 23c67322c244fc4bf --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/70d8308bbf849b00be69d5c3091b57d… Patch: https://github.com/kamailio/kamailio/commit/70d8308bbf849b00be69d5c3091b57d…

1 0

[kamailio/kamailio] TLS module rpc commands not found (Issue #3385)
by HimaBinduGrg 28 Feb '23

28 Feb '23

We have loaded the tls.so module in the kamailio.cfg file and the kamailio process is up and running, however we are not sure whether the TLS module is loaded properly or not. Here are a few configuration details. #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_TLS enable_tls=yes #!endif #!ifdef WITH_TLS ## ----- tls params ----- modparam("tls", "config", "/etc/kamailio/tls.cfg") #!endif $kamailio -v version: kamailio 5.5.3 (x86_64/linux) d31ff9-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, 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: d31ff9 -dirty compiled on 10:08:08 May 24 2022 with gcc 8.5.0 # openssl version OpenSSL 1.1.1k FIPS 25 Mar 2021 # ldd /usr/lib64/kamailio/modules/tls.so linux-vdso.so.1 (0x00007ffc0cbf2000) libdl.so.2 => /lib64/libdl.so.2 (0x00007f2c3bcc1000) libm.so.6 => /lib64/libm.so.6 (0x00007f2c3b93f000) libssl.so.1.1 => /lib64/libssl.so.1.1 (0x00007f2c3b6ab000) libcrypto.so.1.1 => /lib64/libcrypto.so.1.1 (0x00007f2c3b1c2000) libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f2c3afa2000) libc.so.6 => /lib64/libc.so.6 (0x00007f2c3abdd000) /lib64/ld-linux-x86-64.so.2 (0x00007f2c3c170000) libz.so.1 => /lib64/libz.so.1 (0x00007f2c3a9c5000) When we try to check tls rpc cli's it shows command not found # kamcmd [tls.info](http://tls.info/) error: 500 - command [tls.info](http://tls.info/) not found # kamcmd tls.reload error: 500 - command tls.reload not found We have compiled the kamailio-5.5.3 version using the kamailio.spec file. kamailio-tls-5.5.3-5.el8.x86_64 rpm installed to load the tls.so module. Operating System : Red Hat Enterprise Linux release 8.6 (Ootpa) Please suggest to me anything we have missed to configure or compilation wise. Also suggest to me how to verify the tls module and configuration is fine or not. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3385 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3385(a)github.com>

2 2

git:master:05b4fdeb: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 28 Feb '23

28 Feb '23

Module: kamailio Branch: master Commit: 05b4fdebcf2eb9c82739a643ff48b799b8046bbd URL: https://github.com/kamailio/kamailio/commit/05b4fdebcf2eb9c82739a643ff48b79… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-28T11:01:24+01:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/05b4fdebcf2eb9c82739a643ff48b79… Patch: https://github.com/kamailio/kamailio/commit/05b4fdebcf2eb9c82739a643ff48b79…

1 0

git:master:23c67322: doc/htable: adding examples in a case of key value is an integer
by Daniel-Constantin Mierla 28 Feb '23

28 Feb '23

Module: kamailio Branch: master Commit: 23c67322c244fc4bf6e990379d2fd876b55b2cbe URL: https://github.com/kamailio/kamailio/commit/23c67322c244fc4bf6e990379d2fd87… Author: Ihor Olkhovskyi <ihor.olkhovskyi(a)cern.ch> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-28T10:51:37+01:00 doc/htable: adding examples in a case of key value is an integer --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/23c67322c244fc4bf6e990379d2fd87… Patch: https://github.com/kamailio/kamailio/commit/23c67322c244fc4bf6e990379d2fd87…

1 0

[kamailio/kamailio] doc/htable: adding examples in a case of key value is an integer (PR #3383)
by Ihor Olkhovskyi 28 Feb '23

28 Feb '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) - [ ] 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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Commands for get/set described in documentation are not working giving 500 errors in a case if key value is integer value. If attach s: to key name it all work as expected (as was advised in [the mailing list](https://www.mail-archive.com/sr-users@lists.kamailio.org/msg16436.htm… by Fred Posner) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3383 -- Commit Summary -- * doc/htable: adding examples in a case of key value is an integer -- File Changes -- M src/modules/htable/doc/htable_admin.xml (42) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3383.patch https://github.com/kamailio/kamailio/pull/3383.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3383 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3383(a)github.com>

2 2

[kamailio/kamailio] doc/htable: fix documentation for rpc commands (PR #3382)
by Ihor Olkhovskyi 28 Feb '23

28 Feb '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 - [X] 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Commands for get/set described in documentation are not working giving 500 errors. If attach `s:` to key name it all work as expected (as was advised in [the mailing list](https://www.mail-archive.com/sr-users@lists.kamailio.org/msg16436.htm… by Fred Posner) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3382 -- Commit Summary -- * doc/htable: fix documentation for rpc commands -- File Changes -- M src/modules/htable/doc/htable_admin.xml (51) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3382.patch https://github.com/kamailio/kamailio/pull/3382.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3382 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3382(a)github.com>

2 3

git:master:b75b6e4b: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 27 Feb '23

27 Feb '23

Module: kamailio Branch: master Commit: b75b6e4b5d7425ca995aa125171edebec52bf82b URL: https://github.com/kamailio/kamailio/commit/b75b6e4b5d7425ca995aa125171edeb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-27T20:16:29+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/b75b6e4b5d7425ca995aa125171edeb… Patch: https://github.com/kamailio/kamailio/commit/b75b6e4b5d7425ca995aa125171edeb…

1 0

git:master:e8c294f3: rtpengine: doc add codec-accept with an example
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Module: kamailio Branch: master Commit: e8c294f33f8b867b0f67d78c14b7327dc22dd726 URL: https://github.com/kamailio/kamailio/commit/e8c294f33f8b867b0f67d78c14b7327… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-27T20:07:00+01:00 rtpengine: doc add codec-accept with an example --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e8c294f33f8b867b0f67d78c14b7327… Patch: https://github.com/kamailio/kamailio/commit/e8c294f33f8b867b0f67d78c14b7327… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 85b1a0fbe8c..99f97305c2b 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2630,6 +2630,15 @@ rtpengine_offer(); and used for transcoding on the offering side. Useful only in combination with codec-transcode. <emphasis>all</emphasis> keyword can be used to mask all offered codecs </para></listitem> + + <listitem><para> + <emphasis>codec-accept=...</emphasis> - Similar to `mask` and `consume` but doesn't remove the codec from the list of + offered codecs. This means that a codec listed under `accept` will still be offered + to the remote peer, but if the remote peer rejects it, it will still be accepted + towards the original offerer and then used for transcoding. It is a more selective + version of what the `always transcode` flag does. + </para></listitem> + <listitem><para> <emphasis>T.38=decode</emphasis> - If the offered &sdp; contains a media section advertising T.38 over UDPTL, translate it to a regular audio media section @@ -2696,6 +2705,30 @@ if (has_body("application/sdp")) { t_on_reply("1"); } +... +</programlisting> + </example> + <example> + <title><function>rtpengine_offer</function> usage to force transcoding from opus to PCMU</title> + <programlisting format="linespecific"> +route { +... + if (is_method("INVITE")) { + if (has_body("application/sdp")) { + if (rtpengine_offer("codec-mask=opus codec-accept-opus codec-strip=PCMU codec-transcode=PCMU")) + t_on_reply("1"); + } + } +... +} + +onreply_route[1] +{ +... + if (has_body("application/sdp")) + rtpengine_answer("codec-strip=PCMU codec-strip=PCMA"); +... +} ... </programlisting> </example>

1 0

[kamailio/kamailio] rtpengine: doc add codec-accept with an example (PR #3381)
by Julien Chavanton 27 Feb '23

27 Feb '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 - [x] Documentation. #### Description A) offers OPUS + PCMU B) answers PCMU I do not want PCMU to be selected, I would like to endup transcoding : ``` A <-opus-> rtpengine <-pcmu-> B ``` If I understand correctly, this is what I have to set on the rtpengine_offer ``` codec-mask=opus codec-strip=PCMU codec-transcode=PCMU ``` rtpengine is removing opus from the offer before sending it. The answer sent by rtpengine is as follows: ``` m=audio 10884 UDP/TLS/RTP/SAVPF 0 126 a=maxptime:150 a=mid:0 a=rtpmap:0 PCMU/8000 a=rtpmap:126 telephone-event/8000 ``` for this to work, I would expect rtpengine to insert opus and remove pcmu ? Answer : ``` That's what 'codec-accept` is for Try with `codec-accept-opus` and/or `opus-accept-opus/48000` in the offer. That should be all that's needed (assuming reasonably recent version). ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3381 -- Commit Summary -- * rtpengine: doc add codec-accept with an example -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (33) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3381.patch https://github.com/kamailio/kamailio/pull/3381.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3381 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3381(a)github.com>

3 2

Kamailio v5.6.4 Released
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Hello, Kamailio SIP Server v5.6.4 stable release is out. This is a maintenance release of the latest stable branch, 5.6, that includes fixes since the release of v5.6.3. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.6.x. Deployments running previous v5.6.x versions are strongly recommended to be upgraded to v5.6.4. For more details about version 5.6.4 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2023/02/kamailio-v5-6-4-released/ RPM, Debian/Ubuntu packages will be available soon as well. An additional note to say that call for speakers and registration for Kamailio World Conference 2023 are now open, more details at: * https://www.kamailioworld.com Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com Kamailio Advanced Training - Online - March 27-30, 2023 - www.asipto.com

1 0

git:5.6:a004cfa0: ChangeLog: content updated for v5.6.4
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Module: kamailio Branch: 5.6 Commit: a004cfa0dbb59323af06de48752200eb189659cd URL: https://github.com/kamailio/kamailio/commit/a004cfa0dbb59323af06de48752200e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-27T10:24:26+01:00 ChangeLog: content updated for v5.6.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/a004cfa0dbb59323af06de48752200e… Patch: https://github.com/kamailio/kamailio/commit/a004cfa0dbb59323af06de48752200e…

1 0

git:5.6:383bc71c: Makefile.defs: version set to 5.6.4
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Module: kamailio Branch: 5.6 Commit: 383bc71cd4f3b2d5d0290f11a6c3975a58c7949e URL: https://github.com/kamailio/kamailio/commit/383bc71cd4f3b2d5d0290f11a6c3975… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-27T10:04:04+01:00 Makefile.defs: version set to 5.6.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/383bc71cd4f3b2d5d0290f11a6c3975… Patch: https://github.com/kamailio/kamailio/commit/383bc71cd4f3b2d5d0290f11a6c3975… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index f1ffe39e99..99eae5cdb1 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 6 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory manager switcher

1 0

git:5.6:93aaf27b: pkg: version set to 5.6.4 for rpms and alpine specs
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Module: kamailio Branch: 5.6 Commit: 93aaf27bb49f65c42f78ecbd9942f272d79a4b10 URL: https://github.com/kamailio/kamailio/commit/93aaf27bb49f65c42f78ecbd9942f27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-27T09:56:17+01:00 pkg: version set to 5.6.4 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/93aaf27bb49f65c42f78ecbd9942f27… Patch: https://github.com/kamailio/kamailio/commit/93aaf27bb49f65c42f78ecbd9942f27… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 5afbd8bfabb..bd3a5e53d89 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.6.3 +pkgver=5.6.4 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5a848948632..d24176a384e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.6.3 +%define ver 5.6.4 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.6:c04c950d: pkg: deb specs updated for v5.6.4
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Module: kamailio Branch: 5.6 Commit: c04c950deee4a421d6a978adf977a8d856da9ebc URL: https://github.com/kamailio/kamailio/commit/c04c950deee4a421d6a978adf977a8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-27T10:02:48+01:00 pkg: deb specs updated for v5.6.4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/c04c950deee4a421d6a978adf977a8d… Patch: https://github.com/kamailio/kamailio/commit/c04c950deee4a421d6a978adf977a8d…

1 0

Releasing v5.6.4
by Daniel-Constantin Mierla 27 Feb '23

27 Feb '23

Hello, I am considering to release Kamailio v5.6.4 (out of branch 5.6) next week (likely on Monday or Tuesday, Feb 27/28, 2023). If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com Kamailio Advanced Training - Online - March 27-30, 2023 - www.asipto.com

1 1

[kamailio/kamailio] hiops moduls (#2209)
by mojtabaesfandiari 26 Feb '23

26 Feb '23

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2209 -- Commit Summary -- * add received_in_via function(use it in hiops module) * hiops: new module in Kamailio -- File Changes -- M src/core/msg_translator.c (25) M src/core/msg_translator.h (3) A src/modules/hiops/Alarm-Indicator.c (153) A src/modules/hiops/Alarm-Indicator.h (57) A src/modules/hiops/BIT_STRING.c (189) A src/modules/hiops/BIT_STRING.h (33) A src/modules/hiops/CMakeLists.txt (92) A src/modules/hiops/Code.c (64) A src/modules/hiops/Code.h (49) A src/modules/hiops/CommunicationIdentifier.c (94) A src/modules/hiops/CommunicationIdentifier.h (43) A src/modules/hiops/GeneralizedTime.c (706) A src/modules/hiops/GeneralizedTime.h (69) A src/modules/hiops/HI1-Operation.c (94) A src/modules/hiops/HI1-Operation.h (61) A src/modules/hiops/IA5String.c (77) A src/modules/hiops/IA5String.h (27) A src/modules/hiops/INTEGER.c (1025) A src/modules/hiops/INTEGER.h (82) A src/modules/hiops/IP-value.c (130) A src/modules/hiops/IP-value.h (55) A src/modules/hiops/IPAddress.c (393) A src/modules/hiops/IPAddress.h (67) A src/modules/hiops/LawfulInterceptionIdentifier.c (126) A src/modules/hiops/LawfulInterceptionIdentifier.h (38) A src/modules/hiops/LocalTimeStamp.c (191) A src/modules/hiops/LocalTimeStamp.h (50) A src/modules/hiops/Makefile (15) A src/modules/hiops/National-HI1-ASN1parameters.c (139) A src/modules/hiops/National-HI1-ASN1parameters.h (43) A src/modules/hiops/NativeEnumerated.c (207) A src/modules/hiops/NativeEnumerated.h (32) A src/modules/hiops/NativeInteger.c (332) A src/modules/hiops/NativeInteger.h (37) A src/modules/hiops/Network-Element-Identifier.c (198) A src/modules/hiops/Network-Element-Identifier.h (60) A src/modules/hiops/Network-Identifier.c (94) A src/modules/hiops/Network-Identifier.h (48) A src/modules/hiops/Notification.c (153) A src/modules/hiops/Notification.h (57) A src/modules/hiops/OBJECT_IDENTIFIER.c (764) A src/modules/hiops/OBJECT_IDENTIFIER.h (139) A src/modules/hiops/OCTET_STRING.c (1807) A src/modules/hiops/OCTET_STRING.h (86) A src/modules/hiops/PrintableString.c (109) A src/modules/hiops/PrintableString.h (24) A src/modules/hiops/Priority.c (125) A src/modules/hiops/Priority.h (38) A src/modules/hiops/TimeStamp.c (64) A src/modules/hiops/TimeStamp.h (49) A src/modules/hiops/UTCTime.c (179) A src/modules/hiops/UTCTime.h (38) A src/modules/hiops/asn_application.h (47) A src/modules/hiops/asn_codecs.h (109) A src/modules/hiops/asn_codecs_prim.c (312) A src/modules/hiops/asn_codecs_prim.h (53) A src/modules/hiops/asn_internal.h (128) A src/modules/hiops/asn_system.h (137) A src/modules/hiops/ber_decoder.c (283) A src/modules/hiops/ber_decoder.h (64) A src/modules/hiops/ber_tlv_length.c (178) A src/modules/hiops/ber_tlv_length.h (50) A src/modules/hiops/ber_tlv_tag.c (144) A src/modules/hiops/ber_tlv_tag.h (60) A src/modules/hiops/constr_CHOICE.c (1114) A src/modules/hiops/constr_CHOICE.h (57) A src/modules/hiops/constr_SEQUENCE.c (1425) A src/modules/hiops/constr_SEQUENCE.h (60) A src/modules/hiops/constr_TYPE.c (77) A src/modules/hiops/constr_TYPE.h (180) A src/modules/hiops/constraints.c (93) A src/modules/hiops/constraints.h (63) A src/modules/hiops/der_encoder.c (201) A src/modules/hiops/der_encoder.h (68) A src/modules/hiops/hi1ops.c (682) A src/modules/hiops/hi1ops.h (102) A src/modules/hiops/hi2ops.c (1319) A src/modules/hiops/hi2ops.h (109) A src/modules/hiops/hiops.c (272) A src/modules/hiops/hiops.h (38) A src/modules/hiops/per_decoder.c (93) A src/modules/hiops/per_decoder.h (56) A src/modules/hiops/per_encoder.c (151) A src/modules/hiops/per_encoder.h (69) A src/modules/hiops/per_opentype.c (378) A src/modules/hiops/per_opentype.h (22) A src/modules/hiops/per_support.c (483) A src/modules/hiops/per_support.h (135) A src/modules/hiops/tcp_socket.c (136) A src/modules/hiops/tcp_socket.h (39) A src/modules/hiops/xer_decoder.c (368) A src/modules/hiops/xer_decoder.h (106) A src/modules/hiops/xer_encoder.c (67) A src/modules/hiops/xer_encoder.h (59) A src/modules/hiops/xer_support.c (227) A src/modules/hiops/xer_support.h (55) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2209.patch https://github.com/kamailio/kamailio/pull/2209.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/2209

5 17

git:5.5:b825f14b: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.5 Commit: b825f14b7ef3fb92363bc56e753c65e6eda44c88 URL: https://github.com/kamailio/kamailio/commit/b825f14b7ef3fb92363bc56e753c65e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-24T17:47:03+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ctl/README Modified: src/modules/exec/README Modified: src/modules/ims_dialog/README Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/b825f14b7ef3fb92363bc56e753c65e… Patch: https://github.com/kamailio/kamailio/commit/b825f14b7ef3fb92363bc56e753c65e…

1 0

git: new commits in branch 5.5
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

- URL: https://github.com/kamailio/kamailio/commit/f39f172ffb29035082eec3e580a0aa0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:29:00+01:00 corex: added fixup free functions in module exports (cherry picked from commit d5ae9019dcdfe5b51ce87f6957902abbaa7fa071) (cherry picked from commit 19aab1894ba88bc7152e00a84819d991937665a6) - URL: https://github.com/kamailio/kamailio/commit/8e64e5c29a0e03e29f33f2c562ee0ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:32:29+01:00 keepalive: removed redundant checks (cherry picked from commit cbe6cef58da8de7efa18c4e34458a81176d23e42) (cherry picked from commit 0ead35429a85800105178f7a8427d94ad390da33) - URL: https://github.com/kamailio/kamailio/commit/d721e45054f31899930d0833c06f563… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:33:00+01:00 kex: added fixup free functions to module exports (cherry picked from commit c8bd10f791ef7aa48a16104472b039a8ca1a53c5) (cherry picked from commit 46cd2b6732a1bcd49c31a4a4a1173d0b27ce39a1) - URL: https://github.com/kamailio/kamailio/commit/56941d00b9ed96da159eeba543cc1f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:34:26+01:00 secsipid: iterate through all Identity headers (cherry picked from commit cd3b776649e652b5d27b2718c22f08736b1e9e84) (cherry picked from commit a0e89d8fad7e764478b0ff69e1fe335fcd7104a9) - URL: https://github.com/kamailio/kamailio/commit/307a2bb2a6174ecc879978c74fbb68d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:34:34+01:00 secsipid: debug message if identity header is not found (cherry picked from commit 0920aa1a27565bc52fd1ff9f4b9fc31dbd0d2a75) (cherry picked from commit bea811e2a6e8b12f8491b7e46bcc58ad66c9e225) - URL: https://github.com/kamailio/kamailio/commit/887b53b23e2ba713eac46316bea343e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:34:46+01:00 secsipid: ensure headers are parsed (cherry picked from commit a0d9deb9f852f887bed7c0809f3056b5f75379c8) (cherry picked from commit a2c4e0efdb03ba31ddb295fbfd2d95a393480906) - URL: https://github.com/kamailio/kamailio/commit/dda9fa437786304ac0f2e726cf56400… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:34:57+01:00 websocket: more details on debig messages (cherry picked from commit e7bd1570e3788e9d04047b4d1d00cb8bd8b172d3) (cherry picked from commit af3a249364b20e46cc80a6ae6ea8c04c9d10513b) - URL: https://github.com/kamailio/kamailio/commit/047e71f4eae1ba76034adca72a5cd98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:35:26+01:00 sipcapture: debug message with header offset and address family (cherry picked from commit 7f258d97431a9a4bccf8155def52c9e9070c9f1d) (cherry picked from commit caf8465d6f56c5891b8398814d3e66ad4996b386) - URL: https://github.com/kamailio/kamailio/commit/aba29b7bca17de61eaa6740a45365bf… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2023-02-24T17:36:12+01:00 tm: cleanup parsed body at the end t_continue_helper - if t_suspend and t_continue are used for replies and in the called route in t_continue the body of the sip message is parsed the pkg memory of the parsed body is leaked (cherry picked from commit f409a8c9f6fde33eaf8b428887e219b56740b0a5) (cherry picked from commit 7e12f4f5951ebcd40bc7779b6c7bf71081c38481) - URL: https://github.com/kamailio/kamailio/commit/8b9b056073d214755073f38b9eb44f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:36:25+01:00 core: tcp - debug message on no connect (cherry picked from commit 5fee7d818f18afcab4d2e17231d2e4eab79b7b48) (cherry picked from commit 0ba02031953029c3e4820264503400cbd9e14924) - URL: https://github.com/kamailio/kamailio/commit/0478e3d5022abcdc7f1dd15062d1633… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:38:48+01:00 websocket: ignore keepalive in state WS_S_REMOVING - GH #3331 (cherry picked from commit 34c3c42b7fe44dbe88110415ec78400a7defde61) (cherry picked from commit d59c64514f032a73a1f6aa65051f81b8784a5713) - URL: https://github.com/kamailio/kamailio/commit/8f8614fae4ae18cfe3d8011b5126d7e… Author: Sandro Gauci <sandro(a)enablesecurity.com> Date: 2023-02-24T17:38:58+01:00 exec: docs - added security warning - Added warning about potential for OS Command Injection - Updated invalid examples previous example gives the following error: pv_parse_spec2(): error searching pvar "rU.txt" (cherry picked from commit f81f0e77c5ab67431af1f62f0e027379a3445951) (cherry picked from commit ee7d314422003fc6edfbc364015499e38e18ae62) - URL: https://github.com/kamailio/kamailio/commit/844a6e131e6fd522da58ceb2b9f4ec1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:39:11+01:00 ims_dialog: fix module name in modparam examples (cherry picked from commit a4150741748779bba8e14bed286c6d64b1df7f17) (cherry picked from commit 6f3a48124cedc04332e45e9f38f54ed5acb1027d) - URL: https://github.com/kamailio/kamailio/commit/40b09a423a9d7b8fe1093831ad335b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:39:59+01:00 core: typos in comments and EoL after log when parse msg fails - GH #3348 (cherry picked from commit 51fa3da96c1eacd4d679598a3305180c9e818cfb) (cherry picked from commit b2e872799d8a694bd433193ec8157ab1d329edaa) - URL: https://github.com/kamailio/kamailio/commit/27ff2fba44bda772b66a8d6c8f4e8d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:40:52+01:00 rr: doc - fixed typos and use the proper param name add_username instead of enable_username (cherry picked from commit 022fa0cfc75d150fde219b8ae4f9a99b3fa2f132) (cherry picked from commit 1107423f6af0df4d788216324d6547247fa22224) - URL: https://github.com/kamailio/kamailio/commit/550f9d63b29110c8f5a2d736041c5ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:41:14+01:00 lib/ims: check return of strtok(...) (cherry picked from commit 63095ef1bef36a35952ed265f41d87ccbc1bba70) (cherry picked from commit 6796e7faeef7c0af9805b07e4f29c6924d8f3edc) - URL: https://github.com/kamailio/kamailio/commit/a735a7932711236115cdcf08c18b923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:41:26+01:00 async: catch up on possible skipped slots due to slow tasks (cherry picked from commit 0a3c15239a620474bbbc7f4d2f57dda0e9aa0f58) (cherry picked from commit 89a65b849a392fea8a46b1e6ae8309c764cdf81e) - URL: https://github.com/kamailio/kamailio/commit/2ce7feed92c5751948c963ffb1bdd5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:41:37+01:00 ctl: doc - binrpc_buffer_size can get only integer value (cherry picked from commit 44381746e0e826e8db04597942fa4cee6cbf9175) (cherry picked from commit a914333bbac7b52943dc8d9d58bf15614b6497d5) - URL: https://github.com/kamailio/kamailio/commit/1d14e1ba4c5fb5b0bc5121fdcd95c26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T17:41:47+01:00 topos: use proper field for datetime value (cherry picked from commit 446892331900c2303e531da55bcb494ccb2d8bce) (cherry picked from commit 74416f1fe93dad9ce62c1f31daeb6385d92c3f74) - URL: https://github.com/kamailio/kamailio/commit/8e9144c5f73993a312d0a0bd526a7b0… Author: POIROTTE Francois <francois.poirotte(a)csgroup.eu> Date: 2023-02-24T17:42:01+01:00 kamctl: hide errors raised by "which" Hide error messages from "which" to avoid polluting kamctl's output (e.g. when a JSON document is returned) in environments where STDOUT and STDERR may be combined into a single stream (e.g. containers) (cherry picked from commit a229d230bca5e785670edc3901f849e93989f9fe) (cherry picked from commit 614071020f123263b6e0c0cace652f88ac40f470)

1 0

git:5.6:b27ddcd4: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: b27ddcd40250201ac9d9051308daa48797e8071c URL: https://github.com/kamailio/kamailio/commit/b27ddcd40250201ac9d9051308daa48… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-24T14:17:07+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ctl/README Modified: src/modules/exec/README Modified: src/modules/ims_dialog/README Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/b27ddcd40250201ac9d9051308daa48… Patch: https://github.com/kamailio/kamailio/commit/b27ddcd40250201ac9d9051308daa48…

1 0

git:5.6:74416f1f: topos: use proper field for datetime value
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 74416f1fe93dad9ce62c1f31daeb6385d92c3f74 URL: https://github.com/kamailio/kamailio/commit/74416f1fe93dad9ce62c1f31daeb638… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:55:17+01:00 topos: use proper field for datetime value (cherry picked from commit 446892331900c2303e531da55bcb494ccb2d8bce) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/74416f1fe93dad9ce62c1f31daeb638… Patch: https://github.com/kamailio/kamailio/commit/74416f1fe93dad9ce62c1f31daeb638… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 56d56776a42..e0649b683d3 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -890,7 +890,7 @@ int tps_db_insert_branch(tps_data_t *td) db_keys[nr_keys] = &tt_col_rectime; db_vals[nr_keys].type = DB1_DATETIME; - db_vals[nr_keys].val.int_val = time(NULL); + db_vals[nr_keys].val.time_val = time(NULL); nr_keys++; db_keys[nr_keys] = &tt_col_a_callid;

1 0

git:5.6:61407102: kamctl: hide errors raised by "which"
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 614071020f123263b6e0c0cace652f88ac40f470 URL: https://github.com/kamailio/kamailio/commit/614071020f123263b6e0c0cace652f8… Author: POIROTTE Francois <francois.poirotte(a)csgroup.eu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:56:26+01:00 kamctl: hide errors raised by "which" Hide error messages from "which" to avoid polluting kamctl's output (e.g. when a JSON document is returned) in environments where STDOUT and STDERR may be combined into a single stream (e.g. containers) (cherry picked from commit a229d230bca5e785670edc3901f849e93989f9fe) --- Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/614071020f123263b6e0c0cace652f8… Patch: https://github.com/kamailio/kamailio/commit/614071020f123263b6e0c0cace652f8… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index f3b9e1f6670..164a867bd9b 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -10,7 +10,7 @@ locate_tool() { while [ -n "$1" ] do if [ -x /usr/bin/which ] ; then - TOOLPATH=`which $1` + TOOLPATH=`which $1 2> /dev/null` if [ -n "$TOOLPATH" ]; then return fi

1 0

git:5.6:a914333b: ctl: doc - binrpc_buffer_size can get only integer value
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: a914333bbac7b52943dc8d9d58bf15614b6497d5 URL: https://github.com/kamailio/kamailio/commit/a914333bbac7b52943dc8d9d58bf156… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:54:17+01:00 ctl: doc - binrpc_buffer_size can get only integer value (cherry picked from commit 44381746e0e826e8db04597942fa4cee6cbf9175) --- Modified: src/modules/ctl/doc/ctl_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/a914333bbac7b52943dc8d9d58bf156… Patch: https://github.com/kamailio/kamailio/commit/a914333bbac7b52943dc8d9d58bf156… --- diff --git a/src/modules/ctl/doc/ctl_params.xml b/src/modules/ctl/doc/ctl_params.xml index 558d706464c..5f944d79857 100644 --- a/src/modules/ctl/doc/ctl_params.xml +++ b/src/modules/ctl/doc/ctl_params.xml @@ -90,7 +90,7 @@ modparam("ctl", "binrpc", "udp:*:3012") # udp any , port 3012 </section> <section id="binrpc_buffer_size"> - <title><varname>binrpc_buffer_size</varname> (integer or string)</title> + <title><varname>binrpc_buffer_size</varname> (integer)</title> <para> The size of the internal buffer used for printing elements of the RPC response (e.g., internal RPC printf()). The value is given in bytes.

1 0

git:5.6:6796e7fa: lib/ims: check return of strtok(...)
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 6796e7faeef7c0af9805b07e4f29c6924d8f3edc URL: https://github.com/kamailio/kamailio/commit/6796e7faeef7c0af9805b07e4f29c69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:53:21+01:00 lib/ims: check return of strtok(...) (cherry picked from commit 63095ef1bef36a35952ed265f41d87ccbc1bba70) --- Modified: src/lib/ims/ims_getters.c --- Diff: https://github.com/kamailio/kamailio/commit/6796e7faeef7c0af9805b07e4f29c69… Patch: https://github.com/kamailio/kamailio/commit/6796e7faeef7c0af9805b07e4f29c69… --- diff --git a/src/lib/ims/ims_getters.c b/src/lib/ims/ims_getters.c index 26fdbb8c418..56816be422f 100644 --- a/src/lib/ims/ims_getters.c +++ b/src/lib/ims/ims_getters.c @@ -1247,12 +1247,13 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, LM_DBG("p_charging_vector body is %.*s\n", header_body.len, header_body.s); p = strtok(header_body.s, " ;:\r\t\n\"="); - loop: if (p > (header_body.s + header_body.len)) +loop: + if (p == NULL || p > (header_body.s + header_body.len)) return 1; if (strncmp(p, "icid-value", 10) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); - if (p > (header_body.s + header_body.len)) { + if (p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); return 0; } @@ -1272,7 +1273,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, } else if (strncmp(p, "orig-ioi", 8) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); - if (p > (header_body.s + header_body.len)) { + if (p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); return 0; } @@ -1292,7 +1293,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, } else if (strncmp(p, "term-ioi", 8) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); - if (p > (header_body.s + header_body.len)) { + if (p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); return 0; } @@ -1314,7 +1315,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, LM_DBG("end\n"); str_free(header_body, pkg); return 1; - out_of_memory: +out_of_memory: PKG_MEM_ERROR; return 0; }

1 0

git:5.6:89a65b84: async: catch up on possible skipped slots due to slow tasks
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 89a65b849a392fea8a46b1e6ae8309c764cdf81e URL: https://github.com/kamailio/kamailio/commit/89a65b849a392fea8a46b1e6ae8309c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:53:51+01:00 async: catch up on possible skipped slots due to slow tasks (cherry picked from commit 0a3c15239a620474bbbc7f4d2f57dda0e9aa0f58) --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/89a65b849a392fea8a46b1e6ae8309c… Patch: https://github.com/kamailio/kamailio/commit/89a65b849a392fea8a46b1e6ae8309c… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 02c3b8d488f..d6dd41d3f17 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -271,9 +271,12 @@ int async_sleep(sip_msg_t *msg, int seconds, cfg_action_t *act, str *cbname) return 0; } +static unsigned int _async_timer_exec_last_slot = -1; + void async_timer_exec(unsigned int ticks, void *param) { - int slot; + unsigned int idx; + unsigned int slot; async_item_t *ai; sr_kemi_eng_t *keng = NULL; str cbname = STR_NULL; @@ -282,33 +285,55 @@ void async_timer_exec(unsigned int ticks, void *param) if(_async_list_head == NULL) return; - slot = ticks % ASYNC_RING_SIZE; + idx = ticks % ASYNC_RING_SIZE; - while(1) { - lock_get(&_async_list_head->ring[slot].lock); - ai = _async_list_head->ring[slot].lstart; - if(ai != NULL) - _async_list_head->ring[slot].lstart = ai->next; - lock_release(&_async_list_head->ring[slot].lock); + if(idx == _async_timer_exec_last_slot) { + /* timer faster than 1sec */ + return; + } - if(ai == NULL) - break; - if(ai->ract != NULL) { - tmb.t_continue(ai->tindex, ai->tlabel, ai->ract); - ksr_msg_env_reset(); - } else { - keng = sr_kemi_eng_get(); - if(keng != NULL && ai->cbname_len>0) { - cbname.s = ai->cbname; - cbname.len = ai->cbname_len; - tmb.t_continue_cb(ai->tindex, ai->tlabel, &cbname, &evname); + if(_async_timer_exec_last_slot < 0) { + _async_timer_exec_last_slot = idx; + } + slot = (_async_timer_exec_last_slot + 1) % ASYNC_RING_SIZE; + if(slot != idx) { + LM_DBG("need to catch up from slot %u to %u (slots: %u)\n", slot, idx, + ASYNC_RING_SIZE); + } + + do { + while(1) { + lock_get(&_async_list_head->ring[slot].lock); + ai = _async_list_head->ring[slot].lstart; + if(ai != NULL) + _async_list_head->ring[slot].lstart = ai->next; + lock_release(&_async_list_head->ring[slot].lock); + + if(ai == NULL) + break; + if(ai->ract != NULL) { + tmb.t_continue(ai->tindex, ai->tlabel, ai->ract); ksr_msg_env_reset(); } else { - LM_WARN("no callback to be executed\n"); + keng = sr_kemi_eng_get(); + if(keng != NULL && ai->cbname_len>0) { + cbname.s = ai->cbname; + cbname.len = ai->cbname_len; + tmb.t_continue_cb(ai->tindex, ai->tlabel, &cbname, &evname); + ksr_msg_env_reset(); + } else { + LM_WARN("no callback to be executed\n"); + } } + shm_free(ai); } - shm_free(ai); - } + if(slot == idx) { + break; + } + slot = (slot + 1) % ASYNC_RING_SIZE; + } while(1); + + _async_timer_exec_last_slot = idx; } void async_mstimer_exec(unsigned int ticks, void *param)

1 0

git:5.6:6f3a4812: ims_dialog: fix module name in modparam examples
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 6f3a48124cedc04332e45e9f38f54ed5acb1027d URL: https://github.com/kamailio/kamailio/commit/6f3a48124cedc04332e45e9f38f54ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:51:45+01:00 ims_dialog: fix module name in modparam examples (cherry picked from commit a4150741748779bba8e14bed286c6d64b1df7f17) --- Modified: src/modules/ims_dialog/doc/ims_dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6f3a48124cedc04332e45e9f38f54ed… Patch: https://github.com/kamailio/kamailio/commit/6f3a48124cedc04332e45e9f38f54ed… --- diff --git a/src/modules/ims_dialog/doc/ims_dialog_admin.xml b/src/modules/ims_dialog/doc/ims_dialog_admin.xml index 5a2ddc95857..d5be1347b52 100644 --- a/src/modules/ims_dialog/doc/ims_dialog_admin.xml +++ b/src/modules/ims_dialog/doc/ims_dialog_admin.xml @@ -410,7 +410,7 @@ modparam("ims_dialog", "detect_spirals", 1) </title> <programlisting format="linespecific"> ... -modparam("dialog", "profiles_with_value", "caller ; my_profile") +modparam("ims_dialog", "profiles_with_value", "caller ; my_profile") ... </programlisting> </example> @@ -435,7 +435,7 @@ modparam("dialog", "profiles_with_value", "caller ; my_profile") </title> <programlisting format="linespecific"> ... -modparam("dialog", "profiles_no_value", "inbound ; outbound") +modparam("ims_dialog", "profiles_no_value", "inbound ; outbound") ... </programlisting> </example> @@ -460,7 +460,7 @@ modparam("dialog", "profiles_no_value", "inbound ; outbound") </title> <programlisting format="linespecific"> ... -modparam("dialog", "bridge_controller", "sip:ctd@kamailio.org") +modparam("ims_dialog", "bridge_controller", "sip:ctd@kamailio.org") ... </programlisting> </example>

1 0

git:5.6:b2e87279: core: typos in comments and EoL after log when parse msg fails
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: b2e872799d8a694bd433193ec8157ab1d329edaa URL: https://github.com/kamailio/kamailio/commit/b2e872799d8a694bd433193ec8157ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:52:43+01:00 core: typos in comments and EoL after log when parse msg fails - GH #3348 (cherry picked from commit 51fa3da96c1eacd4d679598a3305180c9e818cfb) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/b2e872799d8a694bd433193ec8157ab… Patch: https://github.com/kamailio/kamailio/commit/b2e872799d8a694bd433193ec8157ab… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index bc1b9736df8..3ab6fae4725 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -53,7 +53,7 @@ * lookup is performed on the host part and the reply is sent to the * resulting ip. If a port is present or the host part is an ip address * the dns lookup will be a "normal" one (A or AAAA). - * - if rport is present, it's value will be used as the destination port + * - if rport is present, its value will be used as the destination port * (and this will also disable srv lookups) * - if no port is present the destination port will be taken from the srv * lookup. If the srv lookup fails or is not performed (e.g. ip address @@ -1459,7 +1459,7 @@ void process_lumps( struct sip_msg* msg, /* skip len bytes from orig msg */ s_offset+=t->len; } else if (t->op==LUMP_DEL && flag == FLAG_MSG_LUMPS_ONLY) { - /* copy lump value and indent as necessarely */ + /* copy lump value and indent as necessarily */ memcpy(new_buf+offset, orig + t->u.offset, t->len); offset+=t->len; if (new_buf[offset-1] != '\n') { @@ -1592,7 +1592,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto) /* The body has been changed, try to find * existing Content-Length */ - /* no need for Content-Length if it's and UDP packet and + /* no need for Content-Length if it's an UDP packet and * it hasn't Content-Length already */ if (msg->content_length==0){ /* content-length doesn't exist, append it */ @@ -1938,7 +1938,7 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) /** builds a request in memory from another sip request. * * Side-effects: - it adds lumps to the msg which are _not_ cleaned. - * The added lumps are HDR_VIA_T (almost always added), HDR_CONTENLENGTH_T + * The added lumps are HDR_VIA_T (almost always added), HDR_CONTENTLENGTH_T * and HDR_ROUTE_T (when a Route: header is added as a result of a non-null * msg->path_vec). * - it might change send_info->proto and send_info->send_socket @@ -2109,7 +2109,7 @@ char * build_req_buf_from_sip_req(struct sip_msg* msg, } received_buf = NULL; } - /* if rport needs to be updated, delete it if present and add it's value */ + /* if rport needs to be updated, delete it if present and add its value */ if (rport_buf){ if (msg->via1->rport){ /* rport already present */ via_insert_param=del_lump(msg, @@ -3075,7 +3075,7 @@ char* create_via_hf(unsigned int *len, /* builds a char* buffer from message headers without body * first line is excluded in case of skip_first_line=1 - * error is set -1 if the memory allocation failes + * error is set -1 if the memory allocation fails */ char * build_only_headers( struct sip_msg* msg, int skip_first_line, unsigned int *returned_len, @@ -3127,7 +3127,7 @@ char * build_only_headers( struct sip_msg* msg, int skip_first_line, } /* builds a char* buffer from message body - * error is set -1 if the memory allocation failes + * error is set -1 if the memory allocation fails */ char * build_body( struct sip_msg* msg, unsigned int *returned_len, @@ -3253,7 +3253,7 @@ int build_sip_msg_from_buf(struct sip_msg *msg, char *buf, int len, msg->buf = buf; msg->len = len; if (parse_msg(buf, len, msg)!=0) { - LM_ERR("parsing failed"); + LM_ERR("parsing failed\n"); return -1; } msg->set_global_address=default_global_address;

1 0

git:5.6:1107423f: rr: doc - fixed typos and use the proper param name add_username instead of enable_username
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: 1107423f6af0df4d788216324d6547247fa22224 URL: https://github.com/kamailio/kamailio/commit/1107423f6af0df4d788216324d65472… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:52:57+01:00 rr: doc - fixed typos and use the proper param name add_username instead of enable_username (cherry picked from commit 022fa0cfc75d150fde219b8ae4f9a99b3fa2f132) --- Modified: src/modules/rr/doc/rr_admin.xml Modified: src/modules/rr/doc/rr_devel.xml --- Diff: https://github.com/kamailio/kamailio/commit/1107423f6af0df4d788216324d65472… Patch: https://github.com/kamailio/kamailio/commit/1107423f6af0df4d788216324d65472… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 98bad1239f2..c1ad84277ed 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -12,7 +12,7 @@ <section> <title>Overview</title> - <para>The module contains record routing logic</para> + <para>The module contains record routing logic.</para> </section> <section id="RR-dialog-id"> @@ -20,7 +20,7 @@ <para>&kamailio; is basically <emphasis>only</emphasis> a transaction stateful proxy, without any dialog support build in. There are many - features/services which actually requires a dialog awareness, like storing + features/services which actually require a dialog awareness, like storing the information in the dialog creation stage, information which will be used during the whole dialog existence.</para> @@ -246,7 +246,7 @@ modparam("rr", "enable_socket_mismatch_warning", 0) <section id="rr.p.custom_user_avp"> <title><varname>custom_user_avp</varname> (avp string)</title> - <para>When enable_username is enabled, a call to record_route will add + <para>When add_username is enabled, a call to record_route will add the username of the RequestURI to the Record-Route URI. This parameter allows you to setup an AVP with which you can customise the username to be added in the Record-Route URI.</para> @@ -664,7 +664,7 @@ add_rr_param(";nat=yes"); <para>The function checks if the URI parameters of the local Route header (corresponding to the local server) matches the given regular - expression. It must be call after loose_route() (see <xref + expression. It must be called after loose_route() (see <xref linkend="rr.f.loose_route"/>).</para> <para>Meaning of the parameters is as follows:</para> diff --git a/src/modules/rr/doc/rr_devel.xml b/src/modules/rr/doc/rr_devel.xml index 9d16ea0791f..a451c4fb4dd 100644 --- a/src/modules/rr/doc/rr_devel.xml +++ b/src/modules/rr/doc/rr_devel.xml @@ -128,7 +128,7 @@ record_route_advertised_address("1.2.3.4:5090"); The function checks for the request <quote>msg</quote> if the URI parameters of the local Route header (corresponding to the local server) matches the given regular expression <quote>re</quote>. - It must be call after the loose_route was done. + It must be called after the loose_route was done. </para> <para> The function returns 0 on success. Otherwise, -1 is returned. @@ -157,7 +157,7 @@ record_route_advertised_address("1.2.3.4:5090"); <quote>msg</quote>. As for checking it's used the <quote>ftag</quote> Route header parameter, the append_fromtag (see <xref linkend="append-fromtag-id"/> module parameter - must be enables. Also this must be call only after the loose_route is + must be enables. Also this must be called only after the loose_route is done. </para> <para> @@ -185,9 +185,9 @@ record_route_advertised_address("1.2.3.4:5090"); <function moreinfo="none">get_route_param( msg, name, val)</function> </title> <para> - The function search in to the <quote>msg</quote>'s Route header + The function searches in the <quote>msg</quote>'s Route header parameters the parameter called <quote>name</quote> and returns its - value into <quote>val</quote>. It must be call only after the + value into <quote>val</quote>. It must be called only after the loose_route is done. </para> <para> @@ -220,7 +220,7 @@ record_route_advertised_address("1.2.3.4:5090"); <function moreinfo="none">register_rrcb( callback, param)</function> </title> <para> - The function register a new callback (along with its parameter). The + The function registers a new callback (along with its parameter). The callback will be called when a loose route will be performed for the local address. </para>

1 0

git:5.6:d59c6451: websocket: ignore keepalive in state WS_S_REMOVING
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: d59c64514f032a73a1f6aa65051f81b8784a5713 URL: https://github.com/kamailio/kamailio/commit/d59c64514f032a73a1f6aa65051f81b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:49:54+01:00 websocket: ignore keepalive in state WS_S_REMOVING - GH #3331 (cherry picked from commit 34c3c42b7fe44dbe88110415ec78400a7defde61) --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/d59c64514f032a73a1f6aa65051f81b… Patch: https://github.com/kamailio/kamailio/commit/d59c64514f032a73a1f6aa65051f81b… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 583e9040522..c7927b16f43 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -809,13 +809,18 @@ void ws_keepalive(unsigned int ticks, void *param) LM_WARN("forcibly closing connection\n"); wsconn_close_now(wsc); } else if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_CONCHECK) { - tcp_connection_t *con = tcpconn_get(wsc->id, 0, 0, 0, 0); - if(con==NULL) { - LM_INFO("tcp connection has been lost (id: %d wsc: %p)\n", + if(wsc->state == WS_S_REMOVING) { + LM_DBG("ws (id: %d wsc: %p) in removing state ignoring keepalive\n", wsc->id, wsc); - wsc->state = WS_S_CLOSING; } else { - tcpconn_put(con); + tcp_connection_t *con = tcpconn_get(wsc->id, 0, 0, 0, 0); + if(con==NULL) { + LM_INFO("tcp connection has been lost (id: %d wsc: %p)\n", + wsc->id, wsc); + wsc->state = WS_S_CLOSING; + } else { + tcpconn_put(con); + } } } else { int opcode = (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_PING)

1 0

git:5.6:ee7d3144: exec: docs - added security warning
by Daniel-Constantin Mierla 24 Feb '23

24 Feb '23

Module: kamailio Branch: 5.6 Commit: ee7d314422003fc6edfbc364015499e38e18ae62 URL: https://github.com/kamailio/kamailio/commit/ee7d314422003fc6edfbc364015499e… Author: Sandro Gauci <sandro(a)enablesecurity.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-24T13:50:24+01:00 exec: docs - added security warning - Added warning about potential for OS Command Injection - Updated invalid examples previous example gives the following error: pv_parse_spec2(): error searching pvar "rU.txt" (cherry picked from commit f81f0e77c5ab67431af1f62f0e027379a3445951) --- Modified: src/modules/exec/doc/exec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ee7d314422003fc6edfbc364015499e… Patch: https://github.com/kamailio/kamailio/commit/ee7d314422003fc6edfbc364015499e… --- diff --git a/src/modules/exec/doc/exec_admin.xml b/src/modules/exec/doc/exec_admin.xml index 12249d5104a..9dee3522d66 100644 --- a/src/modules/exec/doc/exec_admin.xml +++ b/src/modules/exec/doc/exec_admin.xml @@ -77,6 +77,23 @@ Otherwise they will be evaluated as &kamailio; pseudo-variables, throwing errors. </para> + <para> + WARNING: if the exec functions are passed variables that might include + malicious input, then remote attackers may abuse the exec functions to + execute arbitrary code. Specifically, this may result in OS command injection. + In such cases, input validation is required to prevent the vulnerability. + The following is an example of how input validation and exec module + functions may be used together to prevent exploitation: + </para> + <programlisting format="linespecific"> +... +if !($rU =~ "^[0-9]{1,15}$") { + xlog("Malformed R-URI username: '$rU'\n"); + exit; +} +exec_msg("echo TEST >> /tmp/$(rU).txt"); +... + </programlisting> </section> <section> @@ -186,7 +203,7 @@ modparam("exec", "time_to_kill", 20) <programlisting format="linespecific"> ... exec_dset("echo TEST > /tmp/test.txt"); -exec_dset("echo TEST > /tmp/$rU.txt"); +exec_dset("echo TEST > /tmp/$(rU).txt"); ... </programlisting> </example> @@ -225,7 +242,7 @@ exec_dset("echo TEST > /tmp/$rU.txt"); <programlisting format="linespecific"> ... exec_msg("echo TEST > /tmp/test.txt"); -exec_msg("echo TEST > /tmp/$rU.txt"); +exec_msg("echo TEST > /tmp/$(rU).txt"); ... </programlisting> </example> @@ -300,7 +317,7 @@ exec_avp("echo TEST", "$avp(s:test)"); <programlisting format="linespecific"> ... exec_cmd("echo TEST > /tmp/test.txt"); -exec_cmd("echo TEST > /tmp/$rU.txt"); +exec_cmd("echo TEST > /tmp/$(rU).txt"); ... </programlisting> </example> @@ -315,4 +332,3 @@ exec_cmd("echo TEST > /tmp/$rU.txt"); </para> </section> </chapter> -

1 0

Info: Registration to Kamailio World 2023 is open!
by Daniel-Constantin Mierla 20 Feb '23

20 Feb '23

Hello, a quick note to the community forums to announce that the registration for the next Kamailio World Conference (June 5-7, 2022, in Berlin, Germany) is now open! The event returns to an in-person conference format, at the same wonderful location in the city center of Berlin! More details are available at: * https://www.kamailioworld.com/k2023/registration/ Call for presentations is also open, there is already a group of very interesting submissions, we aim to publish details about them in the near future. Looking forward to meeting many of you in Berlin! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com Kamailio Advanced Training - Online - March 27-30, 2023 - www.asipto.com

1 0

git:master:a229d230: kamctl: hide errors raised by "which"
by Daniel-Constantin Mierla 17 Feb '23

17 Feb '23

Module: kamailio Branch: master Commit: a229d230bca5e785670edc3901f849e93989f9fe URL: https://github.com/kamailio/kamailio/commit/a229d230bca5e785670edc3901f849e… Author: POIROTTE Francois <francois.poirotte(a)csgroup.eu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-17T16:41:08+01:00 kamctl: hide errors raised by "which" Hide error messages from "which" to avoid polluting kamctl's output (e.g. when a JSON document is returned) in environments where STDOUT and STDERR may be combined into a single stream (e.g. containers) --- Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/a229d230bca5e785670edc3901f849e… Patch: https://github.com/kamailio/kamailio/commit/a229d230bca5e785670edc3901f849e… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 40e4f09b905..08cd4412054 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -10,7 +10,7 @@ locate_tool() { while [ -n "$1" ] do if [ -x /usr/bin/which ] ; then - TOOLPATH=`which $1` + TOOLPATH=`which $1 2> /dev/null` if [ -n "$TOOLPATH" ]; then return fi

1 0

[kamailio/kamailio] kamctl: hide errors raised by "which" (PR #3377)
by François Poirotte 17 Feb '23

17 Feb '23

#### 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 - [x] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Hide error messages from "which" to avoid polluting kamctl's output (e.g. when a JSON document is returned) in environments where STDOUT and STDERR may be combined into a single stream (e.g. containers). Without this change, kamctl's output may end up containing error messages, resulting in invalid/unparsable data. This is caused by the stdout & stderr streams being combined into a single stream in some environments, which may be outside the end-user's control (e.g. external cloud provider). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3377 -- Commit Summary -- * kamctl: hide errors raised by "which" -- File Changes -- M utils/kamctl/kamctl.base (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3377.patch https://github.com/kamailio/kamailio/pull/3377.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3377 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3377(a)github.com>

2 2

git:master:ac0edd34: dialog: Do not trigger bye_reply_cb for in-dialog requests
by Carsten Bock 16 Feb '23

16 Feb '23

Module: kamailio Branch: master Commit: ac0edd34b491dc78bca6979d2f1444c50bfb7399 URL: https://github.com/kamailio/kamailio/commit/ac0edd34b491dc78bca6979d2f1444c… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2023-02-16T16:27:39+01:00 dialog: Do not trigger bye_reply_cb for in-dialog requests --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/ac0edd34b491dc78bca6979d2f1444c… Patch: https://github.com/kamailio/kamailio/commit/ac0edd34b491dc78bca6979d2f1444c… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 4f9ebfc693..a91bcec246 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -697,7 +697,7 @@ int dlg_request_within(struct sip_msg *msg, struct dlg_cell *dlg, int side, set_uac_req(&uac_r, method, allheaders.len?&allheaders:NULL, (content && content->len)?content:NULL, dialog_info, TMCB_LOCAL_COMPLETED, - bye_reply_cb, (void*)iuid); + NULL, NULL); result = d_tmb.t_request_within(&uac_r);

2 3

git:master:c78910a7: uac: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 16 Feb '23

16 Feb '23

Module: kamailio Branch: master Commit: c78910a71226f3a567ad396ce5e834036ce75f97 URL: https://github.com/kamailio/kamailio/commit/c78910a71226f3a567ad396ce5e8340… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-16T12:07:26+01:00 uac: cast to uint64_t when using time_t value --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/c78910a71226f3a567ad396ce5e8340… Patch: https://github.com/kamailio/kamailio/commit/c78910a71226f3a567ad396ce5e8340… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 02138101c07..c9df873ab16 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -26,6 +26,7 @@ */ #include <time.h> +#include <stdint.h> #include "../../core/dprint.h" #include "../../core/timer.h" @@ -1882,7 +1883,7 @@ static int rpc_uac_reg_add_node_helper(rpc_t* rpc, void* ctx, reg_uac_t *reg, ti rpc->fault(ctx, 500, "Internal error creating rpc"); return -1; } - if (rpc->struct_add(th, "SSSSSSSSSSddddddSS", + if (rpc->struct_add(th, "SSSSSSSSSSJdddJdSS", "l_uuid", &reg->l_uuid, "l_username", &reg->l_username, "l_domain", &reg->l_domain, @@ -1896,11 +1897,11 @@ static int rpc_uac_reg_add_node_helper(rpc_t* rpc, void* ctx, reg_uac_t *reg, ti &reg->auth_ha1:&none, "auth_proxy", (reg->auth_proxy.len)? &reg->auth_proxy:&none, - "expires", (int)reg->expires, + "expires", (uint64_t)reg->expires, "flags", (int)reg->flags, "diff_expires", (int)(reg->timer_expires - tn), "timer_expires", (int)reg->timer_expires, - "reg_init", (int)reg->reg_init, + "reg_init", (uint64_t)reg->reg_init, "reg_delay", (int)reg->reg_delay, "contact_addr", (reg->contact_addr.len)? &reg->contact_addr:&none,

1 0

git:master:2f7da809: statsc: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 16 Feb '23

16 Feb '23

Module: kamailio Branch: master Commit: 2f7da809d53ffadff017681e257b8d86bec3a5ce URL: https://github.com/kamailio/kamailio/commit/2f7da809d53ffadff017681e257b8d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-16T12:16:26+01:00 statsc: cast to uint64_t when using time_t value --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2f7da809d53ffadff017681e257b8d8… Patch: https://github.com/kamailio/kamailio/commit/2f7da809d53ffadff017681e257b8d8… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 69cd335b66..3b636b81fc 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #include <time.h> #include "../../core/sr_module.h" @@ -409,8 +410,8 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) return; } if(rpc->struct_add(th, "u[", - "timestamp", (unsigned int)tn, - "stats", &ts )<0) { + "timestamp", (uint64_t)tn, + "stats", &ts)<0) { rpc->fault(ctx, 500, "Error creating rpc (2)"); return; }

1 0

git:5.5:a9deaa50: rtpengine: avoid repeated queries to same node
by Henning Westerholt 16 Feb '23

16 Feb '23

Module: kamailio Branch: 5.5 Commit: a9deaa503ff20a3384fe74e37093464c21885e44 URL: https://github.com/kamailio/kamailio/commit/a9deaa503ff20a3384fe74e37093464… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-16T11:10:10Z rtpengine: avoid repeated queries to same node If we know which node handles a particular call from the hash table, only query that node once and then return error if it's dead, instead of going into a pointless loop looking for other nodes to query which don't exist. closes #3370 (cherry picked from commit bd0ce126109f40f5217053f20e687b93b2268164) (cherry picked from commit ea782be2cc29589f4dd55f0d91c11049b5280fe0) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a9deaa503ff20a3384fe74e37093464… Patch: https://github.com/kamailio/kamailio/commit/a9deaa503ff20a3384fe74e37093464… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 62665205787..9cd3bd4061c 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3320,6 +3320,12 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer // lookup node node = select_rtpp_node_old(callid, viabranch, do_test, op); + if (node && is_queried_node(node, queried_nodes_ptr, queried_nodes)) { + LM_ERR("rtpengine node for callid=%.*s is known (%.*s) but it has already been queried, therefore not returning it\n", + callid.len, callid.s, node->rn_url.len, node->rn_url.s); + return NULL; + } + // check node if (!node || (node_in_set(node, active_rtpp_set) == 0)) { // run the selection algorithm

1 0

git:5.6:ea782be2: rtpengine: avoid repeated queries to same node
by Henning Westerholt 16 Feb '23

16 Feb '23

Module: kamailio Branch: 5.6 Commit: ea782be2cc29589f4dd55f0d91c11049b5280fe0 URL: https://github.com/kamailio/kamailio/commit/ea782be2cc29589f4dd55f0d91c1104… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-16T11:09:42Z rtpengine: avoid repeated queries to same node If we know which node handles a particular call from the hash table, only query that node once and then return error if it's dead, instead of going into a pointless loop looking for other nodes to query which don't exist. closes #3370 (cherry picked from commit bd0ce126109f40f5217053f20e687b93b2268164) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/ea782be2cc29589f4dd55f0d91c1104… Patch: https://github.com/kamailio/kamailio/commit/ea782be2cc29589f4dd55f0d91c1104… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index ab6920c01d6..1b1f8b0ca92 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3349,6 +3349,12 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer // lookup node node = select_rtpp_node_old(callid, viabranch, do_test, op); + if (node && is_queried_node(node, queried_nodes_ptr, queried_nodes)) { + LM_ERR("rtpengine node for callid=%.*s is known (%.*s) but it has already been queried, therefore not returning it\n", + callid.len, callid.s, node->rn_url.len, node->rn_url.s); + return NULL; + } + // check node if (!node || (node_in_set(node, active_rtpp_set) == 0)) { // run the selection algorithm

1 0

[kamailio/kamailio] topoh: th_mask_decode (th_mask_encode (x)) ≠ x (Issue #3358)
by Дилян Палаузов 15 Feb '23

15 Feb '23

The file [th-test.c.txt](https://github.com/kamailio/kamailio/files/10608862/th-test.… contains the exact copy of the th_mask_encode() and th_mask_decode() functions from src/modules/topoh/th_mask.c . (except LM_ERR is removed and pkg_malloc/pkg_free are replaced with malloc/free). When I run Kamilio under topoh and the websocket client calls, at some moment `sip:test-gnome-calls@bapha.be;gr=urn:uuid:f2f5a3cf-a0fb-0047-be50-740fb9bdc562;alias=87.118.146.153~60472~2>;+sip.instance="<urn:uuid:f2f5a3cf-a0fb-0047-be50-740fb9bdc562>";+org.linphone.specs="conference/1.0,ephemeral/1.1,groupchat/1.1,groupchat/1.2,lime"` is passed to th_mask_encode(). The output it `sip:127.3.4.84;line=sr-if7s1mg7i36PNf0AbdwPpfzlbqWEpLzsSGItpLwyN39ZMY4t1mCTSd6DNo4LWdIOpfpPp5FLpUQscX63Kd47W5EPWO6sNL90pLgoW5p-1fzlSdzO25n3KoIk1vHkWXptc5wOeopsWXi-eo9*`. This is put in a Contact: header. When that last string is passed to th_mask_decode(), e.g. because BYE or ACK have it as R-URI, the output is `sip:test-gnome-calls@bapha.be;gr=urn:uuid:f2f5a3cf-a0fb-0047-be50-740fb9bdc562;alias=87.118.1`. From the initial input the final output misses at least `46.153`. The attached file contains under `b2` another input, which is passed ot th_mask_decode. This is the actual input Kamailio gets at runtime and passes to th_mask_decode. The result is not a string — callu.b.p...b.;.r...n:s..d..2lQ — where the dots represent unprintable bytes. The error report is that th_mask_encode() produces output, which th_mask_decode() does not convert to its origin. N.B.: The above problem happens, when a websocket client calls TCP-client with topoh-module. When a TLS-client calls TCP-client (no websockets involved), topoh does not make problems — BYE is delivered properly. See also: * https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… * https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… This might also be related: * https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3358 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3358(a)github.com>

2 4

Build failed in Jenkins: kamailio56-nightly-binaries » amd64,bookworm #50
by kamailio＠sipwise.com 15 Feb '23

15 Feb '23

See <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> Changes: ------------------------------------------ [...truncated 1.82 MB...] ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1845:58: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1845 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", | ^~ ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1845:91: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1845 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", | ^~ ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:58: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:91: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:107: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1844:58: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1844 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_filename):"", | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1844:91: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1844 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_filename):"", | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1845:58: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1845 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1845:91: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1845 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:58: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:91: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:107: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ make[3]: *** [../../Makefile.rules:100: apy_kemi.o] Error 1 make[2]: *** [Makefile:511: modules] Error 1 make[2]: Leaving directory '/build/kamailio-5.6.4~bpo12.20230211004740.50/src' make[1]: *** [Makefile:34: every-module] Error 2 make[1]: Leaving directory '/build/kamailio-5.6.4~bpo12.20230211004740.50' make: *** [debian/rules:140: build-stamp] Error 2 dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 I: copying local configuration E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.18611/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.18611/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_tcCqiU filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.18611 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/bookworm-amd64.building.18278 + '[' -r /run/lock/bookworm-amd64.update.18278 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…'> + '[' -n /tmp/tmp.9odg8EyHnU ']' + rm -rf /tmp/tmp.9odg8EyHnU + '[' -n /tmp/apt-jdg_tcCqiU ']' + sudo rm -rf /tmp/apt-jdg_tcCqiU + '[' -n 300 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=620 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Sat Feb 11 01:05:41 UTC 2023 [running 620 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Sat Feb 11 01:05:41 UTC 2023 [running 620 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 2

[kamailio/kamailio] rtpengine: queried_nodes_limit incorrectly applies to delete commands which can cause all processes to be blocked (Issue #3370)
by shaneqld 15 Feb '23

15 Feb '23

## Description When one rtpengine instance becomes unavailable on a Kamailio instance with moderate call traffic, even where there are multiple rtpengine instances configured for high availability, all processes can become blocked and Kamailio stops responding to all requests. We produced this in a real world test, with two Kamailio servers running (20 child processes) and two rtpengine servers running. We loaded the Kamailio servers with calls, some answered, some ringing/busy/etc, and then made one rtpengine server drop all packets. Both Kamailio servers were able to briefly detect that the rtpengine instance was unavailable when it attempted to send an offer to it, but then as existing calls began to complete, both Kamailio servers became congested attempting to send "delete" commands to rtpengine. Both Kamailio servers then became unavailable and stopped responding to all messages for 10 minutes, until we restored rtpengine. As such, an rtpengine server that crashes can cause a complete Kamailio outage. ## Troubleshooting By using the reproduction steps below, we were easily able to make Kamailio stop responding to all incoming SIP messages when taking down an rtpengine instance. The logs below show the sequence of events when this is reproduced for a single call. Configuration: - `rtpengine_tout_ms` was not configured and had the default value of 1000ms. - `rtpengine_retr` was not configured and had the default value of 5. - `queried_nodes_limit` was not configured and had the default value (of 30?). - TM's `exec_time_check` was not configured and had the default value of 5000ms. **A call is forwarded using t_relay and rtpengine_manage. rtpengine is killed mid-call. The call ends with 486.** When the t_on_failure route is called, the config makes a singular call to rtpengine_manage, however what follows is 30 errors, all mentioning the same rtpengine instance: ``` ERROR: rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> ``` Followed by the below: ``` ERROR: rtpengine [rtpengine.c:2729]: rtpp_function_call(): queried nodes limit reached WARNING: tm [t_reply.c:1094]: run_failure_handlers(): failure route execution took too long: 150153261 us ``` Each timeout is 5 seconds (5x retries of 1000ms), which corresponds to about 150 seconds over 30 attempts. This matches the warning generated by tm. In this case, there was about 5 minutes of time where a process was blocked. 150 seconds for the child leg's failure route, and 150 seconds for the parent leg's failure route. When this happens for many calls at once, congestion is guaranteed. The 30 attempts to delete the call from rtpengine comes from the default value of `queried_nodes_limit`. This behavior doesn't make sense to me -- it's a retry loop that runs a retry loop. ## Reproduction _tldr: kill rtpengine via iptables mid-call with the default rtpengine settings and you'll see lots of errors._ You can reproduce this with one or multiple rtpengine instances configured in Kamailio. It's easier with just one. Standard setup, but importantly: - forwarding a call using t_relay - t_on_branch is configured which calls rtpengine_manage - t_on_failure is configured which calls rtpengine_manage To reproduce easily, we configured the destination server to send a 100, a 180, wait 20 seconds, then send a 486. Place a number of calls to Kamailio (we used sipp) -- importantly, exceeding the number of child processes configured. You can reproduce the issue with just one call, but this wont make Kamailio unresponsive. Once the calls are placed, and still in progress (ie before the 486 is returned), use iptables on the rtpengine server to drop all traffic on its control port. When the call(s) start receiving the 486, you will notice a flood of error messages `timeout waiting reply for command "delete" from RTPEngine` for approximately 5 minutes per call. This blocks the process. If it's now attempting to send the delete command to rtpengine for a number of calls greater than your child process count: attempt to send any other SIP messages to Kamailio and you will not receive a response. ## Log Messages This is a log for a single call, forwarded using t_relay. All calls to rtpengine_manage are immediately surrounded by info log messages "calling rtpengine_manage" and "completed calling rtpengine_manage". ``` Feb 12 23:40:54 debian-kamailio kamailio[27715]: INFO: {1 1 INVITE 1-27864(a)127.0.1.1} <script>: new branch [0] to sip:0421XXXXXX@192.168.X.X:9060 Feb 12 23:40:54 debian-kamailio kamailio[27715]: INFO: {1 1 INVITE 1-27864(a)127.0.1.1} <script>: branch_route: calling rtpengine_manage Feb 12 23:40:54 debian-kamailio kamailio[27715]: INFO: {1 1 INVITE 1-27864(a)127.0.1.1} <script>: branch_route: completed calling rtpengine_manage Feb 12 23:40:54 debian-kamailio kamailio[27732]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: calling rtpengine_manage Feb 12 23:40:54 debian-kamailio kamailio[27732]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27730]: INFO: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: new branch [0] to sip:61421764018@192.168.X.X:9092;transport=udp Feb 12 23:40:55 debian-kamailio kamailio[27730]: INFO: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: branch_route: calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27730]: INFO: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: branch_route: completed calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27717]: INFO: {2 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: onreply_route: calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27717]: INFO: {2 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27714]: INFO: {2 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: onreply_route: calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27714]: INFO: {2 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27735]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27735]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:41:15 debian-kamailio kamailio[27713]: INFO: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: failure_route: calling rtpengine_manage Feb 12 23:41:20 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:25 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:30 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:35 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:40 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:45 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:50 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:55 debian-kamailio kamailio[27740]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: calling rtpengine_manage Feb 12 23:41:55 debian-kamailio kamailio[27740]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:41:55 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:00 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:05 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:10 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:16 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:21 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:26 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:31 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:36 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:41 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:46 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:51 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:55 debian-kamailio kamailio[27734]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: calling rtpengine_manage Feb 12 23:42:55 debian-kamailio kamailio[27734]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:42:56 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:01 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:06 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:11 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:16 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:21 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:26 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:31 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:36 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:41 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:46 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:46 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:2729]: rtpp_function_call(): queried nodes limit reached Feb 12 23:43:46 debian-kamailio kamailio[27713]: INFO: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: failure_route: completed calling rtpengine_manage Feb 12 23:43:46 debian-kamailio kamailio[27713]: WARNING: tm [t_reply.c:1094]: run_failure_handlers(): failure route execution took too long: 150153207 us Feb 12 23:43:46 debian-kamailio kamailio[27736]: INFO: {1 63577835 ACK 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: ACK: calling rtpengine_manage Feb 12 23:43:46 debian-kamailio kamailio[27736]: INFO: {1 63577835 ACK 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: ACK: completed calling rtpengine_manage Feb 12 23:43:46 debian-kamailio kamailio[27738]: INFO: {1 1 INVITE 1-27864(a)127.0.1.1} <script>: failure_route: calling rtpengine_manage Feb 12 23:43:51 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:56 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:01 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:06 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:11 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:16 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:21 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:26 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:31 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:36 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:41 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:46 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:51 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:56 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:01 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:06 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:11 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:16 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:21 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:26 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:31 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:36 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:41 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:46 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:51 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:56 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:46:01 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:46:06 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:46:11 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:46:16 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:46:16 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:2729]: rtpp_function_call(): queried nodes limit reached Feb 12 23:46:16 debian-kamailio kamailio[27738]: INFO: {1 1 INVITE 1-27864(a)127.0.1.1} <script>: failure_route: completed calling rtpengine_manage Feb 12 23:46:16 debian-kamailio kamailio[27738]: WARNING: tm [t_reply.c:1094]: run_failure_handlers(): failure route execution took too long: 150153261 us ``` ### Possible Solutions To minimize the issue, `rtpengine_tout_ms` and `rtpengine_retr` can be reduced. This doesn't exactly the fix the problem, as you need reasonable values here. Additionally, `queried_nodes_limit` can be reduced to limit the number of unnecessary retries, at the expense of the functionality it gives you to initially select candidate nodes. **Actual solution:** I think that, when a call has already selected an rtpengine instance successfully, and that's in the hash table, then `queried_nodes_limit` should not apply. It should only attempt to send commands with a total number of attempts = `rtpengine_retr`, not `rtpengine_retr * queried_nodes_limit`. By changing the behavior as above, tweaking `rtpengine_tout_ms` and `rtpengine_retr`, and increasing the number of child workers, an rtpengine becoming unavailable should cause much less impactful blocking. ## Additional Information **Kamailio version:** (attempted on 5.4.1 and latest master) ``` version: kamailio 5.4.1 (x86_64/linux) 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, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, 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: unknown compiled on 23:22:15 Aug 15 2022 with gcc 8.3.0 ``` ``` version: kamailio 5.7.0-dev3 (x86_64/linux) 2384c3 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, 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: 2384c3 compiled on 23:22:22 Feb 12 2023 with gcc 8.3.0 ``` **Operating System**:  ``` Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster Linux debian-kamailio 4.19.0-20-amd64 #1 SMP Debian 4.19.235-1 (2022-03-17) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3370 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3370(a)github.com>

4 11

git:master:bd0ce126: rtpengine: avoid repeated queries to same node
by Richard Fuchs 15 Feb '23

15 Feb '23

Module: kamailio Branch: master Commit: bd0ce126109f40f5217053f20e687b93b2268164 URL: https://github.com/kamailio/kamailio/commit/bd0ce126109f40f5217053f20e687b9… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2023-02-15T08:49:01-05:00 rtpengine: avoid repeated queries to same node If we know which node handles a particular call from the hash table, only query that node once and then return error if it's dead, instead of going into a pointless loop looking for other nodes to query which don't exist. closes #3370 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/bd0ce126109f40f5217053f20e687b9… Patch: https://github.com/kamailio/kamailio/commit/bd0ce126109f40f5217053f20e687b9… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 5444b0d461..46640a5d3d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3378,6 +3378,12 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer // lookup node node = select_rtpp_node_old(callid, viabranch, do_test, op); + if (node && is_queried_node(node, queried_nodes_ptr, queried_nodes)) { + LM_ERR("rtpengine node for callid=%.*s is known (%.*s) but it has already been queried, therefore not returning it\n", + callid.len, callid.s, node->rn_url.len, node->rn_url.s); + return NULL; + } + // check node if (!node || (node_in_set(node, active_rtpp_set) == 0)) { // run the selection algorithm

1 0

git:5.6:92f15de3: app_python3: use new Python 3.10+ API functions for tracking execution
by Victor Seva 15 Feb '23

15 Feb '23

Module: kamailio Branch: 5.6 Commit: 92f15de3d026405c749ce10fb4b11200c9b365b1 URL: https://github.com/kamailio/kamailio/commit/92f15de3d026405c749ce10fb4b1120… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-15T10:35:23+01:00 app_python3: use new Python 3.10+ API functions for tracking execution - GH #3187 (cherry picked from commit b8bf86eb11a17c853450e5c7f81d2446cf719fbc) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/92f15de3d026405c749ce10fb4b1120… Patch: https://github.com/kamailio/kamailio/commit/92f15de3d026405c749ce10fb4b1120… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 421db19b78..47a34a4cb6 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1810,6 +1810,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; +#if PY_VERSION_HEX >= 0x03100000 + PyCodeObject *pcode = NULL; +#endif struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff; @@ -1832,10 +1835,27 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) + (tve.tv_usec - tvb.tv_usec); if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { pstate = PyThreadState_GET(); - if (pstate != NULL && pstate->frame != NULL) { + if (pstate != NULL) { +#if PY_VERSION_HEX >= 0x03100000 + pframe = PyThreadState_GetFrame(pstate); + if(pframe != NULL) { + pcode = PyFrame_GetCode(pframe); + } +#else pframe = pstate->frame; +#endif } +#if PY_VERSION_HEX >= 0x03100000 + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u ms] (file:%s func:%s line:%d)\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, + (pcode)?PyBytes_AsString(pcode->co_filename):"", + (pcode)?PyBytes_AsString(pcode->co_name):"", + (pframe)?PyFrame_GetLineNumber(pframe):0); +#else LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" " took too long [%u ms] (file:%s func:%s line:%d)\n", @@ -1844,6 +1864,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_filename):"", (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); +#endif } }

1 0

git:5.6:82caa486: app_python3: proper check of PY_VERSION_HEX for python 3.11
by Victor Seva 15 Feb '23

15 Feb '23

Module: kamailio Branch: 5.6 Commit: 82caa486216930ff634e4b9eeee8184eabaf504c URL: https://github.com/kamailio/kamailio/commit/82caa486216930ff634e4b9eeee8184… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-15T10:35:23+01:00 app_python3: proper check of PY_VERSION_HEX for python 3.11 (cherry picked from commit 8546fb87e3277b675bd47eba9435f739cf3bb69d) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/82caa486216930ff634e4b9eeee8184… Patch: https://github.com/kamailio/kamailio/commit/82caa486216930ff634e4b9eeee8184… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 47a34a4cb6..09d0560b39 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1810,7 +1810,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; -#if PY_VERSION_HEX >= 0x03100000 +#if PY_VERSION_HEX >= 0x030B0000 PyCodeObject *pcode = NULL; #endif struct timeval tvb = {0}, tve = {0}; @@ -1836,7 +1836,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { pstate = PyThreadState_GET(); if (pstate != NULL) { -#if PY_VERSION_HEX >= 0x03100000 +#if PY_VERSION_HEX >= 0x030B0000 pframe = PyThreadState_GetFrame(pstate); if(pframe != NULL) { pcode = PyFrame_GetCode(pframe); @@ -1846,7 +1846,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) #endif } -#if PY_VERSION_HEX >= 0x03100000 +#if PY_VERSION_HEX >= 0x030B0000 LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" " took too long [%u ms] (file:%s func:%s line:%d)\n",

1 0

git:5.6:07fc4d54: app_python3: use Py_SET_TYPE() from python 3.9
by Victor Seva 15 Feb '23

15 Feb '23

Module: kamailio Branch: 5.6 Commit: 07fc4d54e1c00a155dc17c25998ab2cbf75d0862 URL: https://github.com/kamailio/kamailio/commit/07fc4d54e1c00a155dc17c25998ab2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-15T10:35:23+01:00 app_python3: use Py_SET_TYPE() from python 3.9 (cherry picked from commit fc75b4c3f8f9bdba320f74ddf942686c09316b56) --- Modified: src/modules/app_python3/python_msgobj.c --- Diff: https://github.com/kamailio/kamailio/commit/07fc4d54e1c00a155dc17c25998ab2c… Patch: https://github.com/kamailio/kamailio/commit/07fc4d54e1c00a155dc17c25998ab2c… --- diff --git a/src/modules/app_python3/python_msgobj.c b/src/modules/app_python3/python_msgobj.c index db6da6a07a..22aebd5404 100644 --- a/src/modules/app_python3/python_msgobj.c +++ b/src/modules/app_python3/python_msgobj.c @@ -507,7 +507,11 @@ static PyTypeObject MSGtype = { int python_msgobj_init(void) { +#if PY_VERSION_HEX >= 0x03090000 + Py_SET_TYPE(&MSGtype, &PyType_Type); +#else Py_TYPE(&MSGtype) = &PyType_Type; +#endif if (PyType_Ready(&MSGtype) < 0) return -1; return 0;

1 0

git:master:f301ca9c: nat_traversal: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 15 Feb '23

15 Feb '23

Module: kamailio Branch: master Commit: f301ca9cdcc044dd05e9d82139e1db368be6dc5c URL: https://github.com/kamailio/kamailio/commit/f301ca9cdcc044dd05e9d82139e1db3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-15T09:33:56+01:00 nat_traversal: cast to uint64_t when using time_t value --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/f301ca9cdcc044dd05e9d82139e1db3… Patch: https://github.com/kamailio/kamailio/commit/f301ca9cdcc044dd05e9d82139e1db3… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index c5cf7fa15b..d659aced45 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -39,6 +39,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> +#include <stdint.h> #include <ctype.h> #include <errno.h> #include <time.h> @@ -922,7 +923,7 @@ static time_t get_register_expire( } } - LM_DBG("maximum expire for all contacts: %u\n", (unsigned)expire); + LM_DBG("maximum expire for all contacts: %llu\n", (uint64_t)expire); return (expire ? expire + now : 0); }

1 0

git:master:92934589: avpops: cast db value for avp number field as long
by Daniel-Constantin Mierla 15 Feb '23

15 Feb '23

Module: kamailio Branch: master Commit: 929345896700fb116facc41e3542125dfbb79b41 URL: https://github.com/kamailio/kamailio/commit/929345896700fb116facc41e3542125… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-15T09:28:03+01:00 avpops: cast db value for avp number field as long --- Modified: src/modules/avpops/avpops_db.c --- Diff: https://github.com/kamailio/kamailio/commit/929345896700fb116facc41e3542125… Patch: https://github.com/kamailio/kamailio/commit/929345896700fb116facc41e3542125… --- diff --git a/src/modules/avpops/avpops_db.c b/src/modules/avpops/avpops_db.c index 9b36709aad..cca0b84b07 100644 --- a/src/modules/avpops/avpops_db.c +++ b/src/modules/avpops/avpops_db.c @@ -21,6 +21,7 @@ #include <stdlib.h> +#include <stdint.h> #include <string.h> #include "../../core/mem/mem.h" @@ -66,7 +67,7 @@ int avpops_db_bind(const str* db_url) int avpops_db_init(const str* db_url, const str* db_table, str** db_cols) { - + db_hdl = avpops_dbf.init(db_url); if (db_hdl==0) { @@ -313,16 +314,16 @@ int db_query_avp(struct sip_msg *msg, char *query, pvname_list_t* dest) int i, j; pvname_list_t* crt; static str query_str; - + if(query==NULL) { LM_ERR("bad parameter\n"); return -1; } - + query_str.s = query; query_str.len = strlen(query); - + if(avpops_dbf.raw_query(db_hdl, &query_str, &db_res)!=0) { LM_ERR("cannot do the query\n"); @@ -338,11 +339,11 @@ int db_query_avp(struct sip_msg *msg, char *query, pvname_list_t* dest) LM_DBG("rows [%d]\n", RES_ROW_N(db_res)); /* reverse order of rows so that first row get's in front of avp list */ - for(i = RES_ROW_N(db_res)-1; i >= 0; i--) + for(i = RES_ROW_N(db_res)-1; i >= 0; i--) { LM_DBG("row [%d]\n", i); crt = dest; - for(j = 0; j < RES_COL_N(db_res); j++) + for(j = 0; j < RES_COL_N(db_res); j++) { if(RES_ROWS(db_res)[i].values[j].nul) goto next_avp; @@ -388,19 +389,19 @@ int db_query_avp(struct sip_msg *msg, char *query, pvname_list_t* dest) break; case DB1_INT: avp_val.n - = (int)RES_ROWS(db_res)[i].values[j].val.int_val; + = (long)RES_ROWS(db_res)[i].values[j].val.int_val; break; case DB1_BIGINT: avp_val.n - = (int)RES_ROWS(db_res)[i].values[j].val.ll_val; + = (long)RES_ROWS(db_res)[i].values[j].val.ll_val; break; case DB1_DATETIME: avp_val.n - = (int)RES_ROWS(db_res)[i].values[j].val.time_val; + = (long)(uint64_t)RES_ROWS(db_res)[i].values[j].val.time_val; break; case DB1_BITMAP: avp_val.n - = (int)RES_ROWS(db_res)[i].values[j].val.bitmap_val; + = (long)RES_ROWS(db_res)[i].values[j].val.bitmap_val; break; default: goto next_avp;

1 0

git:master:e203aaf7: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: e203aaf7294b5f320ede58636649246167974983 URL: https://github.com/kamailio/kamailio/commit/e203aaf7294b5f320ede58636649246… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-14T17:31:29+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/e203aaf7294b5f320ede58636649246… Patch: https://github.com/kamailio/kamailio/commit/e203aaf7294b5f320ede58636649246… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index 203283ebed..8d6172584e 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -88,6 +88,7 @@ Juha Heinanen 5.3. presence.updateWatchers 5.4. presence.presentity_list 5.5. presence.presentity_show + 5.6. presence.watcher_list 6. Exported Variables @@ -239,6 +240,7 @@ Chapter 1. Admin Guide 5.3. presence.updateWatchers 5.4. presence.presentity_list 5.5. presence.presentity_show + 5.6. presence.watcher_list 6. Exported Variables @@ -1070,6 +1072,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); 5.3. presence.updateWatchers 5.4. presence.presentity_list 5.5. presence.presentity_show + 5.6. presence.watcher_list 5.1. presence.cleanup @@ -1169,6 +1172,22 @@ kamctl rpc presence.presentity_show basic alice sipserver.com kamctl rpc presence.presentity_show full * sipserver.com ... +5.6. presence.watcher_list + + Return the watcher records for a specific presentity uri. + + Name: presence.watcher_list + + Parameters: + * mode - it can be 'basic' or 'full' to print a selection or all the + fields of watcher record. + * uri - the presentity uri. + + RPC Command Format: +... +kamctl rpc presence.watcher_list basic sip:alice@sipserver.com +... + 6. Exported Variables 6.1. $subs(attr)

1 0

git:master:6b30c100: presence: docs for presence.watcher_list rpc command
by Daniel-Constantin Mierla 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: 6b30c100e7618cabf4d241f4b5b28bb334cf5340 URL: https://github.com/kamailio/kamailio/commit/6b30c100e7618cabf4d241f4b5b28bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-14T17:16:19+01:00 presence: docs for presence.watcher_list rpc command --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b30c100e7618cabf4d241f4b5b28bb… Patch: https://github.com/kamailio/kamailio/commit/6b30c100e7618cabf4d241f4b5b28bb… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index cd67be7e54..dbad0acf65 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1426,6 +1426,33 @@ kamctl rpc presence.presentity_list full ... kamctl rpc presence.presentity_show basic alice sipserver.com kamctl rpc presence.presentity_show full * sipserver.com +... + </programlisting> + </section> + <section id="presence.rpc.watcher_list"> + <title>presence.watcher_list</title> + <para> + Return the watcher records for a specific presentity uri. + </para> + <para> + Name: <emphasis>presence.watcher_list</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>mode - it can be 'basic' or 'full' to print a selection or + all the fields of watcher record.</para> + </listitem> + <listitem> + <para>uri - the presentity uri.</para> + </listitem> + </itemizedlist> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +kamctl rpc presence.watcher_list basic sip:alice@sipserver.com ... </programlisting> </section>

1 0

git:master:f66a071d: auth: use time_t instead of casting to int in nonce check
by Daniel-Constantin Mierla 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: f66a071d18820fc71e421d1a73ebd959c4423655 URL: https://github.com/kamailio/kamailio/commit/f66a071d18820fc71e421d1a73ebd95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-14T13:48:59+01:00 auth: use time_t instead of casting to int in nonce check - use unsigned int instead of int for building the nonce --- Modified: src/modules/auth/challenge.c Modified: src/modules/auth/nonce.c Modified: src/modules/auth/nonce.h --- Diff: https://github.com/kamailio/kamailio/commit/f66a071d18820fc71e421d1a73ebd95… Patch: https://github.com/kamailio/kamailio/commit/f66a071d18820fc71e421d1a73ebd95… --- diff --git a/src/modules/auth/challenge.c b/src/modules/auth/challenge.c index c5a769ed21..6f5084a9ae 100644 --- a/src/modules/auth/challenge.c +++ b/src/modules/auth/challenge.c @@ -21,6 +21,8 @@ * */ +#include <stdint.h> + #include "../../core/data_lump.h" #include "../../core/mem/mem.h" #include "../../core/parser/digest/digest.h" @@ -94,14 +96,14 @@ void strip_realm(str* _realm) */ int calc_new_nonce(char* nonce, int *nonce_len, int cfg, struct sip_msg* msg) { - int t; + unsigned int t; #if defined USE_NC || defined USE_OT_NONCE unsigned int n_id; unsigned char pool; unsigned char pool_flags; #endif - t=time(0); + t=(unsigned int)(uint64_t)time(0); #if defined USE_NC || defined USE_OT_NONCE if (nc_enabled || otn_enabled){ pool=nid_get_pool(); diff --git a/src/modules/auth/nonce.c b/src/modules/auth/nonce.c index 3e28df9be4..bd6bc2b755 100644 --- a/src/modules/auth/nonce.c +++ b/src/modules/auth/nonce.c @@ -203,7 +203,8 @@ inline static int calc_bin_nonce_md5(union bin_nonce* b_nonce, int cfg, * message will be included in the generated nonce. * @return 0 on success and -1 on error */ -int calc_nonce(char* nonce, int *nonce_len, int cfg, int since, int expires, +int calc_nonce(char* nonce, int *nonce_len, int cfg, unsigned int since, + unsigned int expires, #if defined USE_NC || defined USE_OT_NONCE unsigned int n_id, unsigned char pf, #endif /* USE_NC || USE_OT_NONCE */ @@ -310,7 +311,8 @@ int check_nonce(auth_body_t* auth, str* secret1, str* secret2, struct sip_msg* msg, int update_nonce) { str * nonce; - int since, b_nonce2_len, b_nonce_len, cfg; + time_t since; + int b_nonce2_len, b_nonce_len, cfg; union bin_nonce b_nonce; union bin_nonce b_nonce2; time_t t; diff --git a/src/modules/auth/nonce.h b/src/modules/auth/nonce.h index 2d04051380..cf8713ea93 100644 --- a/src/modules/auth/nonce.h +++ b/src/modules/auth/nonce.h @@ -208,7 +208,8 @@ int get_auth_checks(struct sip_msg* msg); /* * Calculate nonce value */ -int calc_nonce(char* nonce, int* nonce_len, int cfg, int since, int expires, +int calc_nonce(char* nonce, int* nonce_len, int cfg, unsigned int since, + unsigned int expires, #if defined USE_NC || defined USE_OT_NONCE unsigned int n_id, unsigned char pf, #endif /* USE_NC || USE_OT_NONCE */

1 0

git:master:9cbebc1d: presence: added presence.watcher_list rpc command
by Daniel-Constantin Mierla 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: 9cbebc1d7c0eda71162ce3d90de1ac3110c10bb0 URL: https://github.com/kamailio/kamailio/commit/9cbebc1d7c0eda71162ce3d90de1ac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-14T17:13:09+01:00 presence: added presence.watcher_list rpc command - list the watchers for a presentity uri --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/9cbebc1d7c0eda71162ce3d90de1ac3… Patch: https://github.com/kamailio/kamailio/commit/9cbebc1d7c0eda71162ce3d90de1ac3… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 5138b1381e..06b73df61d 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -2029,6 +2029,103 @@ static const char *rpc_presence_presentity_show_doc[2] = { 0 }; +/*! \brief + * rpc cmd: presence.watcher_list + * \mode - output attributes control + * \presuri - filter by presentity uri + */ +void rpc_presence_watcher_list(rpc_t *rpc, void *ctx) +{ + int i = 0; + str omode = {0, 0}; + int imode = 0; + str presuri = str_init(""); + str pempty = str_init(""); + subs_t *s = NULL; + void *th = NULL; + + LM_DBG("listing in memory presentity records\n"); + + imode = rpc->scan(ctx, "SS", &omode, &presuri); + if(imode < 2) { + rpc->fault(ctx, 500, "Not enough parameters"); + return; + } + if(omode.len == 4 && strncmp(omode.s, "full", 4)==0) { + imode = 1; + } else if(omode.len == 5 && strncmp(omode.s, "basic", 5)==0) { + imode = 0; + } else { + rpc->fault(ctx, 500, "Unknown output mode"); + return; + } + + for(i = 0; i < shtable_size; i++) { + lock_get(&subs_htable[i].lock); + for(s = subs_htable[i].entries->next; s!=NULL; s = s->next) { + if(s->pres_uri.len == presuri.len + && strncasecmp(s->pres_uri.s, presuri.s, presuri.len)==0) { + /* add record node */ + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating response"); + lock_release(&subs_htable[i].lock); + return; + } + + /* add common fields */ + if(rpc->struct_add(th, "SSSSSSSSSSSuudu", + "pres_uri", &s->pres_uri, + "to_user", &s->to_user, + "to_domain", &s->to_domain, + "from_user", &s->from_user, + "from_domain", &s->from_domain, + "watcher_user", &s->watcher_user, + "watcher_domain", &s->watcher_domain, + "contact", &s->contact, + "event_id", &s->event_id, + "callid", &s->callid, + "user_agent", (s->user_agent.s)?&s->user_agent:&pempty, + "expires", s->expires, + "status", s->status, + "version", s->version, + "flags", s->flags)<0) { + rpc->fault(ctx, 500, "Internal error adding attributes"); + lock_release(&subs_htable[i].lock); + return; + } + if(imode==1) { + /* add extra fields */ + if(rpc->struct_add(th, "SSSSSSSuuddd", + "reason", (s->reason.s)?&s->reason:&pempty, + "to_tag", &s->to_tag, + "from_tag", &s->from_tag, + "socket", (s->sockinfo_str.s)?&s->sockinfo_str:&pempty, + "local_contact", (s->local_contact.s)?&s->local_contact:&pempty, + "record_route", (s->record_route.s)?&s->record_route:&pempty, + "auth_rules", (s->auth_rules_doc)?s->auth_rules_doc:&pempty, + "remote_cseq", s->remote_cseq, + "local_cseq", s->local_cseq, + "recv_event", s->recv_event, + "updated", s->updated, + "updated_winfo", s->updated_winfo)<0) { + rpc->fault(ctx, 500, "Internal error adding extra attributes"); + lock_release(&subs_htable[i].lock); + return; + } + } + + } + } + lock_release(&subs_htable[i].lock); + } +} + +static const char *rpc_presence_watcher_list_doc[2] = { + "Show the watcher records for a specific presentity user", + 0 +}; + + rpc_export_t presence_rpc[] = { {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, {"presence.refreshWatchers", rpc_presence_refresh_watchers, @@ -2039,6 +2136,8 @@ rpc_export_t presence_rpc[] = { rpc_presence_presentity_list_doc, RET_ARRAY}, {"presence.presentity_show", rpc_presence_presentity_show, rpc_presence_presentity_show_doc, RET_ARRAY}, + {"presence.watcher_list", rpc_presence_watcher_list, + rpc_presence_watcher_list_doc, RET_ARRAY}, {0, 0, 0, 0} };

1 0

git:master:41cd4fe9: acc_radius: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: 41cd4fe940e2867a348d45840363dfef2b9e05dc URL: https://github.com/kamailio/kamailio/commit/41cd4fe940e2867a348d45840363dfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-14T13:48:59+01:00 acc_radius: cast to uint64_t when using time_t value --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/41cd4fe940e2867a348d45840363dfe… Patch: https://github.com/kamailio/kamailio/commit/41cd4fe940e2867a348d45840363dfe… --- diff --git a/src/modules/acc_radius/acc_radius_mod.c b/src/modules/acc_radius/acc_radius_mod.c index 41e70c73fb..59c977a9e4 100644 --- a/src/modules/acc_radius/acc_radius_mod.c +++ b/src/modules/acc_radius/acc_radius_mod.c @@ -364,7 +364,7 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) snprintf(smicrosec, 18, "%17.6f", tsecmicro); ADD_RAD_AVPAIR(RA_TIME_STAMP, &smicrosec, -1); } else { - av_type = (uint32_t)inf->env->ts; + av_type = (uint32_t)(uint64_t)inf->env->ts; ADD_RAD_AVPAIR(RA_TIME_STAMP, &av_type, -1); }

1 0

git:master:e9f1a426: sipcapture: remove not used parameter table_time_suffix
by Henning Westerholt 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: e9f1a426b6ca5fb9b4c9dc67f2b3f744c20f40b0 URL: https://github.com/kamailio/kamailio/commit/e9f1a426b6ca5fb9b4c9dc67f2b3f74… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-14T10:27:25Z sipcapture: remove not used parameter table_time_suffix --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/e9f1a426b6ca5fb9b4c9dc67f2b3f74… Patch: https://github.com/kamailio/kamailio/commit/e9f1a426b6ca5fb9b4c9dc67f2b3f74… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 46514a3eb6..c81b8c45e6 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -178,7 +178,6 @@ static int hep_version(struct sip_msg *msg); static str db_url = str_init(DEFAULT_DB_URL); static str table_name = str_init("sip_capture"); static str hash_source = str_init("call_id"); -static str table_time_suffix = str_init("%Y%m%D"); static str mt_mode = str_init("rand"); static str date_column = str_init("date"); static str micro_ts_column = str_init("micro_ts"); @@ -400,7 +399,6 @@ static param_export_t params[] = { {"capture_bad_msgs", INT_PARAM, &parse_bad_msgs }, {"insert_retries", INT_PARAM, &insert_retries}, {"insert_retry_timeout", INT_PARAM, &insert_retry_timeout}, - {"table_time_suffix", PARAM_STR, &table_time_suffix}, {"topoh_unmask", PARAM_INT, &sc_topoh_unmask}, {"nonsip_hook", PARAM_INT, &nonsip_hook}, {"event_callback", PARAM_STR, &sc_event_callback},

1 0

git:master:f3ab1aa0: modules: readme files regenerated - sctp ... [skip ci]
by Kamailio Dev 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: f3ab1aa02955493dd3f095d0ebbcb64d2d6751e5 URL: https://github.com/kamailio/kamailio/commit/f3ab1aa02955493dd3f095d0ebbcb64… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-14T11:01:49+01:00 modules: readme files regenerated - sctp ... [skip ci] --- Modified: src/modules/sctp/README Modified: src/modules/sdpops/README Modified: src/modules/secfilter/README Modified: src/modules/secsipid/README Modified: src/modules/sipcapture/README Modified: src/modules/sipjson/README Modified: src/modules/sipt/README Modified: src/modules/siptrace/README Modified: src/modules/slack/README Modified: src/modules/sms/README Modified: src/modules/smsops/README Modified: src/modules/sqlops/README Modified: src/modules/sst/README Modified: src/modules/stirshaken/README Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/f3ab1aa02955493dd3f095d0ebbcb64… Patch: https://github.com/kamailio/kamailio/commit/f3ab1aa02955493dd3f095d0ebbcb64…

1 0

[kamailio/kamailio] Typos (PR #3374)
by Дилян Палаузов 14 Feb '23

14 Feb '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3374 -- Commit Summary -- * sanity: typos * sca: typos * sctp: typos * sdpops: typos * secfilter: typo * secsipid: typos * secsipid_proc: typos * sipcapture: typos * sipjson: typos * sipt: typos * siptrace: typos * sl: typos * slack: typos * sms: typos * smsops: typos * snmpstats: typo * sqlops: typo * sst: typos * statsc: typos * stirshaken: typos * stun: typos * sworker: typos -- File Changes -- M src/modules/sanity/sanity.c (8) M src/modules/sca/sca_call_info.c (2) M src/modules/sca/sca_notify.c (2) M src/modules/sctp/doc/sctp_admin.xml (18) M src/modules/sctp/sctp_server.c (8) M src/modules/sdpops/doc/sdpops_admin.xml (10) M src/modules/sdpops/sdpops_mod.c (2) M src/modules/secfilter/doc/secfilter_admin.xml (2) M src/modules/secsipid/doc/secsipid_admin.xml (4) M src/modules/secsipid_proc/libsecsipid.h (4) M src/modules/sipcapture/doc/sipcapture_admin.xml (6) M src/modules/sipcapture/hep.c (4) M src/modules/sipcapture/sipcapture.c (6) M src/modules/sipjson/doc/sipjson_admin.xml (2) M src/modules/sipjson/sipjson_mod.c (2) M src/modules/sipt/doc/sipt_admin.xml (6) M src/modules/sipt/sipt.c (2) M src/modules/sipt/ss7_parser.c (4) M src/modules/siptrace/doc/siptrace_admin.xml (10) M src/modules/siptrace/siptrace.c (4) M src/modules/siptrace/siptrace_hep.c (2) M src/modules/sl/sl.c (4) M src/modules/sl/sl_funcs.c (2) M src/modules/slack/doc/slack_admin.xml (2) M src/modules/sms/doc/params.xml (8) M src/modules/sms/doc/sms.xml (2) M src/modules/sms/sms_funcs.c (6) M src/modules/smsops/doc/smsops_admin.xml (2) M src/modules/smsops/examples/kamailio.cfg (4) M src/modules/smsops/smsops_impl.c (6) M src/modules/snmpstats/mibs/KAMAILIO-TC (2) M src/modules/sqlops/doc/sqlops_admin.xml (2) M src/modules/sst/doc/sst_admin.xml (6) M src/modules/sst/sst.c (2) M src/modules/sst/sst_handlers.c (32) M src/modules/statsc/statsc_mod.c (4) M src/modules/stirshaken/doc/stirshaken_admin.xml (6) M src/modules/stun/kam_stun.c (36) M src/modules/sworker/doc/sworker_admin.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3374.patch https://github.com/kamailio/kamailio/pull/3374.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3374 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3374(a)github.com>

2 2

git: new commits in branch master
by Henning Westerholt 14 Feb '23

14 Feb '23

- URL: https://github.com/kamailio/kamailio/commit/63a7b8932adf1b2d0f76d40b960df03… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sanity: typos - URL: https://github.com/kamailio/kamailio/commit/21ce3506dea9a8873ba4b127f4a8ad6… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sca: typos - URL: https://github.com/kamailio/kamailio/commit/0c8226457ae2d94ec615719fed71b1b… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sctp: typos - URL: https://github.com/kamailio/kamailio/commit/334efbb1d2e1ed4a1086694e6006365… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sdpops: typos - URL: https://github.com/kamailio/kamailio/commit/d08cef5bc5b1cacbfcb70c3f5298f61… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 secfilter: typo - URL: https://github.com/kamailio/kamailio/commit/47c9ddf2ae08c07e222dfbe98d314ad… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 secsipid: typos - URL: https://github.com/kamailio/kamailio/commit/f175444552745f33796ef1dded89a62… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 secsipid_proc: typos - URL: https://github.com/kamailio/kamailio/commit/a763ee9faa95dd616542b2e25f54b15… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sipcapture: typos - URL: https://github.com/kamailio/kamailio/commit/70910e72000d1be7513d1869ac0c4e6… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sipjson: typos - URL: https://github.com/kamailio/kamailio/commit/469f86fd958fd79bdc24aebbaf16830… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sipt: typos - URL: https://github.com/kamailio/kamailio/commit/d79f5c2d69920edd6feea68b6fd89f3… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 siptrace: typos - URL: https://github.com/kamailio/kamailio/commit/80aeb90fd837f20c4b6524b3df64cc7… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sl: typos - URL: https://github.com/kamailio/kamailio/commit/f9b6fc83ef7106bb6ee5fd96695e84e… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 slack: typos - URL: https://github.com/kamailio/kamailio/commit/766824a3da2798cb9efa4802c056806… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sms: typos - URL: https://github.com/kamailio/kamailio/commit/88bcbef21d570e0b853262d7880ba21… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 smsops: typos - URL: https://github.com/kamailio/kamailio/commit/4235d2e8300a8e135ec9768e27797ba… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 snmpstats: typo - URL: https://github.com/kamailio/kamailio/commit/ac16ccd332ba8b0a3ac41d007408049… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sqlops: typo - URL: https://github.com/kamailio/kamailio/commit/8e899ee6e2efd5287fb627412209a38… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sst: typos - URL: https://github.com/kamailio/kamailio/commit/a8367fa4fa8519193f5ed5693e78c14… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 statsc: typos - URL: https://github.com/kamailio/kamailio/commit/f8f94e46baa85a811dcf1f8be82ca4e… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 stirshaken: typos - URL: https://github.com/kamailio/kamailio/commit/698a92dd87a067bfbba68689e982328… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 stun: typos - URL: https://github.com/kamailio/kamailio/commit/a308dc748aa819b46aab82c148b7bda… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sworker: typos

1 0

git:master:4f201cbd: modules: readme files regenerated - db_berkeley ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 4f201cbd2e9d0c645e1f6618e6db95389731ef95 URL: https://github.com/kamailio/kamailio/commit/4f201cbd2e9d0c645e1f6618e6db953… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T21:46:37+01:00 modules: readme files regenerated - db_berkeley ... [skip ci] --- Modified: src/modules/db_berkeley/README Modified: src/modules/db_cassandra/README Modified: src/modules/db_oracle/README Modified: src/modules/db_text/README Modified: src/modules/debugger/README Modified: src/modules/dialog/README Modified: src/modules/dialplan/README Modified: src/modules/dispatcher/README Modified: src/modules/dlgs/README Modified: src/modules/dmq/README Modified: src/modules/dmq_usrloc/README Modified: src/modules/domain/README Modified: src/modules/domainpolicy/README --- Diff: https://github.com/kamailio/kamailio/commit/4f201cbd2e9d0c645e1f6618e6db953… Patch: https://github.com/kamailio/kamailio/commit/4f201cbd2e9d0c645e1f6618e6db953…

1 0

[kamailio/kamailio] Typos (PR #3373)
by Дилян Палаузов 13 Feb '23

13 Feb '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3373 -- Commit Summary -- * drouting: typos * domainpolicy: typos * domain: typo * dmq: typos * dlgs: typos * dmq_usrloc: typo * dispatcher: typos * dialplan: typos * dialog: typos * debugger: typos * db_text: typos * db_postgres: typos * db_redis: typo * db_perlvdb: typos * db_oracle: typos * db_unixodbc: typos * db_mysql: typos * db_mongodb: typos * db_flatstore: typos * db_cluster: typos * db_cassandra: typos * db_berkeley: typos * db2_ops: typo * db2_ldap: typos -- File Changes -- M src/modules/db2_ldap/ld_con.c (2) M src/modules/db2_ldap/ld_fld.h (2) M src/modules/db2_ldap/ldap.cfg (2) M src/modules/db2_ops/db2_ops.c (2) M src/modules/db_berkeley/bdb_cmd.c (4) M src/modules/db_berkeley/bdb_con.c (2) M src/modules/db_berkeley/bdb_fld.h (2) M src/modules/db_berkeley/bdb_lib.c (4) M src/modules/db_berkeley/db_berkeley.c (8) M src/modules/db_berkeley/doc/db_berkeley_admin.xml (6) M src/modules/db_berkeley/km_bdb_lib.c (4) M src/modules/db_cassandra/dbcassa_base.cpp (10) M src/modules/db_cassandra/doc/db_cassandra_admin.xml (2) M src/modules/db_cassandra/kamailio_cassa.cfg (8) M src/modules/db_cluster/dbcl_api.h (2) M src/modules/db_cluster/dbcl_data.h (2) M src/modules/db_flatstore/db_flatstore.c (2) M src/modules/db_flatstore/flat_con.c (2) M src/modules/db_flatstore/km_doc/db_flatstore_admin.xml (2) M src/modules/db_flatstore/km_flat_pool.c (2) M src/modules/db_flatstore/km_flat_pool.h (2) M src/modules/db_mongodb/mongodb_connection.h (2) M src/modules/db_mongodb/mongodb_dbase.c (4) M src/modules/db_mongodb/mongodb_dbase.h (2) M src/modules/db_mysql/km_dbase.c (4) M src/modules/db_oracle/asynch.c (2) M src/modules/db_oracle/dbase.c (10) M src/modules/db_oracle/doc/db_oracle_admin.xml (2) M src/modules/db_oracle/val.c (2) M src/modules/db_oracle/val.h (2) M src/modules/db_perlvdb/perlvdb_conv.c (2) M src/modules/db_postgres/km_dbase.c (10) M src/modules/db_postgres/pg_con.c (4) M src/modules/db_postgres/pg_fld.h (4) M src/modules/db_postgres/pg_oid.h (2) M src/modules/db_redis/redis_dbase.h (2) M src/modules/db_text/dbt_api.c (2) M src/modules/db_text/dbt_base.c (4) M src/modules/db_text/dbt_res.c (2) M src/modules/db_text/doc/db_text_admin.xml (2) M src/modules/db_unixodbc/dbase.c (4) M src/modules/debugger/debugger_api.c (6) M src/modules/debugger/doc/debugger_admin.xml (4) M src/modules/dialog/dialog.c (4) M src/modules/dialog/dlg_cb.c (6) M src/modules/dialog/dlg_cseq.c (10) M src/modules/dialog/dlg_handlers.c (2) M src/modules/dialog/dlg_req_within.c (2) M src/modules/dialog/dlg_var.c (2) M src/modules/dialog/doc/dialog_admin.xml (14) M src/modules/dialog/doc/dialog_devel.xml (4) M src/modules/dialplan/doc/dialplan_admin.xml (6) M src/modules/dispatcher/dispatch.c (4) M src/modules/dispatcher/dispatch.h (4) M src/modules/dispatcher/doc/dispatcher.cfg (4) M src/modules/dispatcher/doc/dispatcher_admin.xml (6) M src/modules/dlgs/doc/dlgs_admin.xml (2) M src/modules/dmq/dmq_funcs.c (2) M src/modules/dmq/dmqnode.h (2) M src/modules/dmq/doc/dmq_admin.xml (4) M src/modules/dmq/notification_peer.h (2) M src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml (2) M src/modules/domain/doc/domain_admin.xml (2) M src/modules/domainpolicy/doc/domainpolicy_admin.xml (12) M src/modules/domainpolicy/domainpolicy.c (4) M src/modules/domainpolicy/domainpolicy.h (2) M src/modules/drouting/dr_load.c (2) M src/modules/drouting/drouting.c (2) M src/modules/drouting/routing.c (4) M src/modules/drouting/routing.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3373.patch https://github.com/kamailio/kamailio/pull/3373.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3373 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3373(a)github.com>

2 2

git: new commits in branch master
by Henning Westerholt 13 Feb '23

13 Feb '23

- URL: https://github.com/kamailio/kamailio/commit/dd61ae2a6a1bc01c662fdcc6c33d86f… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 drouting: typos - URL: https://github.com/kamailio/kamailio/commit/c7d5f359b4f1bd4872ef924c52597b3… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 domainpolicy: typos - URL: https://github.com/kamailio/kamailio/commit/f68ea71a12f236f2d19b537f8775456… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 domain: typo - URL: https://github.com/kamailio/kamailio/commit/e0a42350d019f55163cf55bd72f1e65… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dmq: typos - URL: https://github.com/kamailio/kamailio/commit/bd2f9d7ab113f351f75d3121db3ffb9… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dlgs: typos - URL: https://github.com/kamailio/kamailio/commit/0723d3cd4da5ed03118bdbee6d960b4… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dmq_usrloc: typo - URL: https://github.com/kamailio/kamailio/commit/c871fd693676c51ce18f017e7f3f631… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dispatcher: typos - URL: https://github.com/kamailio/kamailio/commit/dd07a5cd5762d9142f95c5ab367d2f3… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dialplan: typos - URL: https://github.com/kamailio/kamailio/commit/2822cc8067d2dd7f865f724228cda8c… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dialog: typos - URL: https://github.com/kamailio/kamailio/commit/f63cf3cc56e9cad458e5531d07bd579… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 debugger: typos - URL: https://github.com/kamailio/kamailio/commit/78c25be36d0c0bcbf721d03903b6869… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_text: typos - URL: https://github.com/kamailio/kamailio/commit/1a743d094762edb26721184fa4671a7… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_postgres: typos - URL: https://github.com/kamailio/kamailio/commit/0b6013a2c739a6270820b2110970169… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_redis: typo - URL: https://github.com/kamailio/kamailio/commit/7699387c163ad94f0b96d3460d33a74… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_perlvdb: typos - URL: https://github.com/kamailio/kamailio/commit/0291d13584caef9fb491cca18c0194d… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_oracle: typos - URL: https://github.com/kamailio/kamailio/commit/9459b93dfb85bd4916e0b9ae6f567f6… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_unixodbc: typos - URL: https://github.com/kamailio/kamailio/commit/8aee342bd9149f22e8423b75e23fea2… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_mysql: typos - URL: https://github.com/kamailio/kamailio/commit/1c500b7881c2e4677371acd66236a45… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_mongodb: typos - URL: https://github.com/kamailio/kamailio/commit/9920c228856289af92294396959710e… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_flatstore: typos - URL: https://github.com/kamailio/kamailio/commit/fa77972687a0117290ae979f45b3767… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_cluster: typos - URL: https://github.com/kamailio/kamailio/commit/e09bb7e1880ab7204b915efc86c2949… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_cassandra: typos - URL: https://github.com/kamailio/kamailio/commit/ceb4ca6b2a25e04df5029949fb6d1d9… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_berkeley: typos - URL: https://github.com/kamailio/kamailio/commit/e0e6adfcb27d336ecb156e3b88c4d72… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db2_ops: typo - URL: https://github.com/kamailio/kamailio/commit/6b1c1e7727f8f210f7d20f1473458c8… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db2_ldap: typos

1 0

git:master:c572bcc1: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c572bcc113097efb7641f98deb729258ff4ec02a URL: https://github.com/kamailio/kamailio/commit/c572bcc113097efb7641f98deb72925… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T21:31:15+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/c572bcc113097efb7641f98deb72925… Patch: https://github.com/kamailio/kamailio/commit/c572bcc113097efb7641f98deb72925… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index c5f3c6763b..203283ebed 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -1166,7 +1166,7 @@ kamctl rpc presence.presentity_list full RPC Command Format: ... kamctl rpc presence.presentity_show basic alice sipserver.com -kamctl rpc presence.presentity_list full * sipserver.com +kamctl rpc presence.presentity_show full * sipserver.com ... 6. Exported Variables

1 0

Re: [kamailio/kamailio] presence: docs for rpc presence.presentity_show command (c167c47)
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Thanks, fixed, -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/c167c4738fce31cec292edc803160d6… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/c167c4738fce31cec292edc803160d607a3faaf6/100477082(a)github.com>

1 0

git:master:911d5786: presence: docs - fix example for presence.presentity_show
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 911d5786da6bbd22f954908f7157b5421bdf47f7 URL: https://github.com/kamailio/kamailio/commit/911d5786da6bbd22f954908f7157b54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T21:16:51+01:00 presence: docs - fix example for presence.presentity_show --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/911d5786da6bbd22f954908f7157b54… Patch: https://github.com/kamailio/kamailio/commit/911d5786da6bbd22f954908f7157b54… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index e2e171a3d1..cd67be7e54 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1425,7 +1425,7 @@ kamctl rpc presence.presentity_list full <programlisting format="linespecific"> ... kamctl rpc presence.presentity_show basic alice sipserver.com -kamctl rpc presence.presentity_list full * sipserver.com +kamctl rpc presence.presentity_show full * sipserver.com ... </programlisting> </section>

1 0

Re: [kamailio/kamailio] presence: docs for rpc presence.presentity_show command (c167c47)
by Дилян Палаузов 13 Feb '23

13 Feb '23

This line likely means > kamctl rpc presence.presentity_show full * sipserver.com -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/c167c4738fce31cec292edc803160d6… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/c167c4738fce31cec292edc803160d607a3faaf6/100474300(a)github.com>

1 0

git:master:e4f0c082: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: e4f0c082422bbd9478cf0607a68c6e7c6bef47ad URL: https://github.com/kamailio/kamailio/commit/e4f0c082422bbd9478cf0607a68c6e7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T20:31:26+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/e4f0c082422bbd9478cf0607a68c6e7… Patch: https://github.com/kamailio/kamailio/commit/e4f0c082422bbd9478cf0607a68c6e7… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index 92fdd05330..c5f3c6763b 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -87,6 +87,7 @@ Juha Heinanen 5.2. presence.refreshWatchers 5.3. presence.updateWatchers 5.4. presence.presentity_list + 5.5. presence.presentity_show 6. Exported Variables @@ -237,6 +238,7 @@ Chapter 1. Admin Guide 5.2. presence.refreshWatchers 5.3. presence.updateWatchers 5.4. presence.presentity_list + 5.5. presence.presentity_show 6. Exported Variables @@ -1067,6 +1069,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); 5.2. presence.refreshWatchers 5.3. presence.updateWatchers 5.4. presence.presentity_list + 5.5. presence.presentity_show 5.1. presence.cleanup @@ -1145,6 +1148,27 @@ kamctl rpc presence.presentity_list kamctl rpc presence.presentity_list full ... +5.5. presence.presentity_show + + Return the presentity records stored in memory by filtering with + username and/or domain. + + Name: presence.presentity_show + + Parameters: + * mode - it can be 'basic' or 'full' to print a selection or all the + fields of presentity record. + * user - username to match presentity records, use '*' to match any + username. + * domain - the value to match the domain of the presentity records, + use '*' to match any domain. + + RPC Command Format: +... +kamctl rpc presence.presentity_show basic alice sipserver.com +kamctl rpc presence.presentity_list full * sipserver.com +... + 6. Exported Variables 6.1. $subs(attr)

1 0

git:master:c167c473: presence: docs for rpc presence.presentity_show command
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c167c4738fce31cec292edc803160d607a3faaf6 URL: https://github.com/kamailio/kamailio/commit/c167c4738fce31cec292edc803160d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T20:19:38+01:00 presence: docs for rpc presence.presentity_show command --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c167c4738fce31cec292edc803160d6… Patch: https://github.com/kamailio/kamailio/commit/c167c4738fce31cec292edc803160d6… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 0545bbab6a..e2e171a3d1 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1392,6 +1392,40 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... kamctl rpc presence.presentity_list kamctl rpc presence.presentity_list full +... + </programlisting> + </section> + <section id="presence.rpc.presentity_show"> + <title>presence.presentity_show</title> + <para> + Return the presentity records stored in memory by filtering with username + and/or domain. + </para> + <para> + Name: <emphasis>presence.presentity_show</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>mode - it can be 'basic' or 'full' to print a selection or + all the fields of presentity record.</para> + </listitem> + <listitem> + <para>user - username to match presentity records, use '*' to + match any username.</para> + </listitem> + <listitem> + <para>domain - the value to match the domain of the presentity + records, use '*' to match any domain.</para> + </listitem> + </itemizedlist> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +kamctl rpc presence.presentity_show basic alice sipserver.com +kamctl rpc presence.presentity_list full * sipserver.com ... </programlisting> </section>

1 0

git:master:44689233: topos: use proper field for datetime value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 446892331900c2303e531da55bcb494ccb2d8bce URL: https://github.com/kamailio/kamailio/commit/446892331900c2303e531da55bcb494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T20:19:38+01:00 topos: use proper field for datetime value --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/446892331900c2303e531da55bcb494… Patch: https://github.com/kamailio/kamailio/commit/446892331900c2303e531da55bcb494… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 56d56776a4..e0649b683d 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -890,7 +890,7 @@ int tps_db_insert_branch(tps_data_t *td) db_keys[nr_keys] = &tt_col_rectime; db_vals[nr_keys].type = DB1_DATETIME; - db_vals[nr_keys].val.int_val = time(NULL); + db_vals[nr_keys].val.time_val = time(NULL); nr_keys++; db_keys[nr_keys] = &tt_col_a_callid;

1 0

git:master:2aaa77b1: presence: added rpc command presence.presentity_show
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 2aaa77b11a89cc088393d4ad7fe63f2e54bbd8ce URL: https://github.com/kamailio/kamailio/commit/2aaa77b11a89cc088393d4ad7fe63f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T20:19:38+01:00 presence: added rpc command presence.presentity_show - get records filtering by user and/or domain --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/2aaa77b11a89cc088393d4ad7fe63f2… Patch: https://github.com/kamailio/kamailio/commit/2aaa77b11a89cc088393d4ad7fe63f2…

1 0

git:master:bbb62e2a: modules: readme files regenerated - pdb ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: bbb62e2a163cf0ba6c711074cbed2f1c3cb8ee7c URL: https://github.com/kamailio/kamailio/commit/bbb62e2a163cf0ba6c711074cbed2f1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T19:46:22+01:00 modules: readme files regenerated - pdb ... [skip ci] --- Modified: src/modules/pdb/README Modified: src/modules/peering/README Modified: src/modules/permissions/README Modified: src/modules/pipelimit/README Modified: src/modules/presence/README Modified: src/modules/presence_xml/README Modified: src/modules/pua_reginfo/README Modified: src/modules/pv_headers/README --- Diff: https://github.com/kamailio/kamailio/commit/bbb62e2a163cf0ba6c711074cbed2f1… Patch: https://github.com/kamailio/kamailio/commit/bbb62e2a163cf0ba6c711074cbed2f1…

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

- URL: https://github.com/kamailio/kamailio/commit/ea7baa2bca20899f354129f8a83d04c… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 p_usrloc: typos - URL: https://github.com/kamailio/kamailio/commit/e56fce96beae5be8339fb202a395bb3… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pdb: typos - URL: https://github.com/kamailio/kamailio/commit/8832136ca6c638d6bb39c647262cd35… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 peering: typo - URL: https://github.com/kamailio/kamailio/commit/9c52dcbbfa6ae9a39e035fc6cc25612… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 permissions: typos - URL: https://github.com/kamailio/kamailio/commit/dc4d1ffa9aabeaa119fefe1c3eaebcf… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pike: typos - URL: https://github.com/kamailio/kamailio/commit/55868bfcc966931176f6e23fbb10457… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pipelimit: typo - URL: https://github.com/kamailio/kamailio/commit/d355a590feebf34e8c1d1d2b5e7b3a1… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence: typos - URL: https://github.com/kamailio/kamailio/commit/256848273d867beb273d0f80fd7ee41… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_conference: typos - URL: https://github.com/kamailio/kamailio/commit/3b848a3878ac1655ef236505f05040a… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_dialoginfo: typos - URL: https://github.com/kamailio/kamailio/commit/b22d7686895f45dc93fc1979faf70ef… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_mwi: typo - URL: https://github.com/kamailio/kamailio/commit/38f90a4bd6585b9c54b628620e9ced0… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_profile: typo - URL: https://github.com/kamailio/kamailio/commit/f82553b2ce4693c618744ddfdc06163… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_reginfo: typos - URL: https://github.com/kamailio/kamailio/commit/f7e7ddd74093ddd83a93a75e1e37b24… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_xml: typos - URL: https://github.com/kamailio/kamailio/commit/6d05d873f42e268bbe275a4938a11c5… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 print_lib: typo - URL: https://github.com/kamailio/kamailio/commit/2272fba9d98dea9dec541c4c6b7ede8… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pua: typos - URL: https://github.com/kamailio/kamailio/commit/8275f3742a44bb686e953c4b9e4d7a4… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pua_dialoginfo: typos - URL: https://github.com/kamailio/kamailio/commit/b9f7591ad595e396feb85bad9d70e21… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pua_reginfo: typos - URL: https://github.com/kamailio/kamailio/commit/3b8608770862ab37b3cd82414f06992… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pua_xmpp: typos - URL: https://github.com/kamailio/kamailio/commit/1d26ac7aecf122528dcfd576ea6a3e9… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pv: typos - URL: https://github.com/kamailio/kamailio/commit/a89170a2e08584be33da9464f75ee09… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pv_headers: typos

1 0

[kamailio/kamailio] Typos (PR #3371)
by Дилян Палаузов 13 Feb '23

13 Feb '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3371 -- Commit Summary -- * p_usrloc: typos * pdb: typos * peering: typo * permissions: typos * pike: typos * pipelimit: typo * presence: typos * presence_conference: typos * presence_dialoginfo: typos * presence_mwi: typo * presence_profile: typo * presence_reginfo: typos * presence_xml: typos * print_lib: typo * pua: typos * pua_dialoginfo: typos * pua_reginfo: typos * pua_xmpp: typos * pv: typos * pv_headers: typos -- File Changes -- M src/modules/p_usrloc/p_usrloc_mod.c (4) M src/modules/p_usrloc/udomain.c (2) M src/modules/p_usrloc/ul_db_handle.c (2) M src/modules/p_usrloc/urecord.c (2) M src/modules/p_usrloc/urecord.h (2) M src/modules/pdb/doc/pdb_admin.xml (2) M src/modules/pdb/pdb.c (2) M src/modules/peering/doc/peering_admin.xml (2) M src/modules/permissions/doc/permissions_admin.xml (12) M src/modules/permissions/rule.c (2) M src/modules/pike/pike_funcs.c (4) M src/modules/pipelimit/doc/pipelimit_admin.xml (2) M src/modules/presence/doc/presence_admin.xml (14) M src/modules/presence/doc/presence_devel.xml (2) M src/modules/presence/event_list.h (2) M src/modules/presence/notify.c (2) M src/modules/presence/presence.c (2) M src/modules/presence/presentity.c (2) M src/modules/presence_conference/notify_body.c (6) M src/modules/presence_conference/presence_conference.c (2) M src/modules/presence_dialoginfo/notify_body.c (12) M src/modules/presence_dialoginfo/presence_dialoginfo.c (2) M src/modules/presence_mwi/presence_mwi.c (2) M src/modules/presence_profile/presence_profile.c (2) M src/modules/presence_reginfo/notify_body.c (8) M src/modules/presence_reginfo/presence_reginfo.c (2) M src/modules/presence_xml/doc/presence_xml_admin.xml (2) M src/modules/presence_xml/notify_body.c (32) M src/modules/presence_xml/presence_xml.c (2) M src/modules/print_lib/print_lib.c (2) M src/modules/pua/pua.c (4) M src/modules/pua/pua_db.c (2) M src/modules/pua/send_publish.c (2) M src/modules/pua/send_publish.h (2) M src/modules/pua/send_subscribe.h (2) M src/modules/pua_dialoginfo/dialog_publish.c (2) M src/modules/pua_dialoginfo/pua_dialoginfo.c (2) M src/modules/pua_dialoginfo/pua_dialoginfo.h (2) M src/modules/pua_reginfo/doc/pua_reginfo_admin.xml (4) M src/modules/pua_xmpp/simple2xmpp.c (2) M src/modules/pua_xmpp/xmpp2simple.c (2) M src/modules/pv/pv.c (8) M src/modules/pv/pv_branch.c (2) M src/modules/pv/pv_core.c (8) M src/modules/pv/pv_shv.c (2) M src/modules/pv/pv_trans.c (2) M src/modules/pv_headers/doc/functions.xml (2) M src/modules/pv_headers/doc/params.xml (2) M src/modules/pv_headers/pv_headers.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3371.patch https://github.com/kamailio/kamailio/pull/3371.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3371 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3371(a)github.com>

2 1

git:master:d87120df: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: d87120dfb77d018cdf571cbcf18cf1950ce61987 URL: https://github.com/kamailio/kamailio/commit/d87120dfb77d018cdf571cbcf18cf19… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T13:16:18+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/d87120dfb77d018cdf571cbcf18cf19… Patch: https://github.com/kamailio/kamailio/commit/d87120dfb77d018cdf571cbcf18cf19… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 941cee9465..b1edb5d450 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -191,10 +191,10 @@ Chapter 1. Admin Guide save() and should be used for ��REGISTER�� requests. Note: fix_nated_contact() changes the ��Contact�� header, thus it breaks - the RFC. Although usually this is not an issue, it may cause problems + the RFC. Although this is not always an issue, it may cause problems with strict SIP clients. An alternative is to use add_contact_alias() - that together with the handle_ruri_alias() is standards conforming and - also supports reuse of TCP/TLS connections. + (or set_contact_alias()) that together with the handle_ruri_alias() is + standards conforming and also supports reuse of TCP/TLS connections. 2. NAT pinging types @@ -285,12 +285,15 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) If this parameter is set to 1 then only contacts that have the behind - NAT ��nat_bflag�� flag in user location database set will get - SIP-request-based ping. - - If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_bflag parameter is set, - then SIP-request-based pinging is sent to all contacts. + NAT ��nat_bflag�� flag set in user location records get the NAT ping (the + ��nat_bflag�� is specified via modparam of usrloc module). By default the + ping is done with 4-bytes UDP packet. If sipping_bflag is also set, + then the ping is done with a stateless SIP request (by default: OPTIONS + request). + + If it is 0, then all contacts get a NAT ping, by default being the + 4-bytes UDP packet. If it is 0 and sipping_bflag parameter is set, then + SIP-request-based pinging is sent to all contacts. Default value is 0.

1 0

[kamailio/kamailio] nathelper: ping_nated_only=1 sends 4-bytes UDP-packet pings (PR #3346)
by Дилян Палаузов 13 Feb '23

13 Feb '23

My experiments show that with ``` modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("usrloc", "nat_bflag", FLB_NATB) ``` when both FLB_NATB and FLB_NATSIPPING branch flags are set, no OPTIONS from Kamailio to UAC is generated, so I assume that nathelper.ping_nated_only=1 does force 4-bytes UDP keepalive. This change spells the above, as the behaviour currently is not specified. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3346 -- Commit Summary -- * nathelper: ping_nated_only sends 4-bytes UDP-packet pings -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (12) M src/modules/nathelper/examples/4to6.cfg (2) M src/modules/nathelper/examples/alg.cfg (2) M src/modules/nathelper/nathelper.c (6) M src/modules/nathelper/nhelpr_funcs.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3346.patch https://github.com/kamailio/kamailio/pull/3346.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3346 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3346(a)github.com>

3 8

git:master:ff106fb9: nathelper: docs - updates to the nat pinging types
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: ff106fb93c5b872e529106f58a1b42c4fa092349 URL: https://github.com/kamailio/kamailio/commit/ff106fb93c5b872e529106f58a1b42c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T13:02:35+01:00 nathelper: docs - updates to the nat pinging types --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ff106fb93c5b872e529106f58a1b42c… Patch: https://github.com/kamailio/kamailio/commit/ff106fb93c5b872e529106f58a1b42c…

1 0

git:master:fdf72bec: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: fdf72bec2d6cc20618bc30d0978d7f24f8106d44 URL: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T13:01:34+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2… Patch: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index e091d2018f..941cee9465 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -107,7 +107,7 @@ Ovidiu Sas 1.17. Set alias_name parameter 1.18. fix_nated_contact usage 1.19. fix_nated_sdp usage - 1.20. add_rcv_paramer usage + 1.20. add_rcv_param usage 1.21. fix_nated_register usage 1.22. nat_uac_test usage 1.23. is_rfc1918 usage @@ -187,10 +187,10 @@ Chapter 1. Admin Guide with request's source address:port pair. The function fix_nated_sdp() adds the active direction indication to SDP (flag 0x01) and updates the source IP address too (flag 0x02). The function fix_nated_register() - exports exports the request's source address:port into an AVP to be - used during save() and should be used for ��REGISTER�� requests. + exports the request's source address:port into an AVP to be used during + save() and should be used for ��REGISTER�� requests. - Note: fix_nated_contact changes the ��Contact�� header, thus it breaks + Note: fix_nated_contact() changes the ��Contact�� header, thus it breaks the RFC. Although usually this is not an issue, it may cause problems with strict SIP clients. An alternative is to use add_contact_alias() that together with the handle_ruri_alias() is standards conforming and @@ -205,7 +205,7 @@ Chapter 1. Admin Guide Kamailio; + Disadvantages: unidirectional traffic through NAT (inbound - from outside to inside); As many NATs do update the bind - timeout only on outbound traffic, the bind may expire and + timeout only on outbound traffic, the bind may expire and get closed. * SIP request - a stateless SIP request is sent to the UDP contact address. @@ -285,7 +285,8 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) If this parameter is set to 1 then only contacts that have the behind - NAT ��nat_bflag�� flag in user location database set will get ping. + NAT ��nat_bflag�� flag in user location database set will get + SIP-request-based ping. If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is sent to all contacts. If it is 0 and sipping_bflag parameter is set, @@ -583,7 +584,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; This function can be used from REQUEST_ROUTE. - Example 1.20. add_rcv_paramer usage + Example 1.20. add_rcv_param usage ... add_rcv_param(); # add the parameter to the Contact header .... @@ -821,7 +822,7 @@ $ kamcmd nathelper.enable_ping 1 8.1. @nathelper.rewrite_contact[n] Get n-th Contact value with IP:Port rewritten to source ip:port. N is - counted from 1. Only IP:port is rewritten, remaining part are left + counted from 1. Only IP:port is rewritten, remaining parts are left unchanged. Full nameaddr is supported. Example 1.31. @nathelper.rewrite_contact usage

1 0

git:master:8218c14d: nathelper: ping_nated_only sends 4-bytes UDP-packet pings
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 8218c14d144ef4539c94c8aabe5e73b5c8a11b08 URL: https://github.com/kamailio/kamailio/commit/8218c14d144ef4539c94c8aabe5e73b… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:48:02+01:00 nathelper: ping_nated_only sends 4-bytes UDP-packet pings --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/examples/4to6.cfg Modified: src/modules/nathelper/examples/alg.cfg Modified: src/modules/nathelper/nathelper.c Modified: src/modules/nathelper/nhelpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/8218c14d144ef4539c94c8aabe5e73b… Patch: https://github.com/kamailio/kamailio/commit/8218c14d144ef4539c94c8aabe5e73b…

1 0

git:master:d81e26fb: modules: readme files regenerated - dmq_usrloc ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: d81e26fb399c5fadda2d70de1d95e008d47bd3d5 URL: https://github.com/kamailio/kamailio/commit/d81e26fb399c5fadda2d70de1d95e00… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T12:31:34+01:00 modules: readme files regenerated - dmq_usrloc ... [skip ci] --- Modified: src/modules/dmq_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/d81e26fb399c5fadda2d70de1d95e00… Patch: https://github.com/kamailio/kamailio/commit/d81e26fb399c5fadda2d70de1d95e00… --- diff --git a/src/modules/dmq_usrloc/README b/src/modules/dmq_usrloc/README index 1536fd5f85..d179d1cfa1 100644 --- a/src/modules/dmq_usrloc/README +++ b/src/modules/dmq_usrloc/README @@ -224,13 +224,14 @@ modparam("dmq_usrloc", "usrloc_domain", "my_domain") The parameter controls whether the socket replication is active or not. This is important for anycast scenarios. The value can be: * 0 - disabled - * 1 - enabled + * 1 - enabled, replicate socket by proto:host:port + * 2 - enabled, replicate socket by socket name Default value is 0. Example 1.8. Set replicate_socket_info parameter ... -modparam("dmq_usrloc", "replicate_socket_info", 0) +modparam("dmq_usrloc", "replicate_socket_info", 1) ... 3.9. usrloc_delete (int)

1 0

git:5.5:05ea1752: usrloc: correct AOR value on usrloc:contact-expired
by Victor Seva 13 Feb '23

13 Feb '23

Module: kamailio Branch: 5.5 Commit: 05ea1752c9f941b624ce5f0b8f4e94d5e81195b2 URL: https://github.com/kamailio/kamailio/commit/05ea1752c9f941b624ce5f0b8f4e94d… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-13T12:27:10+01:00 usrloc: correct AOR value on usrloc:contact-expired previously $ulc(x=>aor) had only the user part even with use_domain set fix #3365 (cherry picked from commit f3d00c91a7919207dac23ada58e59a13b9f334d8) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/05ea1752c9f941b624ce5f0b8f4e94d… Patch: https://github.com/kamailio/kamailio/commit/05ea1752c9f941b624ce5f0b8f4e94d… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 204ddfd29f..534583e018 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -905,7 +905,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) db_val_t query_vals[3]; int key_num = 2; db1_res_t* res = NULL; - str user, contact; + str user, contact, domain; int i; int n; urecord_t r; @@ -913,6 +913,9 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; str ruid; +#define AORBUF_SIZE 512 + char aorbuf[AORBUF_SIZE]; + str aor; if (ul_db_mode!=DB_ONLY) { return 0; @@ -1007,6 +1010,14 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } user.len = strlen(user.s); + if(user.len < AORBUF_SIZE ) { + memcpy(aorbuf, user.s, user.len); + aor.s = aorbuf; + aor.len = user.len; + } else { + LM_ERR("user is too long %d\n", user.len); + continue; + } ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { @@ -1015,18 +1026,30 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } - lock_udomain(_d, &user); + if(ul_use_domain) { + domain.s = (char*)VAL_STRING(ROW_VALUES(row)+20); + domain.len = strlen(domain.s); + if(domain.len + aor.len < AORBUF_SIZE) { + aorbuf[aor.len] = '@'; + memcpy(aorbuf+aor.len+1, domain.s, domain.len); + aor.len += domain.len + 1; + } else { + LM_ERR("aor too long, using user part only\n"); + } + } + + lock_udomain(_d, &aor); /* don't use the same static value from get_static_urecord() */ memset( &r, 0, sizeof(struct urecord) ); - r.aor = user; - r.aorhash = ul_get_aorhash(&user); + r.aor = aor; + r.aorhash = ul_get_aorhash(&aor); r.domain = _d->name; if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", - user.len, user.s); + aor.len, aor.s); release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); goto error; } @@ -1045,11 +1068,11 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) ruid.len = c->ruid.len; } else { LM_ERR("ruid is too long %d for %.*s\n", c->ruid.len, - user.len, user.s); + aor.len, aor.s); } } release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */ uldb_delete_attrs_ruid(_d->name, &ruid);

1 0

git:5.6:baa91762: usrloc: correct AOR value on usrloc:contact-expired
by Victor Seva 13 Feb '23

13 Feb '23

Module: kamailio Branch: 5.6 Commit: baa91762aa9f5ee6ede385148c6302c14537cd15 URL: https://github.com/kamailio/kamailio/commit/baa91762aa9f5ee6ede385148c6302c… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-13T12:26:38+01:00 usrloc: correct AOR value on usrloc:contact-expired previously $ulc(x=>aor) had only the user part even with use_domain set fix #3365 (cherry picked from commit f3d00c91a7919207dac23ada58e59a13b9f334d8) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/baa91762aa9f5ee6ede385148c6302c… Patch: https://github.com/kamailio/kamailio/commit/baa91762aa9f5ee6ede385148c6302c… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 4025cc549e..d7b9e8a3e5 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -956,7 +956,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) db_val_t query_vals[3]; int key_num = 2; db1_res_t* res = NULL; - str user, contact; + str user, contact, domain; int i; int n; urecord_t r; @@ -964,6 +964,9 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; str ruid; +#define AORBUF_SIZE 512 + char aorbuf[AORBUF_SIZE]; + str aor; if (ul_db_mode!=DB_ONLY) { return 0; @@ -1058,6 +1061,14 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } user.len = strlen(user.s); + if(user.len < AORBUF_SIZE ) { + memcpy(aorbuf, user.s, user.len); + aor.s = aorbuf; + aor.len = user.len; + } else { + LM_ERR("user is too long %d\n", user.len); + continue; + } ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { @@ -1066,18 +1077,30 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } - lock_udomain(_d, &user); + if(ul_use_domain) { + domain.s = (char*)VAL_STRING(ROW_VALUES(row)+20); + domain.len = strlen(domain.s); + if(domain.len + aor.len < AORBUF_SIZE) { + aorbuf[aor.len] = '@'; + memcpy(aorbuf+aor.len+1, domain.s, domain.len); + aor.len += domain.len + 1; + } else { + LM_ERR("aor too long, using user part only\n"); + } + } + + lock_udomain(_d, &aor); /* don't use the same static value from get_static_urecord() */ memset( &r, 0, sizeof(struct urecord) ); - r.aor = user; - r.aorhash = ul_get_aorhash(&user); + r.aor = aor; + r.aorhash = ul_get_aorhash(&aor); r.domain = _d->name; if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", - user.len, user.s); + aor.len, aor.s); release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); goto error; } @@ -1096,11 +1119,11 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) ruid.len = c->ruid.len; } else { LM_ERR("ruid is too long %d for %.*s\n", c->ruid.len, - user.len, user.s); + aor.len, aor.s); } } release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */ uldb_delete_attrs_ruid(_d->name, &ruid);

1 0

[kamailio/kamailio] AOR value at event_route[usrloc:contact-expired] has no domain part even with usrloc.use_domain == 1 (Issue #3365)
by Victor Seva 13 Feb '23

13 Feb '23

### Description When event_route[usrloc:contact-expired] is triggered, the pseudo-var $ulc(exp=>aor) contains only the userpart of the aor of the expired registration ### Troubleshooting ``` modparam("usrloc", "use_domain", 1) [...] event_route[usrloc:contact-expired] { xlog("L_NOTICE", "Contact ruid $ulc(exp=>ruid) to $ulc(exp=>addr) for user $ulc(exp=>aor) expired\n"); } ``` #### Log Messages REGISTER... AOR is ``43991002(a)ce-trunk.lab`` ``` │Feb 9 16:19:47.152646 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE usrloc [udomain.c:697]: db_load_urecord(): aor 43991002(a)ce-trunk.lab not found in table location │Feb 9 16:19:47.152816 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [path.c:108]: build_path_vector(): received is <sip:192.168.2.177:5160> │Feb 9 16:19:47.152843 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [path.c:116]: build_path_vector(): path is <<sip:lb@127.0.0.1;lr;received=sip:192.168.2.177:5160;socket=sip:192.168.2.70:5060>> │Feb 9 16:19:47.152866 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [save.c:421]: pack_ci(): generated ruid is: uloc-63e50ec8-580d-1 │Feb 9 16:19:47.154051 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [reply.c:334]: build_contact(): created Contact HF: Contact: <sip:43991002@192.168.2.177:5160>;expires=600;received="sip:192.168.2.177:5160"#015#012 │Feb 9 16:19:47.154354 spce proxy[22541]: NOTICE: ROUTE_REG_HANDLE <script>: Contacts successfully saved, expires in 600s - R=«sip:ce-trunk.lab» ID=«pgflewbuqnvhmid(a)debbox.xn--lab-3ga UA='Twinkle/1.10.2' ``` let it expire.. AOR in event_route[usrloc:contact-expired] is ``43991002`` ``` │Feb 9 16:30:32.980631 spce proxy[22543]: DEBUG: usrloc [udomain.c:1050]: udomain_contact_expired_cb(): calling contact expired records - cycle [1] │Feb 9 16:30:32.980655 spce proxy[22543]: DEBUG: usrloc [ul_callback.h:83]: run_ul_callbacks(): contact=0x7f434b8a1220, callback type 8/8, id 0 entered │Feb 9 16:30:32.980776 spce proxy[22543]: DEBUG: registrar [regpv.c:734]: reg_ul_expired_contact(): saved contact for <43991002> in [exp] │Feb 9 16:30:32.980799 spce proxy[22543]: NOTICE: usrloc:contact-expired <script>: Contact ruid uloc-63e50ec8-580d-1 to sip:43991002@192.168.2.177:5160 for user 43991002 expired ``` ### Possible Solutions PR will follow with possible solution ### Additional Information * **Kamailio Version** - output of `kamailio -v` This is kamailio Sipwise flavor ``` version: kamailio 5.6.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, 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: unknown compiled with gcc 10.2.1 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3365 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3365(a)github.com>

2 6

[kamailio/kamailio] usrloc: correct AOR value on usrloc:contact-expired (PR #3366)
by Victor Seva 13 Feb '23

13 Feb '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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3365 #### Description previously $ulc(x=>aor) had only the user part even with use_domain set output after applied the fix ``` │Feb 9 16:47:58.089067 spce proxy[30268]: DEBUG: usrloc [udomain.c:1053]: udomain_contact_expired_cb(): calling contact expired records - cycle [1] │Feb 9 16:47:58.089100 spce proxy[30268]: DEBUG: usrloc [ul_callback.h:83]: run_ul_callbacks(): contact=0x7f8859ed4f50, callback type 8/8, id 0 entered │Feb 9 16:47:58.089197 spce proxy[30268]: DEBUG: registrar [regpv.c:734]: reg_ul_expired_contact(): saved contact for <43991002(a)ce-trunk.lab> in [exp] │Feb 9 16:47:58.089220 spce proxy[30268]: NOTICE: usrloc:contact-expired <script>: Contact ruid uloc-63e5131a-7639-1 to sip:43991002@192.168.2.177:5160 for user 43991002(a)ce-trunk.lab expired ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3366 -- Commit Summary -- * usrloc: correct AOR value on usrloc:contact-expired -- File Changes -- M src/modules/usrloc/udomain.c (39) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3366.patch https://github.com/kamailio/kamailio/pull/3366.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3366 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3366(a)github.com>

2 2

git:master:f3d00c91: usrloc: correct AOR value on usrloc:contact-expired
by Victor Seva 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: f3d00c91a7919207dac23ada58e59a13b9f334d8 URL: https://github.com/kamailio/kamailio/commit/f3d00c91a7919207dac23ada58e59a1… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-13T12:24:30+01:00 usrloc: correct AOR value on usrloc:contact-expired previously $ulc(x=>aor) had only the user part even with use_domain set fix #3365 --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/f3d00c91a7919207dac23ada58e59a1… Patch: https://github.com/kamailio/kamailio/commit/f3d00c91a7919207dac23ada58e59a1… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index f64df09daa..1d30d813bd 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -955,7 +955,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) db_val_t query_vals[3]; int key_num = 2; db1_res_t* res = NULL; - str user, contact; + str user, contact, domain; int i; int n; urecord_t r; @@ -963,6 +963,9 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; str ruid; +#define AORBUF_SIZE 512 + char aorbuf[AORBUF_SIZE]; + str aor; if (ul_db_mode!=DB_ONLY) { return 0; @@ -1057,6 +1060,14 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } user.len = strlen(user.s); + if(user.len < AORBUF_SIZE ) { + memcpy(aorbuf, user.s, user.len); + aor.s = aorbuf; + aor.len = user.len; + } else { + LM_ERR("user is too long %d\n", user.len); + continue; + } ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { @@ -1065,18 +1076,30 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } - lock_udomain(_d, &user); + if(ul_use_domain) { + domain.s = (char*)VAL_STRING(ROW_VALUES(row)+20); + domain.len = strlen(domain.s); + if(domain.len + aor.len < AORBUF_SIZE) { + aorbuf[aor.len] = '@'; + memcpy(aorbuf+aor.len+1, domain.s, domain.len); + aor.len += domain.len + 1; + } else { + LM_ERR("aor too long, using user part only\n"); + } + } + + lock_udomain(_d, &aor); /* don't use the same static value from get_static_urecord() */ memset( &r, 0, sizeof(struct urecord) ); - r.aor = user; - r.aorhash = ul_get_aorhash(&user); + r.aor = aor; + r.aorhash = ul_get_aorhash(&aor); r.domain = _d->name; if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", - user.len, user.s); + aor.len, aor.s); release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); goto error; } @@ -1095,11 +1118,11 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) ruid.len = c->ruid.len; } else { LM_ERR("ruid is too long %d for %.*s\n", c->ruid.len, - user.len, user.s); + aor.len, aor.s); } } release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */ uldb_delete_attrs_ruid(_d->name, &ruid);

1 0

git:master:d2e73f9c: dmq_usrloc: check if socket name is set when replicating
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: d2e73f9c51630f47fa7660b4c4831fcecd661f87 URL: https://github.com/kamailio/kamailio/commit/d2e73f9c51630f47fa7660b4c4831fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:20:37+01:00 dmq_usrloc: check if socket name is set when replicating --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/d2e73f9c51630f47fa7660b4c4831fc… Patch: https://github.com/kamailio/kamailio/commit/d2e73f9c51630f47fa7660b4c4831fc… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index dd2a7f2f42..62477198a2 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -692,7 +692,7 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor, int action, dmq_node srjson_AddStrToObject(jdoc, jdoc_contact, "sock", ptr->sock->sock_str.s, ptr->sock->sock_str.len); jdoc_contact_group.size += ptr->sock->sock_str.len; } - else if (_dmq_usrloc_replicate_socket_info==DMQ_USRLOC_REPLICATE_SOCKNAME) { + else if (_dmq_usrloc_replicate_socket_info==DMQ_USRLOC_REPLICATE_SOCKNAME && ptr->sock!=NULL && ptr->sock->sockname.s!=NULL) { srjson_AddStrToObject(jdoc, jdoc_contact, "sockname", ptr->sock->sockname.s, ptr->sock->sockname.len); jdoc_contact_group.size += ptr->sock->sockname.len; }

1 0

[kamailio/kamailio] dmq_usrloc: Add option to replicate socket via its name (PR #3364)
by Bastian Triller 13 Feb '23

13 Feb '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 #### Description  Allow replicating location's socket via its name. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3364 -- Commit Summary -- * dmq_usrloc: Add option to replicate socket via its name -- File Changes -- M src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml (9) M src/modules/dmq_usrloc/usrloc_sync.c (24) M src/modules/dmq_usrloc/usrloc_sync.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3364.patch https://github.com/kamailio/kamailio/pull/3364.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3364 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3364(a)github.com>

2 2

git:master:353d7e6a: dmq_usrloc: Add option to replicate socket via its name
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 353d7e6a5f8d751fc647fd687716cc2e0fb1aa77 URL: https://github.com/kamailio/kamailio/commit/353d7e6a5f8d751fc647fd687716cc2… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:18:09+01:00 dmq_usrloc: Add option to replicate socket via its name --- Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml Modified: src/modules/dmq_usrloc/usrloc_sync.c Modified: src/modules/dmq_usrloc/usrloc_sync.h --- Diff: https://github.com/kamailio/kamailio/commit/353d7e6a5f8d751fc647fd687716cc2… Patch: https://github.com/kamailio/kamailio/commit/353d7e6a5f8d751fc647fd687716cc2…

1 0

git:master:cc234290: modules: readme files regenerated - imc ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: cc2342908d08ee5322fd6830b0db9fd762bef38f URL: https://github.com/kamailio/kamailio/commit/cc2342908d08ee5322fd6830b0db9fd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T12:17:06+01:00 modules: readme files regenerated - imc ... [skip ci] --- Modified: src/modules/imc/README Modified: src/modules/ims_auth/README Modified: src/modules/ims_charging/README Modified: src/modules/ims_dialog/README Modified: src/modules/ims_diameter_server/README Modified: src/modules/ims_icscf/README Modified: src/modules/ims_ipsec_pcscf/README Modified: src/modules/ims_isc/README Modified: src/modules/ims_qos/README Modified: src/modules/ims_registrar_pcscf/README Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/cc2342908d08ee5322fd6830b0db9fd… Patch: https://github.com/kamailio/kamailio/commit/cc2342908d08ee5322fd6830b0db9fd…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev