sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
280 discussions

[kamailio/kamailio] uac_redirect: segfault when calling get_redirects("1") [regression] (Issue #3197)
by Alex Hermann 12 Aug '22

12 Aug '22

Since updating to 5.6, Kamailio segfaults when calling `get_redirects("1")`. ``` #0 0x000055d12c93c527 in get_str_fparam (dst=dst@entry=0x7ffd246edfe0, msg=msg@entry=0x7f83973b6a80, param=0x0) at core/sr_module.c:1646 val = {n = 1, s = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 749136082}, re = 0x1} ret = <optimized out> avp = <optimized out> pv_val = {rs = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 749136082}, ri = 1, flags = 0} __func__ = "get_str_fparam" #1 0x00007f838d2f0a17 in w_get_redirect2 (msg=0x7f83973b6a80, max_c=0x0, reason=<optimized out>) at uac_redirect.c:337 n = <optimized out> max = <optimized out> sreason = {s = 0x1a <error: Cannot access memory at address 0x1a>, len = -828131391} __func__ = "w_get_redirect2" #2 0x000055d12c975624 in do_action (h=h@entry=0x7ffd246ee820, a=a@entry=0x7f83cedd3670, msg=msg@entry=0x7f83973b6a80) at core/action.c:1085 ret = <optimized out> v = <optimized out> ... ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3197 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3197(a)github.com>

4 5

git:master:3b1354e2: uac_redirect: check if reason parameter ifs provided for get_redirects()
by Daniel-Constantin Mierla 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: 3b1354e2fd26c06fa6bc5ddbee1a012507aa2ea5 URL: https://github.com/kamailio/kamailio/commit/3b1354e2fd26c06fa6bc5ddbee1a012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-12T09:16:24+02:00 uac_redirect: check if reason parameter ifs provided for get_redirects() - cope properly with the common function used for the two function variants - GH #3197 --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/3b1354e2fd26c06fa6bc5ddbee1a012… Patch: https://github.com/kamailio/kamailio/commit/3b1354e2fd26c06fa6bc5ddbee1a012… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index 76b7592b5a..9925621d0e 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -344,17 +344,19 @@ static int w_get_redirect2(struct sip_msg* msg, char *max_c, char *reason) { int n; unsigned short max; - str sreason; + str sreason = {0}; - if(fixup_get_svalue(msg, (gparam_t*)reason, &sreason)<0) { - LM_ERR("failed to get reason parameter\n"); - return -1; + if(reason!=NULL) { + if(fixup_get_svalue(msg, (gparam_t*)reason, &sreason)<0) { + LM_ERR("failed to get reason parameter\n"); + return -1; + } } msg_tracer( msg, 0); /* get the contacts */ max = (unsigned short)(long)max_c; - n = get_redirect(msg , (max>>8)&0xff, max&0xff, &sreason, bflags); + n = get_redirect(msg , (max>>8)&0xff, max&0xff, (reason)?&sreason:NULL, bflags); reset_filters(); /* reset the tracer */ msg_tracer( msg, 1);

1 0

git:master:939ceb33: usrloc: do not send keepalives when destroying modules
by Daniel-Constantin Mierla 11 Aug '22

11 Aug '22

Module: kamailio Branch: master Commit: 939ceb3390b171b773eeb438b8fff72022e4f6f0 URL: https://github.com/kamailio/kamailio/commit/939ceb3390b171b773eeb438b8fff72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-11T21:49:22+02:00 usrloc: do not send keepalives when destroying modules - GH #3207 --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/939ceb3390b171b773eeb438b8fff72… Patch: https://github.com/kamailio/kamailio/commit/939ceb3390b171b773eeb438b8fff72… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 5b1572483b..8808725849 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -33,6 +33,7 @@ #include "../../core/forward.h" #include "../../core/globals.h" #include "../../core/pvar.h" +#include "../../core/sr_module.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" @@ -110,6 +111,11 @@ int ul_ka_urecord(urecord_t *ur) if (ul_ka_mode == ULKA_NONE) { return 0; } + + if(likely(destroy_modules_phase()!=0)) { + return 0; + } + LM_DBG("keepalive for aor: %.*s\n", ur->aor.len, ur->aor.s); tnow = time(NULL);

1 0

git:master:40d0c0ef: modules: readme files regenerated - uac_redirect ... [skip ci]
by Kamailio Dev 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: 40d0c0ef19439ba03822c1a875ea0461f3f1106b URL: https://github.com/kamailio/kamailio/commit/40d0c0ef19439ba03822c1a875ea046… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-10T22:46:19+02:00 modules: readme files regenerated - uac_redirect ... [skip ci] --- Modified: src/modules/uac_redirect/README --- Diff: https://github.com/kamailio/kamailio/commit/40d0c0ef19439ba03822c1a875ea046… Patch: https://github.com/kamailio/kamailio/commit/40d0c0ef19439ba03822c1a875ea046… --- diff --git a/src/modules/uac_redirect/README b/src/modules/uac_redirect/README index 812755bc5d..c016467df9 100644 --- a/src/modules/uac_redirect/README +++ b/src/modules/uac_redirect/README @@ -205,10 +205,12 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") 4.4. acc_function (string) Specifies the accounting function to be used. Just by defining this - parameter, the accounting support will not be enabled. Accounting may - only be enabled via two parameters set_accept_filter() scripting + parameter, the accounting is not done automatically, it has to be + requested via parameters of set_accept_filter() or other scripting function. + Set it to empty string in order to disable binding to acc module. + Its values may be: * acc_log_request * acc_db_request @@ -224,10 +226,7 @@ modparam("uac_redirect","acc_function","acc_db_request") 4.5. acc_db_table (string) Specifies the accounting table to be used if DB accounting was chosen - (acc_function was set to “acc_db_request”). Just by defining this - parameter, the accounting support will not be enabled. Accounting may - only be enabled via two parameters set_accept_filter() scripting - function. + (acc_function was set to “acc_db_request” or “acc_request”). The default value is “acc”.

1 0

git:master:7ef109e6: uac_redirect: clarifications for acc_function mod param
by Daniel-Constantin Mierla 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: 7ef109e6cd1ce7ecbfa56c31ff7555275e59095f URL: https://github.com/kamailio/kamailio/commit/7ef109e6cd1ce7ecbfa56c31ff75552… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-10T22:39:03+02:00 uac_redirect: clarifications for acc_function mod param --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7ef109e6cd1ce7ecbfa56c31ff75552… Patch: https://github.com/kamailio/kamailio/commit/7ef109e6cd1ce7ecbfa56c31ff75552… --- diff --git a/src/modules/uac_redirect/doc/uac_redirect_admin.xml b/src/modules/uac_redirect/doc/uac_redirect_admin.xml index 1388fc740a4..71a448a6ae7 100644 --- a/src/modules/uac_redirect/doc/uac_redirect_admin.xml +++ b/src/modules/uac_redirect/doc/uac_redirect_admin.xml @@ -211,11 +211,14 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") <section id="uac_redirect.p.acc_function"> <title><varname>acc_function</varname> (string)</title> <para> - Specifies the accounting function to be used. Just by defining - this parameter, the accounting support will not be enabled. - Accounting may only be enabled via two parameters - <function moreinfo="none">set_accept_filter()</function> - scripting function. + Specifies the accounting function to be used. Just by defining + this parameter, the accounting is not done automatically, it has to + be requested via parameters of + <function moreinfo="none">set_accept_filter()</function> + or other scripting function. + </para> + <para> + Set it to empty string in order to disable binding to acc module. </para> <para> Its values may be: @@ -248,13 +251,9 @@ modparam("uac_redirect","acc_function","acc_db_request") <section id="uac_redirect.p.acc_db_table"> <title><varname>acc_db_table</varname> (string)</title> <para> - Specifies the accounting table to be used if DB accounting was - chosen (<varname>acc_function</varname> was set to - <quote>acc_db_request</quote>). Just by defining - this parameter, the accounting support will not be enabled. - Accounting may only be enabled via two parameters - <function moreinfo="none">set_accept_filter()</function> - scripting function. + Specifies the accounting table to be used if DB accounting was + chosen (<varname>acc_function</varname> was set to + <quote>acc_db_request</quote> or <quote>acc_request</quote>). </para> <para> <emphasis>

1 0

[kamailio/kamailio] Fix isup generic_number and generic_number_nai decoding (PR #3209)
by russagit 10 Aug '22

10 Aug '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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description ISUP parameter Generic Number has a different structure (offset+2 is a Number Quilifirer Indicator) than other numbers, so this fix addresses it's decoding bug You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3209 -- Commit Summary -- * Fix isup generic_number and generic_number_nai decoding -- File Changes -- M src/modules/sipt/ss7_parser.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3209.patch https://github.com/kamailio/kamailio/pull/3209.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3209 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3209(a)github.com>

2 2

git:master:9f3d1c27: sipt: Fix isup generic_number and generic_number_nai decoding (GH #3209)
by Henning Westerholt 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: 9f3d1c274ad926e9640d0091c9702a34f8b2e539 URL: https://github.com/kamailio/kamailio/commit/9f3d1c274ad926e9640d0091c9702a3… Author: russagit <rustam.safargalin(a)sifox.ru> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-10T09:23:57Z sipt: Fix isup generic_number and generic_number_nai decoding (GH #3209) --- Modified: src/modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/9f3d1c274ad926e9640d0091c9702a3… Patch: https://github.com/kamailio/kamailio/commit/9f3d1c274ad926e9640d0091c9702a3… --- diff --git a/src/modules/sipt/ss7_parser.c b/src/modules/sipt/ss7_parser.c index 30d85cdb1e2..eaac53e5ca0 100644 --- a/src/modules/sipt/ss7_parser.c +++ b/src/modules/sipt/ss7_parser.c @@ -570,7 +570,7 @@ int isup_get_generic_number_nai(unsigned char *buf, int len) if(offset != -1 && len-offset-2 > 1) { - return buf[offset+2] & 0x7F; + return buf[offset+3] & 0x7F; } return -1; } @@ -586,13 +586,13 @@ int isup_get_generic_number(unsigned char *buf, int len, char* sb_buf) if(offset != -1 && len-offset-2 > 1) { sbparamlen = (buf[offset+1] & 0xFF) - 2; - oddeven = (buf[offset+2] >> 7) & 0x1; + oddeven = (buf[offset+3] >> 7) & 0x1; while ((sbparamlen > 0) && (buf[offset] != 0)) { - sb_buf[sb_i]="0123456789ABCDEF"[(buf[offset+4+sb_j] & 0x0F)]; + sb_buf[sb_i]="0123456789ABCDEF"[(buf[offset+5+sb_j] & 0x0F)]; if(sbparamlen > 1 || oddeven == 0) { - sb_buf[sb_i+1]="0123456789ABCDEF"[(buf[offset+4+sb_j] >>4 & 0x0F)]; + sb_buf[sb_i+1]="0123456789ABCDEF"[(buf[offset+5+sb_j] >>4 & 0x0F)]; } sb_i=sb_i+2; sbparamlen--;

1 0

git:master:d6ef0bf4: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: d6ef0bf487e6246092683e0281f5323f056cdaf4 URL: https://github.com/kamailio/kamailio/commit/d6ef0bf487e6246092683e0281f5323… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-10T09:31:18+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/d6ef0bf487e6246092683e0281f5323… Patch: https://github.com/kamailio/kamailio/commit/d6ef0bf487e6246092683e0281f5323… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 2ec0fb1de3..ca57cc7a0c 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -575,7 +575,8 @@ modparam("siptrace", "evcb_msg", "ksr_siptrace_msg") 3.25. trace_dialog_ack (str) - Enable tracing of in-dialog ACK. + Enable tracing of in-dialog ACK. Before this param, one must have set + the onsend() route and captured the outgoing ACK there. Default value is 1 (enabled). @@ -586,7 +587,10 @@ modparam("siptrace", "trace_dialog_ack", 1) 3.26. trace_dialog_spiral (str) - Enable tracing of dialog spirals. + Enable tracing of dialog spirals. A spiraled dialog is a dialog + established by a SIP INVITE that loops back to the same kamailio(as + next hop). Right now, inside the siptrace code, a spiraled dialog is + identified by (*params->param == NULL). Default value is 1 (enabled).

1 0

git:master:b4ab0fdc: siptrace: Update doc for the two new modparams
by Stefan Mititelu 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: b4ab0fdcb9f49b2a3b3cac24b20a0f4e50283468 URL: https://github.com/kamailio/kamailio/commit/b4ab0fdcb9f49b2a3b3cac24b20a0f4… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2022-08-10T10:24:51+03:00 siptrace: Update doc for the two new modparams --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b4ab0fdcb9f49b2a3b3cac24b20a0f4… Patch: https://github.com/kamailio/kamailio/commit/b4ab0fdcb9f49b2a3b3cac24b20a0f4… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index ec5a5da63c..430c35b4f8 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -656,6 +656,7 @@ modparam("siptrace", "evcb_msg", "ksr_siptrace_msg") <title><varname>trace_dialog_ack</varname> (str)</title> <para> Enable tracing of in-dialog ACK. + Before this param, one must have set the onsend() route and captured the outgoing ACK there. </para> <para> Default value is 1 (enabled). @@ -674,6 +675,8 @@ modparam("siptrace", "trace_dialog_ack", 1) <title><varname>trace_dialog_spiral</varname> (str)</title> <para> Enable tracing of dialog spirals. + A spiraled dialog is a dialog established by a SIP INVITE that loops back to the same kamailio(as next hop). + Right now, inside the siptrace code, a spiraled dialog is identified by (*params->param == NULL). </para> <para> Default value is 1 (enabled).

2 1

git:master:501421f4: siptrace: Trace in-dialog ACK and dialog spirals
by Henning Westerholt 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: 501421f42c17a411bde0fb2401437fa2ba1f5c66 URL: https://github.com/kamailio/kamailio/commit/501421f42c17a411bde0fb2401437fa… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-08T15:16:34+02:00 siptrace: Trace in-dialog ACK and dialog spirals Enable behavior via 2 new modparams. --- Modified: src/modules/siptrace/doc/siptrace_admin.xml Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/501421f42c17a411bde0fb2401437fa… Patch: https://github.com/kamailio/kamailio/commit/501421f42c17a411bde0fb2401437fa… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index c160b97275e..7852647f37d 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -651,6 +651,43 @@ modparam("siptrace", "evcb_msg", "ksr_siptrace_msg") </programlisting> </example> </section> + + <section id="siptrace.p.trace_dialog_ack"> + <title><varname>trace_dialog_ack</varname> (str)</title> + <para> + Enable tracing of in-dialog ACK. + </para> + <para> + Default value is 0 (disabled). + </para> + <example> + <title>Set <varname>trace_dialog_ack</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("siptrace", "trace_dialog_ack", 1) +... +</programlisting> + </example> + </section> + + <section id="siptrace.p.trace_dialog_spiral"> + <title><varname>trace_dialog_spiral</varname> (str)</title> + <para> + Enable tracing of dialog spirals. + </para> + <para> + Default value is 0 (disabled). + </para> + <example> + <title>Set <varname>trace_dialog_spiral</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("siptrace", "trace_dialog_spiral", 1) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 9540e83d062..81913f064da 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -195,6 +195,10 @@ static str trace_local_ip = {NULL, 0}; static db1_con_t *db_con = NULL; /*!< database connection */ static db_func_t db_funcs; /*!< Database functions */ +int trace_dialog_ack = 0; +int trace_dialog_spiral = 0; +static int spiral_tracked; + int pv_parse_siptrace_name(pv_spec_t *sp, str *in); int pv_get_siptrace(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); @@ -263,6 +267,8 @@ static param_export_t params[] = { {"trace_init_mode", PARAM_INT, &_siptrace_init_mode}, {"trace_mode", PARAM_INT, &_siptrace_mode}, {"evcb_msg", PARAM_STR, &_siptrace_evcb_msg}, + {"trace_dialog_ack", PARAM_INT, &trace_dialog_ack}, + {"trace_dialog_spiral", PARAM_INT, &trace_dialog_spiral}, {0, 0, 0} }; /* clang-format on */ @@ -1979,12 +1985,19 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p } /* request - params->req */ - if (params == NULL || params->req == NULL) { + if (params == NULL || (!trace_dialog_spiral && params->req == NULL)) { LM_ERR("Invalid args!\n"); return; } - if (!(params->req->msg_flags & FL_SIPTRACE)) { + if (trace_dialog_spiral && *params->param == NULL) { + LM_DBG("Spiraled dialog!\n"); + if (dlgb.register_dlgcb(dlg, DLGCB_SPIRALED, trace_dialog, &spiral_tracked, NULL) != 0) { + LM_ERR("could not register consider_exporting() for dialog event DLGCB_SPIRALED\n"); + } + } + + if (!trace_dialog_spiral && !(params->req->msg_flags & FL_SIPTRACE)) { LM_DBG("Trace is off for this request...\n"); return; } @@ -2007,6 +2020,13 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p return; } + /* this will trace in-dialog ACK */ + if(trace_dialog_ack && dlgb.register_dlgcb(dlg, DLGCB_CONFIRMED, + trace_dialog_transaction, xavp->val.v.vptr, 0) != 0) { + LM_ERR("Failed to register DLGCB_CONFIRMED callback!\n"); + return; + } + if(dlgb.register_dlgcb(dlg, DLGCB_TERMINATED, trace_dialog_transaction, xavp->val.v.vptr, trace_free_info) != 0) { LM_ERR("Failed to register DLGCB_TERMINATED callback!\n");

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2022