sr-dev

sr-dev@lists.kamailio.org

22 participants
45189 discussions

git:master:721ec276: acc: init to 0 the arrays allocated for accounting
by Daniel-Constantin Mierla 14 Oct '22

14 Oct '22

Module: kamailio Branch: master Commit: 721ec276f2bfcc18236e0b9de1f5552f505f0cda URL: https://github.com/kamailio/kamailio/commit/721ec276f2bfcc18236e0b9de1f5552… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-14T11:17:25+02:00 acc: init to 0 the arrays allocated for accounting --- Modified: src/modules/acc/acc.c --- Diff: https://github.com/kamailio/kamailio/commit/721ec276f2bfcc18236e0b9de1f5552… Patch: https://github.com/kamailio/kamailio/commit/721ec276f2bfcc18236e0b9de1f5552… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index dce7ee0a8b..1c1b07f6a9 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -633,32 +633,32 @@ void acc_api_set_arrays(acc_info_t *inf) } int acc_arrays_alloc(void) { - if ((val_arr = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(str))) == NULL) { + 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"); return -1; } - if ((int_arr = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(int))) == NULL) { + 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"); return -1; } - if ((type_arr = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(char))) == NULL) { + 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"); return -1; } - if ((log_attrs = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(str))) == NULL) { + 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"); return -1; } - if ((db_keys = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(db_key_t))) == NULL) { + 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"); return -1; } - if ((db_vals = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(db_val_t))) == NULL) { + 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"); return -1; }

1 0

git:master:2bb8b568: mqtt: Add tls_alpn module option
by Andreas Granig 14 Oct '22

14 Oct '22

Module: kamailio Branch: master Commit: 2bb8b5689c3064bd0ad1da80bdcfa36f29d2b8e3 URL: https://github.com/kamailio/kamailio/commit/2bb8b5689c3064bd0ad1da80bdcfa36… Author: Andreas Granig <andreas(a)granig.com> Committer: Andreas Granig <agranig(a)linguin.org> Date: 2022-10-13T17:42:47+02:00 mqtt: Add tls_alpn module option This is used when a service (like AWS IoT Core) uses one TLS port for multiple services (like https and mqtt), so you have to set the ALPN to 'mqtt' to be able to connect kamailio. --- Modified: src/modules/mqtt/doc/mqtt_admin.xml Modified: src/modules/mqtt/mqtt_dispatch.c Modified: src/modules/mqtt/mqtt_dispatch.h Modified: src/modules/mqtt/mqtt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2bb8b5689c3064bd0ad1da80bdcfa36… Patch: https://github.com/kamailio/kamailio/commit/2bb8b5689c3064bd0ad1da80bdcfa36…

2 1

git:master:304bf9ca: mqtt: add missing semicolon to #ifdef else case after 2bb8b568
by Henning Westerholt 14 Oct '22

14 Oct '22

Module: kamailio Branch: master Commit: 304bf9cab6d50231c9c948ed7d252d91631e7f30 URL: https://github.com/kamailio/kamailio/commit/304bf9cab6d50231c9c948ed7d252d9… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-14T07:09:23Z mqtt: add missing semicolon to #ifdef else case after 2bb8b568 --- Modified: src/modules/mqtt/mqtt_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/304bf9cab6d50231c9c948ed7d252d9… Patch: https://github.com/kamailio/kamailio/commit/304bf9cab6d50231c9c948ed7d252d9… --- diff --git a/src/modules/mqtt/mqtt_dispatch.c b/src/modules/mqtt/mqtt_dispatch.c index eaf2f51f91..a67f20e4a1 100644 --- a/src/modules/mqtt/mqtt_dispatch.c +++ b/src/modules/mqtt/mqtt_dispatch.c @@ -232,7 +232,7 @@ int mqtt_run_dispatcher(mqtt_dispatcher_cfg_t* cfg) return -1; } #else - LM_WARN("unable to set TLS ALPN due to outdated mosquitto library version, upgrade it to >= 1.6.0\n") + LM_WARN("unable to set TLS ALPN due to outdated mosquitto library version, upgrade it to >= 1.6.0\n"); #endif } }

1 0

git:master:846ed0ab: Revert "mqtt: fix double brackets introduced in 2bb8b568"
by Henning Westerholt 14 Oct '22

14 Oct '22

Module: kamailio Branch: master Commit: 846ed0ab0d9ed11c9df2636d4061a64aca539a66 URL: https://github.com/kamailio/kamailio/commit/846ed0ab0d9ed11c9df2636d4061a64… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-14T07:05:10Z Revert "mqtt: fix double brackets introduced in 2bb8b568" This reverts commit 96e28f8c1ce22042bd1f59dea7607aef51ac1f58. --- Modified: src/modules/mqtt/mqtt_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/846ed0ab0d9ed11c9df2636d4061a64… Patch: https://github.com/kamailio/kamailio/commit/846ed0ab0d9ed11c9df2636d4061a64… --- diff --git a/src/modules/mqtt/mqtt_dispatch.c b/src/modules/mqtt/mqtt_dispatch.c index 8a38111e4c..a402947353 100644 --- a/src/modules/mqtt/mqtt_dispatch.c +++ b/src/modules/mqtt/mqtt_dispatch.c @@ -234,6 +234,7 @@ int mqtt_run_dispatcher(mqtt_dispatcher_cfg_t* cfg) #else LM_WARN("unable to set TLS ALPN due to outdated mosquitto library version, upgrade it to >= 1.6.0\n") #endif + } } res = mosquitto_connect(_mosquitto, cfg->host, cfg->port, cfg->keepalive);

1 0

git:master:0994754b: mqtt: use same coding style regarding whitespace/tabs after 2bb8b568
by Henning Westerholt 14 Oct '22

14 Oct '22

Module: kamailio Branch: master Commit: 0994754b9925dad3f306a3ecb9c62c41588390d1 URL: https://github.com/kamailio/kamailio/commit/0994754b9925dad3f306a3ecb9c62c4… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-14T07:06:54Z mqtt: use same coding style regarding whitespace/tabs after 2bb8b568 --- Modified: src/modules/mqtt/mqtt_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/0994754b9925dad3f306a3ecb9c62c4… Patch: https://github.com/kamailio/kamailio/commit/0994754b9925dad3f306a3ecb9c62c4… --- diff --git a/src/modules/mqtt/mqtt_dispatch.c b/src/modules/mqtt/mqtt_dispatch.c index a402947353..eaf2f51f91 100644 --- a/src/modules/mqtt/mqtt_dispatch.c +++ b/src/modules/mqtt/mqtt_dispatch.c @@ -224,17 +224,17 @@ int mqtt_run_dispatcher(mqtt_dispatcher_cfg_t* cfg) LM_ERR("mosquitto_tls_set() failed: %d %s\n",errno, strerror(errno)); return -1; } - if (cfg->tls_alpn != NULL) { + if (cfg->tls_alpn != NULL) { #if LIBMOSQUITTO_VERSION_NUMBER >= 1006000 - res = mosquitto_string_option(_mosquitto, MOSQ_OPT_TLS_ALPN, cfg->tls_alpn); - if (res != MOSQ_ERR_SUCCESS) { - LM_ERR("mosquitto_string_option() failed setting TLS ALPN: %d %s\n",errno, strerror(errno)); - return -1; - } + res = mosquitto_string_option(_mosquitto, MOSQ_OPT_TLS_ALPN, cfg->tls_alpn); + if (res != MOSQ_ERR_SUCCESS) { + LM_ERR("mosquitto_string_option() failed setting TLS ALPN: %d %s\n",errno, strerror(errno)); + return -1; + } #else - LM_WARN("unable to set TLS ALPN due to outdated mosquitto library version, upgrade it to >= 1.6.0\n") + LM_WARN("unable to set TLS ALPN due to outdated mosquitto library version, upgrade it to >= 1.6.0\n") #endif - } + } } res = mosquitto_connect(_mosquitto, cfg->host, cfg->port, cfg->keepalive);

1 0

git:master:96e28f8c: mqtt: fix double brackets introduced in 2bb8b568
by Henning Westerholt 14 Oct '22

14 Oct '22

Module: kamailio Branch: master Commit: 96e28f8c1ce22042bd1f59dea7607aef51ac1f58 URL: https://github.com/kamailio/kamailio/commit/96e28f8c1ce22042bd1f59dea7607ae… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-14T06:57:52Z mqtt: fix double brackets introduced in 2bb8b568 --- Modified: src/modules/mqtt/mqtt_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/96e28f8c1ce22042bd1f59dea7607ae… Patch: https://github.com/kamailio/kamailio/commit/96e28f8c1ce22042bd1f59dea7607ae… --- diff --git a/src/modules/mqtt/mqtt_dispatch.c b/src/modules/mqtt/mqtt_dispatch.c index a402947353..8a38111e4c 100644 --- a/src/modules/mqtt/mqtt_dispatch.c +++ b/src/modules/mqtt/mqtt_dispatch.c @@ -234,7 +234,6 @@ int mqtt_run_dispatcher(mqtt_dispatcher_cfg_t* cfg) #else LM_WARN("unable to set TLS ALPN due to outdated mosquitto library version, upgrade it to >= 1.6.0\n") #endif - } } res = mosquitto_connect(_mosquitto, cfg->host, cfg->port, cfg->keepalive);

1 0

[kamailio/kamailio] Retaining Contact Header for 301, 302 requests when using Topoh module (Issue #3256)
by tuan-pham-hoiio 14 Oct '22

14 Oct '22

### Description After I turned on topoh module, the forwarding call flow seems to break. This might be caused by the Contact header on Redirecting request is masked. ### Expected behavior The Contact header in 301, 302 SIP message will not be masked, and the forward call will succeed. #### Actual observed behavior The 302 SIP Contact header gets masked by 127.0.0.1 (masked_ip). #### SIP Traffic ``` 2022/10/05 13:47:58.093790 192.168.1.109:5060 -> 192.168.1.66:55709 SIP/2.0 302 Moved Temporarily Via: SIP/2.0/TCP 192.168.1.66:58554;received=192.168.1.66;branch=z9hG4bK-524287-1---493db1f2d8f51001;rport=55709 Record-Route: <sip:127.0.0.1;line=sr-N6IAzBFsMJZfWBc7MmZfMxq-W.y6Mx1LMBu5oB1dNB1EpSthH.3sW6WBW.Vlz6aYgxuqMB37z.pBMP**> Record-Route: <sip:192.168.1.109;transport=tcp;r2=on;lr;ftag=697cc523;did=d26.97c1> From: <sip:1000@192.168.1.109;transport=TCP>;tag=697cc523 To: <sip:1001@192.168.1.109>;tag=1357659545 Call-ID: g_hnmT8yukR7M9QxI-t6jA.. CSeq: 2 INVITE Contact: <sip:127.0.0.1;line=sr-N6IAzBj6M.KyM.qLOBF6zGZfOBF6W.vuMxNA> Supported: replaces, path, timer User-Agent: Grandstream GXP1620 1.0.4.106 Diversion: <sip:1001@192.168.1.165:5070>;reason=unconditional Allow: INVITE, ACK, OPTIONS, CANCEL, BYE, SUBSCRIBE, NOTIFY, INFO, REFER, UPDATE, MESSAGE Content-Length: 0 ``` ### Possible Solutions The behavior becomes normal when I turn off the topoh module. Hence, I think this can be solved by retaining the Contact header for 301, 302 requests when using topoh. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.4.5 ``` * **Operating System**: ``` Centos 7 ``` [topoh_302.tar.gz](https://github.com/kamailio/kamailio/files/9714508/topoh_… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3256 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3256(a)github.com>

2 3

git:master:88667f7c: modules: readme files regenerated - mqtt ... [skip ci]
by Kamailio Dev 13 Oct '22

13 Oct '22

Module: kamailio Branch: master Commit: 88667f7cbf8a41dd3951cdca74d203936ecb164a URL: https://github.com/kamailio/kamailio/commit/88667f7cbf8a41dd3951cdca74d2039… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-10-13T17:46:30+02:00 modules: readme files regenerated - mqtt ... [skip ci] --- Modified: src/modules/mqtt/README --- Diff: https://github.com/kamailio/kamailio/commit/88667f7cbf8a41dd3951cdca74d2039… Patch: https://github.com/kamailio/kamailio/commit/88667f7cbf8a41dd3951cdca74d2039…

1 0

[kamailio/kamailio] mqtt: Add tls_alpn module option (PR #3261)
by Andreas Granig 13 Oct '22

13 Oct '22

This is used when a service (like AWS IoT Core) uses one TLS port for multiple services (like https and mqtt), so you have to set the ALPN to 'mqtt' to be able to connect kamailio.   #### 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  Some services use ALPN to have one single TLS port serving multiple protocols, in order to avoid additional round-trips for negotiating TLS connections. https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation has the details. One of those services using ALPN is AWS IoT Core, which allows components to send messages both via HTTP and MQTT to AWS for further processing (e.g. logging, analysis, storage to db etc). This patch enables kamailio to communicate with this service by allowing the kamailio admin to set the mqtt.so module mod-param *tls_alpn* to *mqtt*. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3261 -- Commit Summary -- * mqtt: Add tls_alpn module option -- File Changes -- M src/modules/mqtt/doc/mqtt_admin.xml (21) M src/modules/mqtt/mqtt_dispatch.c (13) M src/modules/mqtt/mqtt_dispatch.h (3) M src/modules/mqtt/mqtt_mod.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3261.patch https://github.com/kamailio/kamailio/pull/3261.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3261 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3261(a)github.com>

3 15

git:master:ea7201d9: modules: readme files regenerated - tsilo ... [skip ci]
by Kamailio Dev 13 Oct '22

13 Oct '22

Module: kamailio Branch: master Commit: ea7201d9c3b086fb79c093b4f127516befb08e25 URL: https://github.com/kamailio/kamailio/commit/ea7201d9c3b086fb79c093b4f127516… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-10-13T15:46:31+02:00 modules: readme files regenerated - tsilo ... [skip ci] --- Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/ea7201d9c3b086fb79c093b4f127516… Patch: https://github.com/kamailio/kamailio/commit/ea7201d9c3b086fb79c093b4f127516… --- diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index c93fa0ebef..06029a2bac 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -180,7 +180,7 @@ modparam("tsilo", "use_domain", 1) if (is_method("INVITE")) { if (t_newtran()) { ts_store(); - # t_store("sip:alice@$td"); + # ts_store("sip:alice@$td"); } } ... @@ -199,6 +199,11 @@ if (is_method("INVITE")) { and add them new branches. Can be a static string value or a dynamic string with pseudo-variables. + Return codes: + * 1 - branches added. + -1 - an internal error has produced (parsing error, memory error). + -2 - no records found for the r-uri. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. Example 1.4. ts_append usage @@ -231,6 +236,11 @@ if (is_method("REGISTER")) { location lookup based on this Contact URI fails (no location record found), then the branch append will not happen. + Return codes: + * 1 - branches added. + -1 - an internal error has produced (parsing error, memory error). + -2 - no records found for the r-uri. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. Example 1.5. ts_append_by_contact usage

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev