sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
385 discussions

[kamailio/kamailio] kamcmd: don't clash with ENV NAME or ctl.so module (PR #3628)

by Christian Marangi

NAME variable might be set to the current HOSTNAME in some shell and also clash with the value set by the module calling MOD_INSTALL_UTILS by passing a NAME variable. With commit 1774cee62098 ("kamcmd: allow defining the name of the application from command line") this resulted in the kamcmd bin being renamed to all kind of name from hostname to ctl.so. Fix this by checking the variable to a more safe name that is not already defined in shell by default and also that doesn't clash with module variables, use UTIL_NAME as an alternative to NAME. UTIL_NAME now needs to be used to create kamcmd with custom name. Fixes: 1774cee62098 ("kamcmd: allow defining the name of the application from command line")   #### 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/3628 -- Commit Summary -- * kamcmd: don't clash with ENV NAME or ctl.so module -- File Changes -- M utils/kamcmd/Makefile (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3628.patch https://github.com/kamailio/kamailio/pull/3628.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3628 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3628(a)github.com>

6 months, 2 weeks

git:master:b141f267: kamcmd: Makefile - use CUSTOM_NAME for specifying custom binary name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b141f267ce1fe1068de1541d8bd5b5dc53c1d6d9 URL: https://github.com/kamailio/kamailio/commit/b141f267ce1fe1068de1541d8bd5b5d… Author: Christian Marangi <ansuelsmth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T16:13:55+01:00 kamcmd: Makefile - use CUSTOM_NAME for specifying custom binary name - previous use of NAME can clash with environment variable NAME that could be set by OS or by Kamailio modules installation - GH #3628 --- Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b141f267ce1fe1068de1541d8bd5b5d… Patch: https://github.com/kamailio/kamailio/commit/b141f267ce1fe1068de1541d8bd5b5d… --- diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index 1fd923d8554..c8298a8662c 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -8,10 +8,15 @@ include $(COREPATH)/Makefile.targets auto_gen= RELEASE=1.5 UTIL_SRC_NAME=kamcmd +# Pass CUSTOM_NAME to overwrite the kamcmd/sercmd bin name +ifeq ($(CUSTOM_NAME),) ifeq ($(FLAVOUR),ser) - NAME?=sercmd + NAME=sercmd else - NAME?=kamcmd + NAME=kamcmd +endif +else + NAME=$(CUSTOM_NAME) endif readline_localpath=$(LOCALBASE)/include/readline/readline.h

6 months, 2 weeks

git:master:511964bd: topos: handle NOTIFY during call setup

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 511964bd91d0fb0099dab14a69296d21d37abffa URL: https://github.com/kamailio/kamailio/commit/511964bd91d0fb0099dab14a69296d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T14:20:53+01:00 topos: handle NOTIFY during call setup - GH #3627 --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/511964bd91d0fb0099dab14a69296d2… Patch: https://github.com/kamailio/kamailio/commit/511964bd91d0fb0099dab14a69296d2… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index c2dd3e70b7d..740f87b067f 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -910,7 +910,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) goto error; } metid = get_cseq(msg)->method_id; - if((metid & (METHOD_BYE | METHOD_INFO | METHOD_PRACK | METHOD_UPDATE)) + if((metid + & (METHOD_BYE | METHOD_INFO | METHOD_PRACK | METHOD_UPDATE + | METHOD_NOTIFY)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ if(metid & (METHOD_BYE | METHOD_UPDATE)) { diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 70c003c944c..63951386622 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1130,9 +1130,7 @@ int tps_db_load_branch( db_val_t db_vals[5]; db_key_t db_cols[TPS_NR_KEYS]; db1_res_t *db_res = NULL; - str sinv = str_init("INVITE"); - str ssub = str_init("SUBSCRIBE"); - int bInviteDlg = 1; + str sMethodDlg = str_init("INVITE"); int nr_keys; int nr_cols; int n; @@ -1144,10 +1142,13 @@ int tps_db_load_branch( nr_keys = 0; nr_cols = 0; - if((get_cseq(msg)->method_id == METHOD_SUBSCRIBE) - || ((get_cseq(msg)->method_id == METHOD_NOTIFY) - && (msg->event && msg->event->len > 0))) { - bInviteDlg = 0; + if(get_cseq(msg)->method_id == METHOD_SUBSCRIBE) { + sMethodDlg.s = "SUBSCRIBE"; + sMethodDlg.len = 9; + } else if(get_cseq(msg)->method_id == METHOD_NOTIFY) { + /* NOTIFY can be also sent during call setup - ignore dialog method */ + sMethodDlg.s = ""; + sMethodDlg.len = 0; } if(mode == 0) { @@ -1178,12 +1179,14 @@ int tps_db_load_branch( } nr_keys++; - db_keys[nr_keys] = &tt_col_s_method; - db_ops[nr_keys] = OP_EQ; - db_vals[nr_keys].type = DB1_STR; - db_vals[nr_keys].nul = 0; - db_vals[nr_keys].val.str_val = bInviteDlg ? sinv : ssub; - nr_keys++; + if(sMethodDlg.len > 0) { + db_keys[nr_keys] = &tt_col_s_method; + db_ops[nr_keys] = OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; + db_vals[nr_keys].val.str_val = sMethodDlg; + nr_keys++; + } if(md->a_uuid.len > 0) { if(md->a_uuid.s[0] == 'a') {

6 months, 2 weeks

git:master:184417a1: tm: reformat exported structures more human friendly

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 184417a1089397baf47ed91a096660f1a421276c URL: https://github.com/kamailio/kamailio/commit/184417a1089397baf47ed91a096660f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T13:46:46+01:00 tm: reformat exported structures more human friendly --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/184417a1089397baf47ed91a096660f… Patch: https://github.com/kamailio/kamailio/commit/184417a1089397baf47ed91a096660f…

6 months, 2 weeks

[kamailio/kamailio] ims_charging: Implemented restore of Ro sessions from database (PR #3622)

by mtryfoss

- realtime and shutdown mode support - removed duplicate entry in doc about "ro_auth_expiry" - RO_TABLE_VERSION constant did not match inserted value in db schema   #### 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 Fixed the module so it also use information written to database to restore Ro sessions on startup/restart. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3622 -- Commit Summary -- * ims_charging: Implemented restore of Ro sessions from database -- File Changes -- M src/modules/ims_charging/dialog.c (6) M src/modules/ims_charging/doc/ims_charging_admin.xml (21) M src/modules/ims_charging/ims_charging_mod.c (15) M src/modules/ims_charging/ims_ro.c (2) M src/modules/ims_charging/ro_db_handler.c (444) M src/modules/ims_charging/ro_db_handler.h (11) M src/modules/ims_charging/ro_timer.c (2) M utils/kamctl/mysql/ims_charging-create.sql (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3622.patch https://github.com/kamailio/kamailio/pull/3622.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3622 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3622(a)github.com>

6 months, 2 weeks

git:master:becebaa8: ims_charging: Implemented restore of Ro sessions from database

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: becebaa826597eba250c1c90fdfa2ffaa90f1712 URL: https://github.com/kamailio/kamailio/commit/becebaa826597eba250c1c90fdfa2ff… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T13:31:44+01:00 ims_charging: Implemented restore of Ro sessions from database - realtime and shutdown mode support - removed duplicate entry in doc about "ro_auth_expiry" --- Modified: src/modules/ims_charging/dialog.c Modified: src/modules/ims_charging/doc/ims_charging_admin.xml Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_db_handler.c Modified: src/modules/ims_charging/ro_db_handler.h Modified: src/modules/ims_charging/ro_timer.c Modified: utils/kamctl/mysql/ims_charging-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/becebaa826597eba250c1c90fdfa2ff… Patch: https://github.com/kamailio/kamailio/commit/becebaa826597eba250c1c90fdfa2ff…

6 months, 2 weeks

git:master:70ecd99e: tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 70ecd99e3d8069d0f89444a5b893f61dd1edd1b3 URL: https://github.com/kamailio/kamailio/commit/70ecd99e3d8069d0f89444a5b893f61… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T13:29:09+01:00 tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/70ecd99e3d8069d0f89444a5b893f61… Patch: https://github.com/kamailio/kamailio/commit/70ecd99e3d8069d0f89444a5b893f61… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 997d1a5bb78..e0048f0604c 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -645,6 +645,7 @@ int t_cancel_suspend(unsigned int hash_index, unsigned int label) /* The transaction does not need to be locked because this * function is either executed from the original route block * or from failure route which already locks */ + t->flags &= ~T_ASYNC_SUSPENDED; reset_kr(); /* the blind UAC of t_suspend has set kr */

6 months, 2 weeks

[kamailio/kamailio] tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension (PR #3629)

by mtryfoss

#### 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 I've been testing the ims_charging module which relies on a diameter request and async reply. If there's no available diameter server, Ro_CCR() calls t_cancel_suspend() to cancel suspension of the transaction and return an error. Based on my understanding, it should now be possible to continue script logic as if the transaction was not suspended at all. In our case we want the call to go through anyway, as a fallback. The INVITE is being sent to the destination, but all replies are filtered since the suspended flag is still set. Tested this change locally, and it's now working according to our needs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3629 -- Commit Summary -- * tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension -- File Changes -- M src/modules/tm/t_suspend.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3629.patch https://github.com/kamailio/kamailio/pull/3629.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3629 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3629(a)github.com>

6 months, 2 weeks

git:master:4cec039c: modules: readme files regenerated - tm ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 4cec039ce1b7fa2d1980f8f30dd7bb1012e3c9cb URL: https://github.com/kamailio/kamailio/commit/4cec039ce1b7fa2d1980f8f30dd7bb1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-05T22:02:26+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/4cec039ce1b7fa2d1980f8f30dd7bb1… Patch: https://github.com/kamailio/kamailio/commit/4cec039ce1b7fa2d1980f8f30dd7bb1… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 216533fbfb6..41dced573d2 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -2101,6 +2101,9 @@ if (t_newtran()) { * code - Reply code number. * reason_phrase - Reason string. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + ONREPLY_ROUTE. + Example 1.63. t_reply usage ... t_reply("404", "Not found"); @@ -2111,7 +2114,8 @@ t_reply("404", "Not found"); Sends a stateful reply based in internal error code, similar to sl_send_error() from sl module. - This function can be used from REQUEST_ROUTE. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + ONREPLY_ROUTE. Example 1.64. t_reply_error usage ...

6 months, 2 weeks

git:master:9bbf86a8: tm: docs updated for t_reply_error()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9bbf86a8a7e598a67254e2907dcc430af98f5689 URL: https://github.com/kamailio/kamailio/commit/9bbf86a8a7e598a67254e2907dcc430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-05T21:48:43+01:00 tm: docs updated for t_reply_error() --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/9bbf86a8a7e598a67254e2907dcc430… Patch: https://github.com/kamailio/kamailio/commit/9bbf86a8a7e598a67254e2907dcc430… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index 7bcc3a43ccf..539e4f0dafb 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -359,6 +359,9 @@ if (t_newtran()) { </para> </listitem> </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE. + </para> <example> <title><function>t_reply</function> usage</title> <programlisting> @@ -378,7 +381,7 @@ t_reply("404", "Not found"); sl_send_error() from sl module. </para> <para> - This function can be used from REQUEST_ROUTE. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE. </para> <example> <title><function>t_reply_error</function> usage</title>

6 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023