sr-dev October 2022

sr-dev@lists.kamailio.org

12 participants
201 discussions

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

13 Oct '22

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

2 4

git:master:aec01a7e: tm: proper fill of From/To URI/tag values using parsed structure in rpc_t_uac()
by Daniel-Constantin Mierla 13 Oct '22

13 Oct '22

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 0

git:master:c8bd10f7: kex: added fixup free functions to module exports
by Daniel-Constantin Mierla 13 Oct '22

13 Oct '22

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 0

git:master:bc97b7ad: nats: safety check on nats_workers inside mod destroy
by Daniel-Constantin Mierla 13 Oct '22

13 Oct '22

Module: kamailio Branch: master Commit: bc97b7adf77406dfc08b57b4a7df912a76d324e5 URL: https://github.com/kamailio/kamailio/commit/bc97b7adf77406dfc08b57b4a7df912… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-13T09:40:44+02:00 nats: safety check on nats_workers inside mod destroy --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bc97b7adf77406dfc08b57b4a7df912… Patch: https://github.com/kamailio/kamailio/commit/bc97b7adf77406dfc08b57b4a7df912… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 852d0fbbab2..b89bab5bd12 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -600,6 +600,9 @@ int nats_destroy_workers() */ static void mod_destroy(void) { + if(nats_workers==NULL) { + return; + } if(nats_destroy_workers() < 0) { LM_ERR("could not cleanup workers\n"); }

1 0

[kamailio/kamailio] htable: bogus error while trying to iterate over an empty htable (Issue #3260)
by Ovidiu Sas 12 Oct '22

12 Oct '22

### Description While trying to iterate over an empty htable, this erro is printed: ``` ERROR: htable [ht_api.c:1847]: ht_iterator_end(): iterator not found [HTABLE_NAME] ``` There error log should be removed, it is normal to not find an iterator on an empty table. This error is printed only on version 5.6.x and up. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3260 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3260(a)github.com>

2 3

git:master:6081ae45: modules: readme files regenerated - topoh ... [skip ci]
by Kamailio Dev 12 Oct '22

12 Oct '22

Module: kamailio Branch: master Commit: 6081ae45c21a50036d9b773d11b5c692767d6d1f URL: https://github.com/kamailio/kamailio/commit/6081ae45c21a50036d9b773d11b5c69… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-10-12T16:16:30+02:00 modules: readme files regenerated - topoh ... [skip ci] --- Modified: src/modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/6081ae45c21a50036d9b773d11b5c69… Patch: https://github.com/kamailio/kamailio/commit/6081ae45c21a50036d9b773d11b5c69…

1 0

git:master:dc46d8eb: topoh: docs for mask_mode parameter
by Daniel-Constantin Mierla 12 Oct '22

12 Oct '22

Module: kamailio Branch: master Commit: dc46d8eb102d4390a5cb257ee1ac9a0cc7528551 URL: https://github.com/kamailio/kamailio/commit/dc46d8eb102d4390a5cb257ee1ac9a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-12T13:36:53+02:00 topoh: docs for mask_mode parameter --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dc46d8eb102d4390a5cb257ee1ac9a0… Patch: https://github.com/kamailio/kamailio/commit/dc46d8eb102d4390a5cb257ee1ac9a0… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index ff98338f027..c8718b81a79 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -133,6 +133,29 @@ modparam("topoh", "mask_ip", "192.168.0.1") ... modparam("topoh", "mask_callid", 1) ... +</programlisting> + </example> + </section> + <section id="topoh.p.mask_mode"> + <title><varname>mask_mode</varname> (integer)</title> + <para> + Control when and what parts of SIP message are masked. + </para> + <para> + It works as a bitmask value. The following options are available: + (1) - skip masking Contact headers in 3XX (redirect) replies. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>mask_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "mask_mode", 1) +... </programlisting> </example> </section>

1 0

git:master:279de091: topoh: modparam to control header masking
by Daniel-Constantin Mierla 12 Oct '22

12 Oct '22

Module: kamailio Branch: master Commit: 279de09111c0884f01fa002fabc8a200fcc26846 URL: https://github.com/kamailio/kamailio/commit/279de09111c0884f01fa002fabc8a20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-12T13:20:19+02:00 topoh: modparam to control header masking - mask_mode - a new parameter - if bit 1 is set, the masking of contact header in 3xx replies is skipped - GH #3256 --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/279de09111c0884f01fa002fabc8a20… Patch: https://github.com/kamailio/kamailio/commit/279de09111c0884f01fa002fabc8a20… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index b8f7e3a852c..55bb18145b0 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -60,6 +60,8 @@ MODULE_VERSION +#define TH_MASKMODE_SLIP3XXCONTACT 1 + /** module parameters */ str _th_key = str_init("aL9.n8~Hm]Z"); str th_cookie_name = str_init("TH"); /* lost parameter? */ @@ -75,6 +77,7 @@ str th_via_prefix = {0, 0}; str th_uri_prefix = {0, 0}; int th_param_mask_callid = 0; +int th_param_mask_mode = 0; int th_sanity_checks = 0; int th_uri_prefix_checks = 0; @@ -103,6 +106,7 @@ static param_export_t params[]={ {"mask_key", PARAM_STR, &_th_key}, {"mask_ip", PARAM_STR, &th_ip}, {"mask_callid", PARAM_INT, &th_param_mask_callid}, + {"mask_mode", PARAM_INT, &th_param_mask_mode}, {"uparam_name", PARAM_STR, &th_uparam_name}, {"uparam_prefix", PARAM_STR, &th_uparam_prefix}, {"vparam_name", PARAM_STR, &th_vparam_name}, @@ -515,7 +519,11 @@ int th_msg_sent(sr_event_param_t *evp) } } else { th_flip_record_route(&msg, 1); - th_mask_contact(&msg); + if(!(th_param_mask_mode & TH_MASKMODE_SLIP3XXCONTACT) + || msg.first_line.u.reply.statuscode < 300 + || msg.first_line.u.reply.statuscode > 399) { + th_mask_contact(&msg); + } if(th_cookie_value.s[0]=='d') { th_mask_callid(&msg); }

1 0

git:master:17ef6f22: src/Makefile: deb-stable is bullseye nowadays
by Victor Seva 12 Oct '22

12 Oct '22

Module: kamailio Branch: master Commit: 17ef6f22f24a77fba64d8076c8be771fac2ab00a URL: https://github.com/kamailio/kamailio/commit/17ef6f22f24a77fba64d8076c8be771… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-10-12T09:48:38+02:00 src/Makefile: deb-stable is bullseye nowadays https://github.com/kamailio/pkg-kamailio-docker/issues/3 --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/17ef6f22f24a77fba64d8076c8be771… Patch: https://github.com/kamailio/kamailio/commit/17ef6f22f24a77fba64d8076c8be771… --- diff --git a/src/Makefile b/src/Makefile index a6380c2283..8fc3f57aaa 100644 --- a/src/Makefile +++ b/src/Makefile @@ -626,7 +626,7 @@ deb-stable: dpkg-buildpackage -rfakeroot -tc -uc -us; \ rm debian; \ else \ - ln -s pkg/$(MAIN_NAME)/deb/buster debian; \ + ln -s pkg/$(MAIN_NAME)/deb/bullseye debian; \ dpkg-buildpackage -rfakeroot -tc -uc -us; \ rm debian; \ fi)

1 0

[kamailio/kamailio] Unexpected kamailio 5.4 segfault (#2828)
by nmateo26 11 Oct '22

11 Oct '22

Dear all we have seen a core in a running production kamailio instance today, i attach you the bt in dropbox version: kamailio 5.4.4 (x86_64/linux) 0ddb01-dirty centos7 3.10.0-693.17.1.el7.x86_64 https://www.dropbox.com/s/fpunfs0o9aqhwww/kamailio_core_17agosto.txt?dl=0 ~~~ #0 0x00007f4c131446ad in print_lists (dlg=0x7f4b60abb2e8) at dlg_var.c:277 #1 0x00007f4c131467ff in pv_set_dlg_variable (msg=0x7f4c17592d70, param=0x7f4c17aa88d0, op=254, val=0x7ffc8de8c990) at dlg_var.c:443 #2 0x00000000004f9c82 in lval_pvar_assign (h=0x7ffc8de8ddc0, msg=0x7f4c17592d70, lv=0x7f4c17aa8998, rv=0x7f4c17aa8b18) at core/lvalue.c:352 #3 0x00000000004fa780 in lval_assign (h=0x7ffc8de8ddc0, msg=0x7f4c17592d70, lv=0x7f4c17aa8998, rve=0x7f4c17aa8b10) at core/lvalue.c:400 #4 0x00000000004c3f6f in do_action (h=0x7ffc8de8ddc0, a=0x7f4c17aa92b0, msg=0x7f4c17592d70) at core/action.c:1455 #5 0x00000000004c5cab in run_actions (h=0x7ffc8de8ddc0, a=0x7f4c17aa8668, msg=0x7f4c17592d70) at core/action.c:1581 #6 0x00000000004b8867 in do_action (h=0x7ffc8de8ddc0, a=0x7f4c17aac2b0, msg=0x7f4c17592d70) at core/action.c:1067 #7 0x00000000004c5cab in run_actions (h=0x7ffc8de8ddc0, a=0x7f4c17aa34c0, msg=0x7f4c17592d70) at core/action.c:1581 #8 0x00000000004c63ef in run_top_route (a=0x7f4c17aa34c0, msg=0x7f4c17592d70, c=0x7ffc8de8ddc0) at core/action.c:1666 #9 0x00007f4c16bbc0a2 in reply_received (p_msg=0x7f4c17592d70) at t_reply.c:2543 #10 0x00000000005d0b69 in do_forward_reply (msg=0x7f4c17592d70, mode=0) at core/forward.c:764 #11 0x00000000005d283b in forward_reply (msg=0x7f4c17592d70) at core/forward.c:865 #12 0x0000000000622dd2 in receive_msg ( buf=0xb034a0 <buf.7140> "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 79.170.68.186;branch=z9hG4bK895d.0e2ee1cb7a0cde9ed9e78d7f0ec22c00.0\r\nVia: SIP/2.0/UDP 79.170.71.172:5080;received=79.170.71.172;rport=5080;branch=z9hG4bKtmtBy7jaQ5"..., len=449, rcv_info=0x7ffc8de8e8b0) at core/receive.c:509 #13 0x0000000000521e67 in udp_rcv_loop () at core/udp_server.c:543 #14 0x0000000000429f56 in main_loop () at main.c:1689 #15 0x0000000000434034 in main (argc=13, argv=0x7ffc8de8f148) at main.c:2876 ~~~ Best regards, Noel -- 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/issues/2828

5 10

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2022