sr-dev October 2022

sr-dev@lists.kamailio.org

12 participants
199 discussions

git:master:96e28f8c: mqtt: fix double brackets introduced in 2bb8b568

by Henning Westerholt

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 year, 7 months

[kamailio/kamailio] Retaining Contact Header for 301, 302 requests when using Topoh module (Issue #3256)

by tuan-pham-hoiio

### 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>

1 year, 7 months

git:master:88667f7c: modules: readme files regenerated - mqtt ... [skip ci]

by Kamailio Dev

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 year, 7 months

[kamailio/kamailio] mqtt: Add tls_alpn module option (PR #3261)

by Andreas Granig

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>

1 year, 7 months

git:master:ea7201d9: modules: readme files regenerated - tsilo ... [skip ci]

by Kamailio Dev

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 year, 7 months

git:master:ef2ea73f: tsilo: add new return code to ts_append and document it

by Federico Cabiddu

Module: kamailio Branch: master Commit: ef2ea73f044a1421b25734d4773bd2dacaab1165 URL: https://github.com/kamailio/kamailio/commit/ef2ea73f044a1421b25734d4773bd2d… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2022-10-13T15:42:56+02:00 tsilo: add new return code to ts_append and document it --- Modified: src/modules/tsilo/doc/tsilo_admin.xml Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/ef2ea73f044a1421b25734d4773bd2d… Patch: https://github.com/kamailio/kamailio/commit/ef2ea73f044a1421b25734d4773bd2d… --- diff --git a/src/modules/tsilo/doc/tsilo_admin.xml b/src/modules/tsilo/doc/tsilo_admin.xml index 965c339156f..2a258ba15cb 100644 --- a/src/modules/tsilo/doc/tsilo_admin.xml +++ b/src/modules/tsilo/doc/tsilo_admin.xml @@ -139,7 +139,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"); } } ... @@ -170,6 +170,20 @@ if (is_method("INVITE")) { </para> </listitem> </itemizedlist> + <para>Return codes:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>1</emphasis> - branches added. + </para> + <para> + <emphasis>-1</emphasis> - an internal error has produced (parsing error, memory error). + </para> + <para> + <emphasis>-2</emphasis> - no records found for the r-uri. + </para> + </listitem> + </itemizedlist> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. </para> @@ -223,6 +237,20 @@ if (is_method("REGISTER")) { </para> </listitem> </itemizedlist> + <para>Return codes:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>1</emphasis> - branches added. + </para> + <para> + <emphasis>-1</emphasis> - an internal error has produced (parsing error, memory error). + </para> + <para> + <emphasis>-2</emphasis> - no records found for the r-uri. + </para> + </listitem> + </itemizedlist> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. </para> diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index fece9b40970..dd01b0a7d3a 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -61,7 +61,7 @@ int ts_append(struct sip_msg* msg, str *ruri, str *contact, char *table) { /* parse contact if given */ if(contact->s != NULL && contact->len != 0) { if (parse_uri(contact->s, contact->len, &c_uri) < 0) { - LM_ERR("failed to parse contact %.*s\n", ruri->len, ruri->s); + LM_ERR("failed to parse contact %.*s\n", contact->len, contact->s); return -1; } } @@ -72,9 +72,9 @@ int ts_append(struct sip_msg* msg, str *ruri, str *contact, char *table) { res = get_ts_urecord(t_uri, &_r); if (res != 0) { - LM_ERR("failed to retrieve record for %.*s\n", t_uri->len, t_uri->s); + LM_DBG("no record for %.*s\n", t_uri->len, t_uri->s); unlock_entry_by_ruri(t_uri); - return -1; + return -2; } /* cycle through existing transactions */

1 year, 7 months

[kamailio/kamailio] kamailio sip out of order when sip transfer too fast (Issue #3262)

by zhangyang

I found a problem when I tested again. When the interval between the transmission of two info messages is too short, the forwarding of kamailio will be confused. Can this be solved please? <img width="1077" alt="3212f45cd3f97e395065c8a109eaa9d" src="https://user-images.githubusercontent.com/16113837/195576921-dafc0511-5b8e-…"> ![image](https://user-images.githubusercontent.com/16113837/195575863-b245c8f0-94ad-440c-9fe7-0301d037739c.png) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3262 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3262(a)github.com>

1 year, 7 months

[kamailio/kamailio] tm: proper fill of From/To URI/tag values using parsed structure in rpc_t_uac() (PR #3251)

by braams

#### 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 https://github.com/kamailio/kamailio/commit/aa6e9963b2725c1b6b7e5ff995a77c2… https://lists.kamailio.org/pipermail/sr-users/2020-November/111152.html #### Description tm.t_uac_start adds new tag into from header even if it exists. It has already been fixed for t_uac_send function. But there is the same problem for tm.t_uac_start RPC command. I've fixed it in the same way. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3251 -- Commit Summary -- * tm: proper fill of From/To URI/tag values using parsed structure in rpc_t_uac() -- File Changes -- M src/modules/tm/rpc_uac.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3251.patch https://github.com/kamailio/kamailio/pull/3251.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3251 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3251(a)github.com>

1 year, 7 months

git:master:aec01a7e: tm: proper fill of From/To URI/tag values using parsed structure in rpc_t_uac()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aec01a7e10be54d2e2d9a91e54157a5bdda21e83 URL: https://github.com/kamailio/kamailio/commit/aec01a7e10be54d2e2d9a91e54157a5… Author: Maksim Nesterov <msnesterov(a)avito.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-13T12:18:01+02:00 tm: proper fill of From/To URI/tag values using parsed structure in rpc_t_uac() --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/aec01a7e10be54d2e2d9a91e54157a5… Patch: https://github.com/kamailio/kamailio/commit/aec01a7e10be54d2e2d9a91e54157a5… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index 4ca2274c9d7..5c2fc7be56a 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -240,7 +240,7 @@ void tm_rpc_response_list_clean(unsigned int ticks, void *param) static int rpc_uac_check_msg(rpc_t *rpc, void* c, struct sip_msg* msg, str* method, str* body, - int* fromtag, int *cseq_is, int* cseq, + str* fromtag, int *cseq_is, int* cseq, str* callid) { struct to_body* parsed_from; @@ -275,7 +275,13 @@ static int rpc_uac_check_msg(rpc_t *rpc, void* c, } parsed_from = (struct to_body*)msg->from->parsed; - *fromtag = parsed_from->tag_value.s && parsed_from->tag_value.len; + if(parsed_from->tag_value.s && parsed_from->tag_value.len) { + fromtag->s = parsed_from->tag_value.s; + fromtag->len = parsed_from->tag_value.len; + } else { + fromtag->s = NULL; + fromtag->len = 0; + } *cseq = 0; if (msg->cseq && (parsed_cseq = get_cseq(msg))) { @@ -634,7 +640,8 @@ static void rpc_t_uac(rpc_t* rpc, void* c, int reply_wait) struct socket_info* ssock; str saddr; int sport, sproto; - int ret, sip_error, err_ret, fromtag, cseq_is, cseq; + int ret, sip_error, err_ret, cseq_is, cseq; + str fromtag; char err_buf[MAX_REASON_LEN]; dlg_t dlg; uac_req_t uac_req; @@ -728,7 +735,9 @@ static void rpc_t_uac(rpc_t* rpc, void* c, int reply_wait) */ /* Generate fromtag if not present */ - if (!fromtag) { + if (fromtag.s && fromtag.len) { + dlg.id.loc_tag = fromtag; + } else { generate_fromtag(&dlg.id.loc_tag, &dlg.id.call_id, &ruri); } @@ -737,8 +746,11 @@ static void rpc_t_uac(rpc_t* rpc, void* c, int reply_wait) else dlg.loc_seq.value = DEFAULT_CSEQ; dlg.loc_seq.is_set = 1; - dlg.loc_uri = faked_msg.from->body; - dlg.rem_uri = faked_msg.to->body; + dlg.loc_uri = get_from(&faked_msg)->uri; + dlg.rem_uri = get_to(&faked_msg)->uri; + if(get_to(&faked_msg)->tag_value.len > 0) { + dlg.id.rem_tag = get_to(&faked_msg)->tag_value; + } dlg.rem_target = ruri; dlg.dst_uri = nexthop; dlg.send_sock=ssock;

1 year, 7 months

git:master:c8bd10f7: kex: added fixup free functions to module exports

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c8bd10f791ef7aa48a16104472b039a8ca1a53c5 URL: https://github.com/kamailio/kamailio/commit/c8bd10f791ef7aa48a16104472b039a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-13T11:59:53+02:00 kex: added fixup free functions to module exports --- Modified: src/modules/kex/kex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c8bd10f791ef7aa48a16104472b039a… Patch: https://github.com/kamailio/kamailio/commit/c8bd10f791ef7aa48a16104472b039a… --- diff --git a/src/modules/kex/kex_mod.c b/src/modules/kex/kex_mod.c index 21c4161ac9c..e46e85b5cf4 100644 --- a/src/modules/kex/kex_mod.c +++ b/src/modules/kex/kex_mod.c @@ -71,23 +71,23 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"setsflag", (cmd_function)w_setsflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"resetsflag", (cmd_function)w_resetsflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"issflagset", (cmd_function)w_issflagset, 1,fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"setbflag", (cmd_function)w_setbflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"setbflag", (cmd_function)w_setbflag, 2,fixup_igp_igp, - 0, ANY_ROUTE }, + fixup_free_igp_igp, ANY_ROUTE }, {"resetbflag", (cmd_function)w_resetbflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"resetbflag", (cmd_function)w_resetbflag, 2,fixup_igp_igp, - 0, ANY_ROUTE }, + fixup_free_igp_igp, ANY_ROUTE }, {"isbflagset", (cmd_function)w_isbflagset, 1,fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"isbflagset", (cmd_function)w_isbflagset, 2,fixup_igp_igp, - 0, ANY_ROUTE }, + fixup_free_igp_igp, ANY_ROUTE }, {"setdsturi", (cmd_function)w_setdsturi, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE }, {"resetdsturi", (cmd_function)w_resetdsturi, 0, 0, @@ -99,9 +99,9 @@ static cmd_export_t cmds[]={ {"avp_printf", (cmd_function)w_pv_printf, 2, pv_printf_fixup, 0, ANY_ROUTE }, {"is_myself", (cmd_function)w_is_myself, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"setdebug", (cmd_function)w_setdebug, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"resetdebug", (cmd_function)w_resetdebug, 0, 0, 0, ANY_ROUTE },

1 year, 7 months

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2022