- sr-dev - kamailio.org

[kamailio/kamailio] sca: implement db_mode only (#781)
by Victor Seva 23 Nov '23

23 Nov '23

Sipwise hat ON: We have more than one server and we need to keep things in db in order to share sca subscription/appearance between servers -- 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/781

4 6

git:master:26d57116: sca: update rr if necessary for subscriptions
by Victor Seva 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: 26d57116abc86e5d10bb1e5fe05c555e70e731c4 URL: https://github.com/kamailio/kamailio/commit/26d57116abc86e5d10bb1e5fe05c555… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-22T18:26:10+01:00 sca: update rr if necessary for subscriptions --- Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/26d57116abc86e5d10bb1e5fe05c555… Patch: https://github.com/kamailio/kamailio/commit/26d57116abc86e5d10bb1e5fe05c555… --- diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index 6cdf33a6f74..6e9949a5d78 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -905,6 +905,17 @@ static int sca_subscription_update_unsafe(sca_mod *scam, } SCA_STR_COPY(&update_sub->rr, &saved_sub->rr); + } else if(!SCA_STR_EMPTY(&update_sub->rr) + && !STR_EQ(update_sub->rr, saved_sub->rr)) { + if(!SCA_STR_EMPTY(&saved_sub->rr)) { + shm_free(saved_sub->rr.s); + saved_sub->rr.len = 0; + } + if((saved_sub->rr.s = (char *)shm_malloc(update_sub->rr.len)) == NULL) { + SHM_MEM_ERROR; + goto done; + } + SCA_STR_COPY(&saved_sub->rr, &update_sub->rr); } rc = 1;

1 0

[kamailio/kamailio] sca: update rr if necessary for subscriptions (PR #3571)
by Victor Seva 22 Nov '23

22 Nov '23

#### 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 - [ ] Tested changes locally #### Description From https://github.com/kamailio/kamailio/pull/3569 After initial subscription by the SCA device, if we power off and on again, we won't get an unsubscribe notification and we are getting a new record-route with sca-subscription. In this case kamailio not updating the new record-route for the SCA Device. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3571 -- Commit Summary -- * sca: update rr if necessary for subscriptions -- File Changes -- M src/modules/sca/sca_subscribe.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3571.patch https://github.com/kamailio/kamailio/pull/3571.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3571 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3571(a)github.com>

3 6

git:master:e45c97d1: dialog: do not print module name in log messages
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: e45c97d112c7c396ae0a11b7a431582a71361e5b URL: https://github.com/kamailio/kamailio/commit/e45c97d112c7c396ae0a11b7a431582… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T14:53:33+01:00 dialog: do not print module name in log messages - it is added automatically --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/e45c97d112c7c396ae0a11b7a431582… Patch: https://github.com/kamailio/kamailio/commit/e45c97d112c7c396ae0a11b7a431582… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index e937947432c..a6e8179326e 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -552,7 +552,7 @@ static int mod_init(void) /* register statistics */ if(dlg_enable_stats && (register_module_stats(exports.name, mod_stats) != 0)) { - LM_ERR("failed to register %s statistics\n", exports.name); + LM_ERR("failed to register statistics\n"); return -1; } #endif

1 0

git:master:463d5b34: avp: do not print module name in log messages
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: 463d5b34390e330a2b733deb673c1c77e5be9fcb URL: https://github.com/kamailio/kamailio/commit/463d5b34390e330a2b733deb673c1c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T14:53:33+01:00 avp: do not print module name in log messages - it is added automatically --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/463d5b34390e330a2b733deb673c1c7… Patch: https://github.com/kamailio/kamailio/commit/463d5b34390e330a2b733deb673c1c7… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index 2478f38513c..38fa08fe1cb 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1704,6 +1704,6 @@ select_row_t sel_declaration[] = {{NULL, SEL_PARAM_STR, STR_STATIC_INIT("avp"), static int mod_init() { - DBG("%s - initializing\n", exports.name); + DBG("initializing\n"); return register_select_table(sel_declaration); }

1 0

git:master:89a95ce1: avpops: do not print module name in log messages
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: 89a95ce1abefd772c0f09054473b07bbfc5426bc URL: https://github.com/kamailio/kamailio/commit/89a95ce1abefd772c0f09054473b07b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T14:53:33+01:00 avpops: do not print module name in log messages - it is added automatically --- Modified: src/modules/avpops/avpops.c --- Diff: https://github.com/kamailio/kamailio/commit/89a95ce1abefd772c0f09054473b07b… Patch: https://github.com/kamailio/kamailio/commit/89a95ce1abefd772c0f09054473b07b… --- diff --git a/src/modules/avpops/avpops.c b/src/modules/avpops/avpops.c index 577a7d7fabe..9fc662ab603 100644 --- a/src/modules/avpops/avpops.c +++ b/src/modules/avpops/avpops.c @@ -810,12 +810,12 @@ static int fixup_subst(void **param, int param_no) } *param = (void *)av; } else if(param_no == 2) { - LM_DBG("%s fixing %s\n", exports.name, (char *)(*param)); + LM_DBG("fixing: %s\n", (char *)(*param)); subst.s = *param; subst.len = strlen(*param); se = subst_parser(&subst); if(se == 0) { - LM_ERR("%s: bad subst re %s\n", exports.name, (char *)*param); + LM_ERR("bad subst re: %s\n", (char *)*param); return E_BAD_RE; } /* don't free string -- needed for specifiers */

1 0

git:master:ba1c0424: textops: do not print module name in log messages
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: ba1c0424732f1f2ab01bfd078ee272221a6b3e10 URL: https://github.com/kamailio/kamailio/commit/ba1c0424732f1f2ab01bfd078ee2722… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T14:53:33+01:00 textops: do not print module name in log messages - it is added automatically --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/ba1c0424732f1f2ab01bfd078ee2722… Patch: https://github.com/kamailio/kamailio/commit/ba1c0424732f1f2ab01bfd078ee2722…

1 0

git:master:145659f9: github: set ``expired`` label when closing PR or issues automatically [skip ci]
by Victor Seva 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: 145659f9b81a0d489548fa8a0f75c0bd05660e2e URL: https://github.com/kamailio/kamailio/commit/145659f9b81a0d489548fa8a0f75c0b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-22T14:50:21+01:00 github: set ``expired`` label when closing PR or issues automatically [skip ci] --- Modified: .github/workflows/issue_management.yml --- Diff: https://github.com/kamailio/kamailio/commit/145659f9b81a0d489548fa8a0f75c0b… Patch: https://github.com/kamailio/kamailio/commit/145659f9b81a0d489548fa8a0f75c0b… --- diff --git a/.github/workflows/issue_management.yml b/.github/workflows/issue_management.yml index 063df358c62..0d0b2ef9aa5 100644 --- a/.github/workflows/issue_management.yml +++ b/.github/workflows/issue_management.yml @@ -17,6 +17,8 @@ jobs: stale-pr-message: 'This PR is stale because it has been open 6 weeks with no activity. Remove stale label or comment or this will be closed in 2 weeks.' days-before-stale: 42 days-before-close: 14 + close-issue-label: expired + close-pr-label: expired exempt-issue-labels: bug remove-stale-when-updated: true operations-per-run: 500

1 0

git:master:65322a8e: app_ruby: use module name prefix for exports structure
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: 65322a8ea66ed18fb2d089ade54702341e064944 URL: https://github.com/kamailio/kamailio/commit/65322a8ea66ed18fb2d089ade547023… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T14:05:21+01:00 app_ruby: use module name prefix for exports structure --- Modified: src/modules/app_ruby/app_ruby_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/65322a8ea66ed18fb2d089ade547023… Patch: https://github.com/kamailio/kamailio/commit/65322a8ea66ed18fb2d089ade547023… --- diff --git a/src/modules/app_ruby/app_ruby_mod.c b/src/modules/app_ruby/app_ruby_mod.c index 4d08464a996..4f713efea54 100644 --- a/src/modules/app_ruby/app_ruby_mod.c +++ b/src/modules/app_ruby/app_ruby_mod.c @@ -86,7 +86,7 @@ static param_export_t params[]={ {0, 0, 0} }; -struct module_exports exports = { +struct module_exports _app_ruby_exports = { "app_ruby", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */

1 0

git:master:a81e3c45: app_jsdt: use module name prefix for exports structure
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: a81e3c45dad338378fc8cf417bb0e9da1172a854 URL: https://github.com/kamailio/kamailio/commit/a81e3c45dad338378fc8cf417bb0e9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T14:05:21+01:00 app_jsdt: use module name prefix for exports structure --- Modified: src/modules/app_jsdt/app_jsdt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a81e3c45dad338378fc8cf417bb0e9d… Patch: https://github.com/kamailio/kamailio/commit/a81e3c45dad338378fc8cf417bb0e9d… --- diff --git a/src/modules/app_jsdt/app_jsdt_mod.c b/src/modules/app_jsdt/app_jsdt_mod.c index f83c098ec1a..df7c305a123 100644 --- a/src/modules/app_jsdt/app_jsdt_mod.c +++ b/src/modules/app_jsdt/app_jsdt_mod.c @@ -84,7 +84,7 @@ static param_export_t params[]={ {0, 0, 0} }; -struct module_exports exports = { +struct module_exports _app_jsdt_exports = { "app_jsdt", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */

1 0

[kamailio/kamailio] Add AoR argument to ims_ipsec_pcscf ipsec_destroy() (PR #3645)
by jbipre2 22 Nov '23

22 Nov '23

#### 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 - [ ] Tested changes locally - [X] Related to issue #3570 #### Description  Added optional AoR argument to ipsec_destroy(); to permit insertion of a real AoR from a cfg script. Otherwise, ipsec_destroy() uses the dummy AoR you(a)kamailio.org. The dummy AoR does not identify the IPSec SA of any UE present in the registrar, so no IPSec SA can be torn down. The real AoR, if present as an argument to ipsec_destroy() replaces the dummy AoR in m->first_line.u.request.uri.s, before calling fill_contact() (see changes to cmd.c / cmd.h). All other changes address ims_ipsec_pcscf_mod.c only, as required to implement the ipsec_destroy() optional argument. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3645 -- Commit Summary -- * Add AoR argument to ims_ipsec_pcscf ipsec_destroy() -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (8) M src/modules/ims_ipsec_pcscf/cmd.h (2) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (52) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3645.patch https://github.com/kamailio/kamailio/pull/3645.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3645 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3645(a)github.com>

2 4

git:master:e59c4415: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: e59c4415707f0995a0d5315b5601ae518b4f1ed5 URL: https://github.com/kamailio/kamailio/commit/e59c4415707f0995a0d5315b5601ae5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-22T10:17:01+01:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/e59c4415707f0995a0d5315b5601ae5… Patch: https://github.com/kamailio/kamailio/commit/e59c4415707f0995a0d5315b5601ae5… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index 81c0cb4cb99..f94669509f1 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -58,7 +58,7 @@ Tsvetomir Dimitrov 4.1. ipsec_create(domain) 4.2. ipsec_forward(domain, flags) - 4.3. ipsec_destroy(domain) + 4.3. ipsec_destroy(domain [, aor]) List of Examples @@ -103,7 +103,7 @@ Chapter 1. Admin Guide 4.1. ipsec_create(domain) 4.2. ipsec_forward(domain, flags) - 4.3. ipsec_destroy(domain) + 4.3. ipsec_destroy(domain [, aor]) 1. Overview @@ -270,7 +270,7 @@ modparam("ims_ipsec_pcscf", "ipsec_preferred_ealg", "aes-cbc") 4.1. ipsec_create(domain) 4.2. ipsec_forward(domain, flags) - 4.3. ipsec_destroy(domain) + 4.3. ipsec_destroy(domain [, aor]) 4.1. ipsec_create(domain) @@ -325,13 +325,15 @@ ipsec_forward("location"); ipsec_forward("location", "1"); ... -4.3. ipsec_destroy(domain) +4.3. ipsec_destroy(domain [, aor]) The function destroys IPSec tunnel, created with ipsec_create. Meaning of the parameters is as follows: * domain - Logical domain within the registrar. If a database is used then this must be name of the table which stores the contacts. + aor - SIP URI to match the record. If not provided, then R-URI is + used. Example 1.13. ipsec_destroy ...

1 0

git:master:57ed2639: ims_ipsec_pcscf: do not change msg r-uri with ipsec_destroy() param
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: 57ed2639259f7116795f6214ca505cc86bb7ccb5 URL: https://github.com/kamailio/kamailio/commit/57ed2639259f7116795f6214ca505cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T10:09:16+01:00 ims_ipsec_pcscf: do not change msg r-uri with ipsec_destroy() param - only changing r-uri shortcut inside sip msg field can have side effects, avoid it by providing the parameter to fill_contact() - use core fixup function for handling config parameter for aor --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/57ed2639259f7116795f6214ca505cc… Patch: https://github.com/kamailio/kamailio/commit/57ed2639259f7116795f6214ca505cc… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index aa905b09a9b..69d1fccc502 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -162,7 +162,7 @@ static str get_www_auth_param(const char *param_name, str www_auth) } static int fill_contact( - pcontact_info_t *ci, sip_msg_t *m, tm_cell_t *t, int sflags) + pcontact_info_t *ci, sip_msg_t *m, tm_cell_t *t, str *ruri, int sflags) { contact_body_t *cb = NULL; struct via_body *vb = NULL; @@ -183,8 +183,13 @@ static int fill_contact( memset(&uri, 0, sizeof(struct sip_uri)); - if((sflags & IPSEC_DSTADDR_SEARCH) && m->dst_uri.s != NULL - && m->dst_uri.len > 0) { + if(ruri != NULL && ruri->len > 0) { + suri.s = ruri->s; + suri.len = ruri->len; + LM_DBG("using param r-uri for contact filling: %.*s\n", suri.len, + suri.s); + } else if((sflags & IPSEC_DSTADDR_SEARCH) && m->dst_uri.s != NULL + && m->dst_uri.len > 0) { suri = m->dst_uri; LM_DBG("using dst uri for contact filling: %.*s\n", suri.len, suri.s); @@ -702,7 +707,7 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) t = tmb.t_gett(); } // Find the contact - if(fill_contact(&ci, m, t, _cflags) != 0) { + if(fill_contact(&ci, m, t, NULL, _cflags) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -860,7 +865,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // // Find the contact // - if(fill_contact(&ci, m, t, _cflags) != 0) { + if(fill_contact(&ci, m, t, NULL, _cflags) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -1052,14 +1057,8 @@ int ipsec_destroy(struct sip_msg *m, udomain_t *d, str *uri) t = tmb.t_gett(); } - // Insert URI in SIP message - if(uri != NULL) { - m->first_line.u.request.uri.s = uri->s; - m->first_line.u.request.uri.len = uri->len; - } - // Find the contact - if(fill_contact(&ci, m, t, 0) != 0) { + if(fill_contact(&ci, m, t, uri, 0) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index 3709a78c610..1e25650e1bc 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -23,6 +23,7 @@ */ #include "../../core/sr_module.h" +#include "../../core/mod_fix.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" @@ -459,24 +460,7 @@ static int unregister_fixup(void **param, int param_no) if(param_no == 1) { return domain_fixup(param, param_no); } else { - pv_elem_t *model = NULL; - str s; - - /* convert to str */ - s.s = (char *)*param; - s.len = strlen(s.s); - - model = NULL; - if(s.len == 0) { - LM_ERR("no param!\n"); - return E_CFG; - } - if(pv_parse_format(&s, &model) < 0 || model == NULL) { - LM_ERR("wrong format [%s]!\n", s.s); - return E_CFG; - } - *param = (void *)model; - return 0; + return fixup_spve_all(param, param_no); } return E_CFG; } @@ -503,13 +487,11 @@ static int w_forward(struct sip_msg *_m, char *_d, char *_cflags) static int w_destroy(struct sip_msg *_m, char *_d, char *_aor) { - pv_elem_t *model; str aor; if(_aor) { - model = (pv_elem_t *)_aor; - if(pv_printf_s(_m, model, &aor) < 0) { - LM_ERR("error - cannot print the format\n"); + if(fixup_get_svalue(_m, (gparam_t *)_aor, &aor) < 0) { + LM_ERR("failed to get aor parameter\n"); return -1; } LM_DBG("URI: %.*s\n", aor.len, aor.s);

1 0

git:master:ef3f50db: ims_ipsec_pcscf: docs updated for ipsec_destroy()
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: ef3f50db619490509f127eba87b75190a98a1b3e URL: https://github.com/kamailio/kamailio/commit/ef3f50db619490509f127eba87b7519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T10:09:16+01:00 ims_ipsec_pcscf: docs updated for ipsec_destroy() --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ef3f50db619490509f127eba87b7519… Patch: https://github.com/kamailio/kamailio/commit/ef3f50db619490509f127eba87b7519… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index 982df9bbb14..d50c66ed45a 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -345,7 +345,7 @@ ipsec_forward("location", "1"); </section> <section> - <title><function moreinfo="none">ipsec_destroy(domain)</function></title> + <title><function moreinfo="none">ipsec_destroy(domain [, aor])</function></title> <para>The function destroys IPSec tunnel, created with ipsec_create.</para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -355,6 +355,10 @@ ipsec_forward("location", "1"); If a database is used then this must be name of the table which stores the contacts. </para> + <para> + <emphasis>aor</emphasis> - SIP URI to match the record. If not + provided, then R-URI is used. + </para> </listitem> </itemizedlist> <example>

1 0

git:master:e3f6c3c8: ims_ipsec_pcscf: add optional AoR argument to ipsec_destroy()
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: e3f6c3c8d23b379779369005f7a4b56ba8e0a588 URL: https://github.com/kamailio/kamailio/commit/e3f6c3c8d23b379779369005f7a4b56… Author: bishoja <james.bishop(a)ec.europa.eu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T10:09:16+01:00 ims_ipsec_pcscf: add optional AoR argument to ipsec_destroy() --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/cmd.h Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e3f6c3c8d23b379779369005f7a4b56… Patch: https://github.com/kamailio/kamailio/commit/e3f6c3c8d23b379779369005f7a4b56…

1 0

git:master:ba3eca2b: modules: readme files regenerated - ims_charging ... [skip ci]
by Kamailio Dev 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: ba3eca2b41091e169a279be30827495d8269a1a0 URL: https://github.com/kamailio/kamailio/commit/ba3eca2b41091e169a279be30827495… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-22T09:47:01+01:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/ba3eca2b41091e169a279be30827495… Patch: https://github.com/kamailio/kamailio/commit/ba3eca2b41091e169a279be30827495… --- diff --git a/src/modules/ims_charging/README b/src/modules/ims_charging/README index a3b33a21eae..8e61583c0c4 100644 --- a/src/modules/ims_charging/README +++ b/src/modules/ims_charging/README @@ -66,6 +66,7 @@ Carlos Ruiz Diaz 4.26. app_provided_party_avp (avp string) 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) + 4.29. strip_plus_from_e164 (int) 5. Functions @@ -123,8 +124,9 @@ Carlos Ruiz Diaz 1.26. app_provided_party_avpparameter usage 1.27. vendor_specific_chargeinfoparameter usage 1.28. vendor_specific_idparameter usage - 1.29. Ro_CCR - 1.30. Ro_set_session_id_avp + 1.29. strip_plus_from_e164parameter usage + 1.30. Ro_CCR + 1.31. Ro_set_session_id_avp Chapter 1. Admin Guide @@ -172,6 +174,7 @@ Chapter 1. Admin Guide 4.26. app_provided_party_avp (avp string) 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) + 4.29. strip_plus_from_e164 (int) 5. Functions @@ -374,6 +377,7 @@ Chapter 1. Admin Guide 4.26. app_provided_party_avp (avp string) 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) + 4.29. strip_plus_from_e164 (int) 4.1. hash_size(int) @@ -755,6 +759,19 @@ modparam("ims_charging", "vendor_specific_chargeinfo", 1) modparam("ims_charging", "vendor_specific_id", 10) ... +4.29. strip_plus_from_e164 (int) + + Strip + from subscription id when E.164 format is used. This is + according to spec, but this parameter is to keep existing behavior as + the default. + + Default value is 0. + + Example 1.29. strip_plus_from_e164parameter usage +... +modparam("ims_charging", "strip_plus_from_e164", 1) +... + 5. Functions 5.1. Ro_CCR(route_name, direction, reservation_units, @@ -782,7 +799,7 @@ outgoing_trunk_id) This method is executed asynchronously. See example on how to retrieve return value. - Example 1.29. Ro_CCR + Example 1.30. Ro_CCR ... xlog("L_DBG","Sending initial CCR Request for call\n"); Ro_CCR("RO_ASYNC_TERM_REPLY", "term", 30, "1", "1"); @@ -818,7 +835,7 @@ n"); This function can be used from REQUEST_ROUTE or ONREPLY_ROUTE. - Example 1.30. Ro_set_session_id_avp + Example 1.31. Ro_set_session_id_avp ... Ro_set_session_id_avp(); xlog("L_DBG","Ro session AVP has been set: $avp(ro_session_id)\n");

1 0

[kamailio/kamailio] cdp: Avoid deadlock for callback on diameter timeout (PR #3643)
by Morten Tryfoss 22 Nov '23

22 Nov '23

Callback function might do an operation which creates a new transaction, which will result in a deadlock.   #### 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 issue #3641 #### Description Problem in detail described in ticket. Summary is that the lock used to iterate expired transactions is also needed when creating a new transaction. If the callback function (directly or indirectly) do something that creates a new transaction, it will result in a deadlock. In my case, this was the ims_charging module where a start charging request times out. The callback does t_continue() where the routing logic then rejects the call. This will create a stop request to the charging server, and it will block. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3643 -- Commit Summary -- * cdp: Avoid deadlock for callback on diameter timeout -- File Changes -- M src/modules/cdp/transaction.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3643.patch https://github.com/kamailio/kamailio/pull/3643.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3643 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3643(a)github.com>

2 2

[kamailio/kamailio] Deadlock in ims_charging / cdp modules on connection issues (Issue #3641)
by Morten Tryfoss 22 Nov '23

22 Nov '23

### Description I've been simulating calls while there's (faked) issues against the diameter server using TCP. Ro_CCR() uses t_suspend() to suspend the SIP transaction while waiting for a response from the charging server. A cdp transaction is also created with a callback to resume_on_initial_ccr() in the ims charging module. When a response to a charging request is received, this is handled in cdp/api_process.c where cdp_take_trans() find the given transaction and returns it without a lock held. The callback is then executed, and everything is fine. The problem occurs when a CCR times out, and the callback is done by the cdp_trans_timer() function. This hold a lock for the entire transaction list while executing callbacks for every timed out entry. In my case, the charging module does t_continue and the execution of that routing block is started again. Here we reply a cause indicating it was an issue with the charging server. This will trigger a new callback from the ims_dialog module which again will try to start a new cdp transaction (CCR Stop) - still while the cdp_trans_timer function holds a lock. Since the cdp timers now are blocked, no new connection attempts to the failed diameter server is done either. ### Troubleshooting #### Reproduction  ``` Ro_CCR("RO_CONTINUE_DISPATCHER", "orig", 30, "", "") this times out, and will do continue in the routing block specified (based on the cdp transaction timeout timer) route[RO_CONTINUE_DISPATCHER] { send_reply("500", "Internal error"); exit; } ``` ### Debugging Data  cdp_add_trans() on line 2 is blocked while waiting for lock held by cdp_trans_timer() on line 26 to be freed. The line numbers are a bit off because of some debugging. ``` #0 0x00007f6d9a3e0e29 in syscall () from /lib64/libc.so.6 #1 0x00007f6d979622f6 in futex_get (lock=0x7f6d706622a0) at ../../core/mem/../futexlock.h:121 #2 0x00007f6d979632cd in cdp_add_trans (msg=0x7f6d70921280, cb=0x7f6d9084caf5 <resume_on_termination_ccr>, ptr=0x0, timeout=5, auto_drop=1) at transaction.c:126 #3 0x00007f6d97980740 in AAASendMessage (message=0x7f6d70921280, callback_f=0x7f6d9084caf5 <resume_on_termination_ccr>, callback_param=0x0) at diameter_comm.c:158 #4 0x00007f6d9084c71b in send_ccr_stop_with_param (ro_session=0x7f6d70921dc0, code=0, reason=0x7ffe9b6cd400) at ims_ro.c:1183 #5 0x00007f6d90829f6d in dlg_terminated (dlg=0x7f6d7091f5d0, type=4, termcode=0, reason=0x7f6d9086f998 "call failed", _params=0x7f6d90d20280 <params>) at dialog.c:249 #6 0x00007f6d908216cd in dlg_callback_received (dlg=0x7f6d7091f5d0, type=4, _params=0x7f6d90d20280 <params>) at dialog.c:29 #7 0x00007f6d90aed1b9 in run_dlg_callbacks (type=4, dlg=0x7f6d7091f5d0, req=0x7f6d7091fb68, rpl=0xffffffffffffffff, dir=2, dlg_data=0x0) at dlg_cb.c:271 #8 0x00007f6d90abced4 in dlg_onreply (t=0x7f6d70931e10, type=1048576, param=0x7ffe9b6cda80) at dlg_handlers.c:1363 #9 0x00007f6d94252f2c in run_trans_callbacks_internal (cb_lst=0x7f6d70931eb8, type=1048576, trans=0x7f6d70931e10, params=0x7ffe9b6cda80) at t_hooks.c:236 #10 0x00007f6d942530e4 in run_trans_callbacks_with_buf (type=1048576, rbuf=0x7f6d70931f10, req=0x7f6d7091fb68, repl=0xffffffffffffffff, flags=0) at t_hooks.c:272 #11 0x00007f6d941d2860 in _reply_light (trans=0x7f6d70931e10, buf=0x7f6d97d10768 "SIP/2.0 480 Temporarily Unavailable\r\nVia: SIP/2.0/UDP 192.168.10.15:5060;branch=z9hG4bK427d31b9\r\nFrom: \"sipp\" <sip:+4749484948@192.168.10.15;user=phone>;tag=as22aa85b4\r\nTo: <sip:+4749494848@192.168.10.20"..., len=386, code=480, to_tag=0x7f6d944bb5e0 <tm_tags> "b239b52f382f2203913409401a079c72-9b859c73", to_tag_len=41, lock=0, bm=0x7ffe9b6ce5d0) at t_reply.c:520 #12 0x00007f6d941d3e8e in _reply (trans=0x7f6d70931e10, p_msg=0x7f6d70946878, code=480, reason=0x7ffe9b6ce750, lock=0) at t_reply.c:689 #13 0x00007f6d941dfdcf in t_reply_str_unsafe (t=0x7f6d70931e10, p_msg=0x7f6d70946878, code=480, reason=0x7ffe9b6ce750) at t_reply.c:1753 #14 0x00007f6d941fd400 in ki_t_reply (msg=0x7f6d70946878, code=480, reason=0x7ffe9b6ce750) at tm.c:1538 #15 0x00007f6d941fdcee in w_t_reply_wrp (msg=0x7f6d70946878, code=480, txt=0x7f6d97d106e8 "Temporarily Unavailable") at tm.c:1598 #16 0x00007f6d93d24c0e in send_reply (msg=0x7f6d70946878, code=480, reason=0x7ffe9b6ce880) at sl.c:287 #17 0x00007f6d93d25728 in w_send_reply (msg=0x7f6d70946878, p1=0x7f6d97cee2e8 "x)\320\227m\177", p2=0x7f6d97cee388 "\350)\320\227m\177") at sl.c:329 #18 0x0000000000466fb3 in do_action (h=0x7ffe9b6cf9b0, a=0x7f6d97d025d8, msg=0x7f6d70946878) at core/action.c:1131 #19 0x0000000000474188 in run_actions (h=0x7ffe9b6cf9b0, a=0x7f6d97d02210, msg=0x7f6d70946878) at core/action.c:1618 #20 0x000000000047028d in do_action (h=0x7ffe9b6cf9b0, a=0x7f6d97d02f00, msg=0x7f6d70946878) at core/action.c:1241 #21 0x0000000000474188 in run_actions (h=0x7ffe9b6cf9b0, a=0x7f6d97cfdb68, msg=0x7f6d70946878) at core/action.c:1618 #22 0x00000000004748cc in run_top_route (a=0x7f6d97cfdb68, msg=0x7f6d70946878, c=0x0) at core/action.c:1701 #23 0x00007f6d9425802a in t_continue_helper (hash_index=39149, label=1245761144, rtact=0x7f6d97cfdb68, cbname=0x0, cbparam=0x0, skip_timer=1) at t_suspend.c:307 #24 0x00007f6d9425c6d8 in t_continue (hash_index=39149, label=1245761144, route=0x7f6d97cfdb68) at t_suspend.c:603 #25 0x00007f6d9085b372 in resume_on_initial_ccr (is_timeout=1, param=0x7f6d70921cc8, cca=0x0, elapsed_msecs=1) at ims_ro.c:1786 #26 0x00007f6d979646d1 in cdp_trans_timer (now=1699966590, ptr=0x0) at transaction.c:223 #27 0x00007f6d9798e3b0 in timer_loop () at timer.c:117 #28 0x00007f6d9798f639 in timer_process (returns=0) at timer.c:217 #29 0x00007f6d97942cf8 in diameter_peer_start (blocking=0) at diameter_peer.c:350 #30 0x00007f6d97932bb2 in cdp_child_init (rank=0) at cdp_mod.c:272 ``` #### Log Messages  ``` ``` #### SIP Traffic  ``` ``` ### Possible Solutions I'm considering changing cdp_trans_timer() to iterate through the list, remove expired items while keeping them in a new list so all callbacks can be executed without the lock held. Could also be fixed within the ims_charging module. For example by not sending a CCR-T when there's no answer to the CCR-I, but I feel that's more of a band aid rather than a real fix. Any feedback or suggestions would be nice. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` master ``` * **Operating System**:  ``` centos 7.8 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3641 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3641(a)github.com>

2 1

git:master:48f0e7fc: cdp: Avoid deadlock for callback on diameter timeout
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: 48f0e7fc9bd95b509e8fb619d8aafb59c125d2c8 URL: https://github.com/kamailio/kamailio/commit/48f0e7fc9bd95b509e8fb619d8aafb5… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T09:37:08+01:00 cdp: Avoid deadlock for callback on diameter timeout Callback function might do an operation which creates a new transaction, which will result in a deadlock. Fixes #3641 --- Modified: src/modules/cdp/transaction.c --- Diff: https://github.com/kamailio/kamailio/commit/48f0e7fc9bd95b509e8fb619d8aafb5… Patch: https://github.com/kamailio/kamailio/commit/48f0e7fc9bd95b509e8fb619d8aafb5… --- diff --git a/src/modules/cdp/transaction.c b/src/modules/cdp/transaction.c index 5680e5b59c6..bba7e27fcc8 100644 --- a/src/modules/cdp/transaction.c +++ b/src/modules/cdp/transaction.c @@ -206,6 +206,15 @@ void cdp_free_trans(cdp_trans_t *x) int cdp_trans_timer(time_t now, void *ptr) { cdp_trans_t *x, *n; + cdp_trans_list_t *cb_queue = 0; + cb_queue = pkg_malloc(sizeof(cdp_trans_list_t)); + if(!cb_queue) { + LOG_NO_MEM("pkg", sizeof(cdp_trans_list_t)); + return 0; + } + cb_queue->head = 0; + cb_queue->tail = 0; + lock_get(trans_list->lock); x = trans_list->head; while(x) { @@ -215,9 +224,6 @@ int cdp_trans_timer(time_t now, void *ptr) .timeout); //Transaction has timed out waiting for response x->ans = 0; - if(x->cb) { - (x->cb)(1, *(x->ptr), 0, (now - x->expires)); - } n = x->next; if(x->prev) @@ -228,7 +234,17 @@ int cdp_trans_timer(time_t now, void *ptr) x->next->prev = x->prev; else trans_list->tail = x->prev; - if(x->auto_drop) + + if(x->cb) { + /* queue cb to be done after list unlock */ + x->next = 0; + x->prev = cb_queue->tail; + if(cb_queue->tail) + cb_queue->tail->next = x; + cb_queue->tail = x; + if(!cb_queue->head) + cb_queue->head = x; + } else if(x->auto_drop) /* if no callback, auto drop here */ cdp_free_trans(x); x = n; @@ -236,6 +252,17 @@ int cdp_trans_timer(time_t now, void *ptr) x = x->next; } lock_release(trans_list->lock); + + /* do all queued callbacks */ + x = cb_queue->head; + while(x) { + (x->cb)(1, *(x->ptr), 0, (now - x->expires)); + if(x->auto_drop) + cdp_free_trans(x); + x = x->next; + } + pkg_free(cb_queue); + return 1; }

1 0

git:master:e17b554b: ims_charging: Various changes to make module compatible to other charging servers
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: e17b554ba918dc33c60f41c2cee50ad2578fbbd3 URL: https://github.com/kamailio/kamailio/commit/e17b554ba918dc33c60f41c2cee50ad… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T09:36:44+01:00 ims_charging: Various changes to make module compatible to other charging servers - Use origin-host of CCR response as destination-host of subsequent CCR requests, to make sure those requests are routed to the same charging server (when using relay). - use str_dup and str_free from ims_getters instead of locally defined. - Honour AVP_Time_Quota_Threshold in CCR response, as an alternative to static configured modparam "timer_buffer". - Add new modparam "strip_plus_from_e164" to enable sending subscription id with correct format according to specified type in the AVP. - Moved subscription id formatting into a common function. - Handle CCR response without AVP_Validity_Time set correctly. Was interpreted as immediate expire. - Handle IMS_RAR (Re-auth) request from charging server. Triggers an immediate interim update if the session is alive. - Handle IMS_ASR (Abort) request from charging server. Triggers an immediate termination of the session/call. - Fixed issue with signed/unsigned int related to check for Expires header. cscf_get_expires_hdr() returns signed (-1 for not found), while that value was added to the outgoing diameter request unsigned. That again resulted in an Expires AVP with a really large value, and was rejected by the charging server. --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/Ro_data.h Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/config.h 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/ims_ro.h Modified: src/modules/ims_charging/ro_db_handler.c Modified: src/modules/ims_charging/ro_db_handler.h Modified: src/modules/ims_charging/ro_session_hash.c Modified: src/modules/ims_charging/ro_session_hash.h Modified: src/modules/ims_charging/ro_timer.c Modified: utils/kamctl/mysql/ims_charging-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/e17b554ba918dc33c60f41c2cee50ad… Patch: https://github.com/kamailio/kamailio/commit/e17b554ba918dc33c60f41c2cee50ad…

1 0

git:master:6cd9f310: cdp: Add support for re-auth on ro sessions initiated from charging server
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: 6cd9f310a0af9bf6024696d436b6b96491808832 URL: https://github.com/kamailio/kamailio/commit/6cd9f310a0af9bf6024696d436b6b96… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T09:36:44+01:00 cdp: Add support for re-auth on ro sessions initiated from charging server - handle missing valid_for in CCA correctly, for chargings server not using it - add AVP_Time_Quota_Threshold AVP, to support server controlled CCR-U threshold --- Modified: src/modules/cdp/acctstatemachine.c Modified: src/modules/cdp/diameter_code_avp.h Modified: src/modules/cdp/peerstatemachine.c Modified: src/modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/6cd9f310a0af9bf6024696d436b6b96… Patch: https://github.com/kamailio/kamailio/commit/6cd9f310a0af9bf6024696d436b6b96… --- diff --git a/src/modules/cdp/acctstatemachine.c b/src/modules/cdp/acctstatemachine.c index 398526d86d7..aad4ca1cc04 100644 --- a/src/modules/cdp/acctstatemachine.c +++ b/src/modules/cdp/acctstatemachine.c @@ -176,6 +176,8 @@ int cc_acc_client_stateful_sm_process( //nothing we can do here, we have sent callback, client needs to send CCR Update LM_DBG("Reservation close to expiring\n"); break; + case ACC_CC_EV_SESSION_MODIFIED: + break; default: LM_ERR("Received unknown event [%d] in state [%d]\n", event, x->state); diff --git a/src/modules/cdp/diameter_code_avp.h b/src/modules/cdp/diameter_code_avp.h index 32987538dee..262ab62c012 100644 --- a/src/modules/cdp/diameter_code_avp.h +++ b/src/modules/cdp/diameter_code_avp.h @@ -266,6 +266,8 @@ typedef enum AVP_Service_Selection = 493, //RFC5778 AVP_Call_Id = 494, + AVP_Time_Quota_Threshold = 868, // 3GPP TS 32.299 + } AAA_AVPCodeNr; enum diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 24d5aed959e..74d119b70f2 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -1350,11 +1350,9 @@ void Rcv_Process(peer *p, AAAMessage *msg) switch(session->type) { case ACCT_CC_CLIENT: if(is_req(msg)) { - LM_WARN("unhandled receive request on Credit Control Acct " - "session\n"); - AAASessionsUnlock( - session->hash); //must be called because we don't call state machine here - session = 0; //we don't call SM here so we must not set to 0 + cc_acc_client_stateful_sm_process( + session, ACC_CC_EV_SESSION_MODIFIED, msg); + session = 0; } else { cc_acc_client_stateful_sm_process( session, ACC_CC_EV_RECV_ANS, msg); diff --git a/src/modules/cdp/session.c b/src/modules/cdp/session.c index e6e23fcbcf6..cd169f103ab 100644 --- a/src/modules/cdp/session.c +++ b/src/modules/cdp/session.c @@ -491,7 +491,7 @@ int cdp_sessions_timer(time_t now, void *ptr) 15; //15 seconds - TODO: add as config parameter //we should check for reservation expiring if the state is open if(x->u.cc_acc.state == ACC_CC_ST_OPEN) { - if(last_res_timestamp) { + if(last_res_timestamp && res_valid_for) { //we have obv already started reservations if((last_res_timestamp + res_valid_for) < (time(0) + last_reservation

1 0

[kamailio/kamailio] ims_charging: Various improvements to make module compatible to other charging server vendors (PR #3640)
by Morten Tryfoss 22 Nov '23

22 Nov '23

#### 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 **Use origin-host of CCR response as destination-host of subsequent CCR requests** When connecting to a diameter node which using relay, it may load balance requests to multiple servers for handling. This change ensures that subsequent requests are sent to the same server. **Honour AVP_Time_Quota_Threshold in CCR response** Charging server indicates it want an interim update X number of seconds before all quota has been used. **Add new modparam «strip_plus_from_e164»** The existing formatitng routine check if it's a tel: or sip: uri, and sets E.164 or SIP according to that. If it's E.164, it strips "tel:" too. A subscription id with leading "+" is actually of type SIP. I didn't want to make a breaking change here, so I introduced a new setting which fixes the behaviour. **Moved subscription id formatting into a common function** For more clean code, and one place to make further adjustments. **Handle CCR response without AVP_Validity_Time** If missing, various places in the module reported immediate expire. **Handle IMS_RAR (Re-auth) request from charging server** Typical scenario is that there's a missing interim update, and the server want to check if the session is still alive. At reception we try a lookup and if found, schedule a new request. **Handle IMS_ASR (Abort) request from charging server** Similar handling as for re-auth, but for server-initiated termination of the call. **Fixed issue with signed/unsigned int related to check for Expires header** cscf_get_expires_hdr() returns signed (-1 for not found), while that value was added to the outgoing diameter request unsigned. That again resulted in an Expires AVP with a really large value, and was rejected by the charging server. Most probably cscf_get_expires_hdr() should be changed to return unsigned since the value theoretical can be that big, but since that is a common function for the ims modules it would require more testing than I'm capable of right now. **Use str_dup() and str_free() from ims_getters instead of locally defined** Those were needed more places. -- I'm a little bit unsure about updating a string allocated in shm, where the length is changed (look in ims_ro.c, credit_control_session_callback()). Is the correct way to do a shm_free() and then reallocate, or is there a more simple way of doing it? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3640 -- Commit Summary -- * cdp: Add support for re-auth on ro sessions initiated from charging server * ims_charging: Various changes to make module compatible to other charging servers -- File Changes -- M src/modules/cdp/acctstatemachine.c (2) M src/modules/cdp/diameter_code_avp.h (2) M src/modules/cdp/peerstatemachine.c (8) M src/modules/cdp/session.c (2) M src/modules/ims_charging/Ro_data.c (40) M src/modules/ims_charging/Ro_data.h (5) M src/modules/ims_charging/ccr.c (8) M src/modules/ims_charging/config.h (1) M src/modules/ims_charging/dialog.c (18) M src/modules/ims_charging/doc/ims_charging_admin.xml (20) M src/modules/ims_charging/ims_charging_mod.c (59) M src/modules/ims_charging/ims_ro.c (234) M src/modules/ims_charging/ims_ro.h (3) M src/modules/ims_charging/ro_db_handler.c (43) M src/modules/ims_charging/ro_db_handler.h (5) M src/modules/ims_charging/ro_session_hash.c (45) M src/modules/ims_charging/ro_session_hash.h (6) M src/modules/ims_charging/ro_timer.c (8) M utils/kamctl/mysql/ims_charging-create.sql (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3640.patch https://github.com/kamailio/kamailio/pull/3640.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3640 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3640(a)github.com>

3 8

git:master:70449bfc: topos: reformat exports structures
by Daniel-Constantin Mierla 22 Nov '23

22 Nov '23

Module: kamailio Branch: master Commit: 70449bfcb04eb44260fc8bd80ab6b77a86e82339 URL: https://github.com/kamailio/kamailio/commit/70449bfcb04eb44260fc8bd80ab6b77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-22T09:01:28+01:00 topos: reformat exports structures --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/70449bfcb04eb44260fc8bd80ab6b77… Patch: https://github.com/kamailio/kamailio/commit/70449bfcb04eb44260fc8bd80ab6b77…

1 0

[kamailio/kamailio] 5.6.4 debian htable dbmode=1 not writing at shutdown (Issue #3536)
by ednt 22 Nov '23

22 Nov '23

### Description I use debian 11 and Kamailio 5.6.x modparam("htable", "htable", "callpush=>size=10;autoexpire=86400;dbtable=callpush;dbmode=1") I can store the values in the table, but if I shutdown kamailio, the current values are not stored in the table. #### Reproduction Use a htable and dbtable and dbmode=1 and shutdown kamailio. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3536 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3536(a)github.com>

2 2

[kamailio/kamailio] Add Username support for authentication in redis and sentinel w.r.t NDB REDIS (Issue #3552)
by hemanth-vulavala 22 Nov '23

22 Nov '23

### Description The current issue revolves around the absence of username support within the NDB REDIS KAMALIO framework when dealing with Redis, particularly concerning the Redis and Sentinel components. While Redis inherently offers the capability to utilize both usernames and passwords during authentication, this capability is not currently extended to the NDB REDIS KAMALIO setup. As a result, when attempting to establish connections to Redis instances through NDB REDIS KAMALIO, there is no provision for providing a username as part of the authentication process. Instead, the framework only accommodates the usage of passwords for authentication. This stands in contrast to Redis, which permits the inclusion of both usernames and passwords for enhanced security measures. Consequently, the limitation within NDB REDIS KAMALIO can hinder organizations seeking to ensure comprehensive security practices, especially when the requirement is to employ both usernames and passwords for authentication. This divergence between the authentication capabilities of Redis and NDB REDIS KAMALIO can potentially compromise security standards and hinder compatibility with certain authentication setups. To address this issue, it would be essential for the development team behind NDB REDIS KAMALIO to enhance the framework's capabilities by incorporating support for username-based authentication in addition to passwords. This alignment with Redis's authentication model would ensure that organizations can confidently implement secure data interactions while maintaining consistency with established security policies  ### Expected behavior The expected behavior entails an improvement within the NDB REDIS KAMALIO framework to support both usernames and passwords for authentication when interacting with Redis instances, particularly in the Redis and Sentinel components. This enhancement would bring NDB REDIS KAMALIO in line with Redis's native authentication capabilities, where both usernames and passwords are accepted during the authentication process. Upon implementing this improvement, users of NDB REDIS KAMALIO should be able to configure their connections by providing both a username and a password as part of the authentication details. This allows NDB REDIS KAMALIO to establish connections to Redis instances that require both authentication credentials, thereby enhancing security and ensuring compatibility with various authentication setups. By incorporating support for usernames in addition to passwords, NDB REDIS KAMALIO can accommodate organizations that require comprehensive security measures, especially in scenarios where username-based authentication is mandated. This alignment with Redis's authentication model would enable organizations to effectively collect, manage, and interact with data while adhering to established security policies. In summary, the expected behavior is that NDB REDIS KAMALIO should be upgraded to offer support for usernames and passwords during authentication, mirroring Redis's capabilities. This enhancement ensures a consistent and secure approach to data interactions and supports various authentication requirements within Redis environments #### Actual observed behavior The current actual behavior is that NDB REDIS KAMALIO does not have the capability to accept usernames as part of the authentication process when connecting to Redis instances, specifically in both the Redis and Sentinel components. While Redis itself allows for the usage of both usernames and passwords for authentication, this feature is not currently integrated into the NDB REDIS KAMALIO framework. As a result, when configuring connections to Redis instances using NDB REDIS KAMALIO, there is no provision to include a username alongside the authentication details. The framework only accommodates the use of passwords for authentication purposes. This deviation from Redis's authentication model could lead to compatibility issues with certain authentication setups, particularly those that mandate the use of both usernames and passwords. In essence, the actual behavior is that NDB REDIS KAMALIO falls short of aligning with Redis's authentication capabilities, thereby potentially hindering secure data interactions and limiting compatibility with certain security policies. Users attempting to adhere to comprehensive authentication practices may face challenges when utilizing NDB REDIS KAMALIO due to its inability to support usernames during authentication. To address this actual behavior, it would be necessary to enhance NDB REDIS KAMALIO's capabilities to include support for both usernames and passwords during the authentication process. This enhancement would ensure that organizations can confidently utilize NDB REDIS KAMALIO while maintaining the security standards and authentication requirements necessary for their Redis environments. #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3552 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3552(a)github.com>

3 5

[kamailio/kamailio] Support for Password Authentication in Sentinel for NDB Redis in kamailio (Issue #3530)
by hemanth-vulavala 22 Nov '23

22 Nov '23

### Description Currently, kamailio NDB Redis integration with Sentinel does not offer support for password authentication, leading to potential security concerns in our system. As a result, we are unable to ensure the desired level of protection for sensitive data stored in Redis. *Expected Behavior:* We expect Kamailio to allow the configuration of password authentication for Sentinel in the NDB Redis integration, enabling a secure and password-protected connection to the Redis instances. *Proposed Solution:* To address this issue, we recommend implementing a feature that enables password authentication for the Sentinel-based NDB Redis connections. This improvement will provide an added layer of security, ensuring that only authorized users can access the Redis instances. *Impact:* The absence of password authentication support poses a security risk, making our system vulnerable to potential unauthorized access and data breaches. Implementing this enhancement will safeguard sensitive information and strengthen our Redis integration's security framework. Note: as of now NDB REDIS support redis authentication using password  ### Troubleshooting #### Reproduction Steps to Reproduce:* 1. Attempt to configure password authentication for Sentinel in kamailio NDB Redis integration. ex: modparam("ndb_redis", "server", "name=srvZ;sentinel_group=group_name;sentinel_master=1;sentinel=1.2.3.4:26379;sentinel=1.2.3.5:26379";pass=mypassword") *It is failed to connect the sentinel *  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3530 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3530(a)github.com>

2 2

[kamailio/kamailio] [rtpengine] Support syntax for new "sdp-attr" manipulations (Issue #3509)
by George Diamantopoulos 22 Nov '23

22 Nov '23

### Description Newer rtpengine versions support manipulating SDP "a=" lines directly. Although kamailio is quite versatile when it comes to editing SIP message body, this functionality is often rather frail, especially when forking and having to use msg_apply_changes several times. I believe it would be beneficial to be able to offload such functionality to rtpengine, especially if one wants to apply different manipulations per outgoing branch. ### Expected behavior There should be a way to issue rtpengine ng-control protocol commands compatible with the sdp-attr dictionary syntax. #### Actual observed behavior Currently sdp-attr tokens are not properly evaluated. For example, **doing**: > rtpengine_manage("ICE=remove rtcp-mux-demux trust-address replace-origin replace-session-connection replace-SDP-version direction=internal direction=external sdp-attr-audio-substitute=$avp(fmtp_line) sdp-attr-audio-substitute=fmtp:101 0-15"); _[NOTE: $avp(fmtp_line) seems to expand in empty string here, which is a config error, but it doesn't affect the syntax demonstration in this example IMO]_ **results in**: ``` { "supports": [ "load limit" ], "sdp": "...", "ICE": "remove", "sdp-attr-audio-substitute": "", "sdp-attr-audio-substitute": "fmtp:101", "direction": [ "internal", "external" ], "flags": [ "trust-address", "0-15" ], "replace": [ "origin", "session-connection", "SDP-version" ], "rtcp-mux": [ "demux" ], "call-id": "...", "received-from": [ "IP4", "..." ], "from-tag": "...", "to-tag": "...", "command": "answer" } ``` ### Possible Solutions Support the special syntax of sdp-attr as documented here: https://github.com/sipwise/rtpengine/blob/master/docs/ng_control_protocol.md Here's one way to do it (I guess). In order to get this: ``` "sdp-attr" : { "audio" : { "add" : [ "ptime:20", "sendrecv" ], "substitute": [["fmtp:101 0-15" , "fmtp:126 0-16" ]] }, "video": { "remove" : [ "rtpmap:101 telephone-event/8000" ] }, "none" : { "substitute": [[ "sendrecv" , "sendonly" ], [ "ptime:20" , "ptime:40" ]] } } ``` Use a syntax similar to the following: > rtpengine_manage("... sdp-attr-audio-add=ptime:20 sdp-attr-audio-add=sendrecv sdp-attr-audio-substitute=fmtp:101 0-15 sdp-attr-audio-substitute=fmtp:101 0-16 sdp-attr-video-remove=rtpmap:101 telephone-event/8000 sdp-attr-none-substitute=sendrecv sdp-attr-none-substitute=sendonly sdp-attr-none-substitute=ptime:20 sdp-attr-none-substitute=ptime:40 ..."); It's not very pretty, but it could work. Caveats: * How to handle whitespace (e.g. there's a space in "fmtp:101 0-15" and in "rtpmap:101 telephone-event/8000" ) * substitute commands must always be in pairs, data type is a list of lists containing exactly two items as value in "substitute" key Unfortunately my C skills are not up to this task, but if I can provide any other kind of help please let me know. Thanks! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3509 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3509(a)github.com>

3 5

[kamailio/kamailio] pv: Add support to $hfl $hflc for Diversion header (PR #3650)
by Xenofon Karamanos 21 Nov '23

21 Nov '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 This PR adds support for $hfl(Diversion)[] and $hflc(Diversion). This parse_diversion.c was inspired by [parse_pai_ppi.c](https://github.com/kamailio/kamailio/blob/master/src/core/…. I am not sure if it's breaking the existing implementation and usage. I believe it does not. During some experimentation with the hfl(name)[-1], I encountered weird behavior with negative indexing for the already supported headers like Via, Route, and Contact. -1 yields null and -2 yields the last one and so on. Separate PR can be introduced if necessary. Any feedback is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3650 -- Commit Summary -- * parser: Extend diversion for multiple bodies * pv: Add hfl and hflc support for Diversion header -- File Changes -- M src/core/parser/parse_diversion.c (149) M src/core/parser/parse_diversion.h (10) M src/modules/pv/pv_core.c (175) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3650.patch https://github.com/kamailio/kamailio/pull/3650.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3650 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3650(a)github.com>

2 4

git:master:35e191e1: app_lua: use module name prefix for exports structure
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 35e191e1bea5463e766cb6f8f2ffb4862bd812a8 URL: https://github.com/kamailio/kamailio/commit/35e191e1bea5463e766cb6f8f2ffb48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T15:43:11+01:00 app_lua: use module name prefix for exports structure --- Modified: src/modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35e191e1bea5463e766cb6f8f2ffb48… Patch: https://github.com/kamailio/kamailio/commit/35e191e1bea5463e766cb6f8f2ffb48… --- diff --git a/src/modules/app_lua/app_lua_mod.c b/src/modules/app_lua/app_lua_mod.c index 1aa4579d489..a041ebecbc0 100644 --- a/src/modules/app_lua/app_lua_mod.c +++ b/src/modules/app_lua/app_lua_mod.c @@ -90,7 +90,7 @@ static cmd_export_t cmds[] = { {0, 0, 0, 0, 0, 0} }; -struct module_exports exports = { +struct module_exports _app_lua_exports = { "app_lua", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */

1 0

git:master:c6feb52c: app_lua: reformat exports structures
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: c6feb52c97bbd3fc33dc837d2b23e56c75f09583 URL: https://github.com/kamailio/kamailio/commit/c6feb52c97bbd3fc33dc837d2b23e56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T15:39:21+01:00 app_lua: reformat exports structures --- Modified: src/modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c6feb52c97bbd3fc33dc837d2b23e56… Patch: https://github.com/kamailio/kamailio/commit/c6feb52c97bbd3fc33dc837d2b23e56… --- diff --git a/src/modules/app_lua/app_lua_mod.c b/src/modules/app_lua/app_lua_mod.c index 5a554f03aba..1aa4579d489 100644 --- a/src/modules/app_lua/app_lua_mod.c +++ b/src/modules/app_lua/app_lua_mod.c @@ -62,39 +62,47 @@ int app_lua_reload_param(modparam_t type, void *val); int _ksr_app_lua_log_mode = 0; +/* clang-format off */ static param_export_t params[] = { - {"load", PARAM_STRING | USE_FUNC_PARAM, (void *)app_lua_load_param}, - {"reload", INT_PARAM | USE_FUNC_PARAM, (void *)app_lua_reload_param}, - {"log_mode", PARAM_INT, &_ksr_app_lua_log_mode}, {0, 0, 0}}; - -static cmd_export_t cmds[] = {{"lua_dostring", (cmd_function)w_app_lua_dostring, - 1, fixup_spve_null, 0, ANY_ROUTE}, - {"lua_dofile", (cmd_function)w_app_lua_dofile, 1, fixup_spve_null, 0, - ANY_ROUTE}, - {"lua_runstring", (cmd_function)w_app_lua_runstring, 1, fixup_spve_null, - 0, ANY_ROUTE}, - {"lua_run", (cmd_function)w_app_lua_run0, 1, fixup_lua_run, 0, - ANY_ROUTE}, - {"lua_run", (cmd_function)w_app_lua_run1, 2, fixup_lua_run, 0, - ANY_ROUTE}, - {"lua_run", (cmd_function)w_app_lua_run2, 3, fixup_lua_run, 0, - ANY_ROUTE}, - {"lua_run", (cmd_function)w_app_lua_run3, 4, fixup_lua_run, 0, - ANY_ROUTE}, - {"bind_app_lua", (cmd_function)bind_app_lua, 0, 0, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"load", PARAM_STRING | USE_FUNC_PARAM, (void *)app_lua_load_param}, + {"reload", INT_PARAM | USE_FUNC_PARAM, (void *)app_lua_reload_param}, + {"log_mode", PARAM_INT, &_ksr_app_lua_log_mode}, + {0, 0, 0} +}; + +static cmd_export_t cmds[] = { + {"lua_dostring", (cmd_function)w_app_lua_dostring, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"lua_dofile", (cmd_function)w_app_lua_dofile, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"lua_runstring", (cmd_function)w_app_lua_runstring, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"lua_run", (cmd_function)w_app_lua_run0, 1, + fixup_lua_run, 0, ANY_ROUTE}, + {"lua_run", (cmd_function)w_app_lua_run1, 2, + fixup_lua_run, 0, ANY_ROUTE}, + {"lua_run", (cmd_function)w_app_lua_run2, 3, + fixup_lua_run, 0, ANY_ROUTE}, + {"lua_run", (cmd_function)w_app_lua_run3, 4, + fixup_lua_run, 0, ANY_ROUTE}, + {"bind_app_lua", (cmd_function)bind_app_lua, 0, + 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "app_lua", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /*��exported��functions��*/ - params, /*��exported��params��*/ - 0, /*��exported��RPC��methods��*/ - 0, /* exported pseudo-variables */ - 0, /*��response��function��*/ - mod_init, /* initialization module*/ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "app_lua", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported params */ + 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* initialization module */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; +/* clang-format on */ /** *

1 0

git:master:ebe77a20: app_python3s: use module name prefix for exports structure
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: ebe77a2068c5073b436a1f8fefdfd689c9010816 URL: https://github.com/kamailio/kamailio/commit/ebe77a2068c5073b436a1f8fefdfd68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T15:35:04+01:00 app_python3s: use module name prefix for exports structure --- Modified: src/modules/app_python3s/app_python3s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ebe77a2068c5073b436a1f8fefdfd68… Patch: https://github.com/kamailio/kamailio/commit/ebe77a2068c5073b436a1f8fefdfd68… --- diff --git a/src/modules/app_python3s/app_python3s_mod.c b/src/modules/app_python3s/app_python3s_mod.c index 119d8ef071a..91562f99aec 100644 --- a/src/modules/app_python3s/app_python3s_mod.c +++ b/src/modules/app_python3s/app_python3s_mod.c @@ -83,7 +83,7 @@ static cmd_export_t cmds[] = { }; /** module exports */ -struct module_exports exports = { +struct module_exports _app_python3s_exports = { "app_python3s", /* module name */ RTLD_NOW | RTLD_GLOBAL, /* dlopen flags */ cmds, /* exported functions */

1 0

git:master:9fb9cbdd: app_python3s: reformat exports structures
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 9fb9cbddee8974a1733b999807cc1943248753f7 URL: https://github.com/kamailio/kamailio/commit/9fb9cbddee8974a1733b999807cc194… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T15:32:57+01:00 app_python3s: reformat exports structures --- Modified: src/modules/app_python3s/app_python3s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9fb9cbddee8974a1733b999807cc194… Patch: https://github.com/kamailio/kamailio/commit/9fb9cbddee8974a1733b999807cc194… --- diff --git a/src/modules/app_python3s/app_python3s_mod.c b/src/modules/app_python3s/app_python3s_mod.c index d549f972333..119d8ef071a 100644 --- a/src/modules/app_python3s/app_python3s_mod.c +++ b/src/modules/app_python3s/app_python3s_mod.c @@ -60,37 +60,42 @@ PyThreadState *myThreadState = NULL; int apy3s_script_init_exec(PyObject *pModule, str *fname, int *vparam); +/* clang-format off */ /** module parameters */ -static param_export_t params[] = {{"load", PARAM_STR, &_sr_python_load_file}, - {"script_init", PARAM_STR, &_sr_apy3s_script_init}, - {"script_child_init", PARAM_STR, &_sr_apy3s_script_child_init}, +static param_export_t params[] = { + {"load", PARAM_STR, &_sr_python_load_file}, + {"script_init", PARAM_STR, &_sr_apy3s_script_init}, + {"script_child_init", PARAM_STR, &_sr_apy3s_script_child_init}, - {0, 0, 0}}; + {0, 0, 0} +}; /* * Exported functions */ static cmd_export_t cmds[] = { - {"app_python3s_exec", (cmd_function)w_app_python3s_exec1, 1, - fixup_spve_null, 0, ANY_ROUTE}, - {"app_python3s_exec", (cmd_function)w_app_python3s_exec2, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + {"app_python3s_exec", (cmd_function)w_app_python3s_exec1, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"app_python3s_exec", (cmd_function)w_app_python3s_exec2, 2, + fixup_spve_spve, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {0, 0, 0, 0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "app_python3s", /* module name */ - RTLD_NOW | RTLD_GLOBAL, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* destroy function */ + "app_python3s", /* module name */ + RTLD_NOW | RTLD_GLOBAL, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* destroy function */ }; +/* clang-format on */ /**

1 0

git:master:114d6fe5: app_python3: use module name prefix for exports structure
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 114d6fe510d7c1876782054ed89e4017d39d5f69 URL: https://github.com/kamailio/kamailio/commit/114d6fe510d7c1876782054ed89e401… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T15:29:49+01:00 app_python3: use module name prefix for exports structure --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/114d6fe510d7c1876782054ed89e401… Patch: https://github.com/kamailio/kamailio/commit/114d6fe510d7c1876782054ed89e401… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index e5024b0cb87..29316434e76 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -83,7 +83,7 @@ static cmd_export_t cmds[] = { }; /** module exports */ -struct module_exports exports = { +struct module_exports _app_python3_exports = { "app_python3", /* module name */ RTLD_NOW | RTLD_GLOBAL, /* dlopen flags */ cmds, /* exported functions */

1 0

git:master:042bb9d1: app_python3: reformat exports structures
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 042bb9d10e12a256f9e4461031347e09b89fbe98 URL: https://github.com/kamailio/kamailio/commit/042bb9d10e12a256f9e4461031347e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T15:26:23+01:00 app_python3: reformat exports structures --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/042bb9d10e12a256f9e4461031347e0… Patch: https://github.com/kamailio/kamailio/commit/042bb9d10e12a256f9e4461031347e0… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 45dde5268c4..e5024b0cb87 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -61,35 +61,41 @@ int _apy_process_rank = 0; PyThreadState *myThreadState; +/* clang-format off */ /** module parameters */ static param_export_t params[] = { - {"script_name", PARAM_STR, &_sr_python_load_file}, - {"load", PARAM_STR, &_sr_python_load_file}, - {"mod_init_function", PARAM_STR, &mod_init_fname}, - {"child_init_method", PARAM_STR, &child_init_mname}, {0, 0, 0}}; + {"script_name", PARAM_STR, &_sr_python_load_file}, + {"load", PARAM_STR, &_sr_python_load_file}, + {"mod_init_function", PARAM_STR, &mod_init_fname}, + {"child_init_method", PARAM_STR, &child_init_mname}, + {0, 0, 0} +}; /* * Exported functions */ -static cmd_export_t cmds[] = {{"python_exec", (cmd_function)python_exec1, 1, - fixup_spve_null, 0, ANY_ROUTE}, - {"python_exec", (cmd_function)python_exec2, 2, fixup_spve_spve, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {"python_exec", (cmd_function)python_exec1, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"python_exec", (cmd_function)python_exec2, 2, + fixup_spve_spve, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "app_python3", /* module name */ - RTLD_NOW | RTLD_GLOBAL, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* destroy function */ + "app_python3", /* module name */ + RTLD_NOW | RTLD_GLOBAL, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* destroy function */ }; +/* clang-format on */ /**

1 0

git:master:1623f9ed: core: resolve - variables initialisation
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 1623f9ed1728455b72abf0a74f06bfd24365cefb URL: https://github.com/kamailio/kamailio/commit/1623f9ed1728455b72abf0a74f06bfd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T15:14:39+01:00 core: resolve - variables initialisation --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/1623f9ed1728455b72abf0a74f06bfd… Patch: https://github.com/kamailio/kamailio/commit/1623f9ed1728455b72abf0a74f06bfd… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 36ea073bc5b..b6ee8592697 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1511,7 +1511,7 @@ size_t create_srv_pref_list(char *proto, struct dns_srv_proto *list) { struct dns_srv_proto tmp; size_t i, j, list_len; - int default_order, max; + int default_order = 1, max; /* if proto available, then add only the forced protocol to the list */ if(proto && *proto != PROTO_NONE) { @@ -1661,7 +1661,7 @@ struct hostent *naptr_sip_resolvehost( char n_proto; str srv_name; naptr_bmp_t tried_bmp; /* tried bitmap */ - char origproto; + char origproto = PROTO_NONE; if(proto) origproto = *proto;

1 0

git:master:dc7f2eca: core: tcp - init local variables and define function only when needed
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: dc7f2eca21eb6493f3c215eeb21e0a37a6e813c6 URL: https://github.com/kamailio/kamailio/commit/dc7f2eca21eb6493f3c215eeb21e0a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T14:33:29+01:00 core: tcp - init local variables and define function only when needed --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/dc7f2eca21eb6493f3c215eeb21e0a3… Patch: https://github.com/kamailio/kamailio/commit/dc7f2eca21eb6493f3c215eeb21e0a3… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 855b2d80617..3d4a6a4e0b1 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2064,15 +2064,15 @@ int tcp_send(struct dest_info *dst, union sockaddr_union *from, const char *buf, struct tcp_connection *c; struct ip_addr ip; int port; - int fd; + int fd = -1; long response[2]; int n; ticks_t con_lifetime; int try_local_port; #ifdef USE_TLS - const char *rest_buf; - const char *t_buf; - unsigned rest_len, t_len; + const char *rest_buf = NULL; + const char *t_buf = NULL; + unsigned rest_len = 0, t_len = 0; long resp; snd_flags_t t_send_flags; #endif /* USE_TLS */ @@ -3548,6 +3548,7 @@ static void destroy_send_fd_queues(void) } +#ifdef SEND_FD_QUEUE inline static int send_fd_queue_add( struct tcp_send_fd_q *q, int unix_sock, struct tcp_connection *t) { @@ -3585,7 +3586,7 @@ inline static int send_fd_queue_add( error: return -1; } - +#endif inline static void send_fd_queue_run(struct tcp_send_fd_q *q) {

1 0

git:master:d0a35334: core/mem: tlsf - cast to char* for pointer operations
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: d0a353342b559191aafc732174773e132554694a URL: https://github.com/kamailio/kamailio/commit/d0a353342b559191aafc732174773e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T13:57:52+01:00 core/mem: tlsf - cast to char* for pointer operations --- Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/d0a353342b559191aafc732174773e1… Patch: https://github.com/kamailio/kamailio/commit/d0a353342b559191aafc732174773e1… --- diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index f7cdeab5eec..e599f84aff9 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -1058,9 +1058,10 @@ void tlsf_free(tlsf_t tlsf, void *ptr) control->allocated -= block_size(block); control->real_used -= (block_size(block) - + (ptr - - (void *)block - /* prev_phys_block is melted in the previous block when the current block is used */ + + ((char *)ptr + - (char *)block + /* prev_phys_block is melted in the previous + * block when the current block is used */ + sizeof(block->prev_phys_block))); #ifdef DBG_TLSF_MALLOC block->alloc_info.file = file;

1 0

git:master:30c42aab: core: resolve - cast after pointer operations for RES_AR
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 30c42aab767d777e3beb1493165458489957e92d URL: https://github.com/kamailio/kamailio/commit/30c42aab767d777e3beb14931654584… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T13:30:26+01:00 core: resolve - cast after pointer operations for RES_AR --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/30c42aab767d777e3beb14931654584… Patch: https://github.com/kamailio/kamailio/commit/30c42aab767d777e3beb14931654584… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 56d189f1ab1..36ea073bc5b 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1026,7 +1026,7 @@ struct rdata *get_record(char *name, int type, int flags) /* check if enough space is left for type, class, ttl & size */ if(unlikely((p + 2 + 2 + 4 + 2) > end)) goto error_boundary; - memcpy((void *)&rdlength, (void *)p + 2 + 2 + 4, 2); + memcpy((void *)&rdlength, (void *)(p + 2 + 2 + 4), 2); p += 2 + 2 + 4 + 2 + ntohs(rdlength); } answers_no = ntohs((unsigned short)buff.hdr.arcount);

1 0

git:master:2da8060f: pipelimit: init cpu load metrics and check returned value of fscanf()
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 2da8060f67f09949e11f77a281fcb4e3e5def582 URL: https://github.com/kamailio/kamailio/commit/2da8060f67f09949e11f77a281fcb4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T13:27:24+01:00 pipelimit: init cpu load metrics and check returned value of fscanf() --- Modified: src/modules/pipelimit/pipelimit.c Modified: src/modules/pipelimit/pl_ht.c Modified: src/modules/pipelimit/pl_statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/2da8060f67f09949e11f77a281fcb4e… Patch: https://github.com/kamailio/kamailio/commit/2da8060f67f09949e11f77a281fcb4e… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index e9fc83b7920..625da0e50dd 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -214,13 +214,16 @@ int get_num_cpus() /* not using /proc/loadavg because it only works when our_timer_interval == theirs */ static int get_cpuload(double *load) { - static long long o_user, o_nice, o_sys, o_idle, o_iow, o_irq, o_sirq, o_stl; - long long n_user, n_nice, n_sys, n_idle, n_iow, n_irq, n_sirq, n_stl; + static long long o_user = 0, o_nice = 0, o_sys = 0, o_idle = 0, o_iow = 0, + o_irq = 0, o_sirq = 0, o_stl = 0; + long long n_user = 0, n_nice = 0, n_sys = 0, n_idle = 0, n_iow = 0, + n_irq = 0, n_sirq = 0, n_stl = 0; static int first_time = 1; FILE *f = fopen("/proc/stat", "r"); - double vload; - int ncpu; + double vload = 0.0; + int ncpu = 0; static int errormsg = 0; + int n = 0; if(!f) { /* Only write this error message five times. Otherwise you will annoy @@ -231,9 +234,9 @@ static int get_cpuload(double *load) } return -1; } - if(fscanf(f, "cpu %lld%lld%lld%lld%lld%lld%lld%lld", &n_user, &n_nice, - &n_sys, &n_idle, &n_iow, &n_irq, &n_sirq, &n_stl) - < 0) { + n = fscanf(f, "cpu %lld%lld%lld%lld%lld%lld%lld%lld", &n_user, &n_nice, + &n_sys, &n_idle, &n_iow, &n_irq, &n_sirq, &n_stl); + if(n < 8) { LM_ERR("could not parse load information\n"); fclose(f); return -1; diff --git a/src/modules/pipelimit/pl_ht.c b/src/modules/pipelimit/pl_ht.c index 5f9b52dfc4a..c4e30de6190 100644 --- a/src/modules/pipelimit/pl_ht.c +++ b/src/modules/pipelimit/pl_ht.c @@ -56,6 +56,7 @@ str_map_t algo_names[] = { int pl_init_htable(unsigned int hsize) { int i; + int j; if(_pl_pipes_ht != NULL) return -1; @@ -80,10 +81,10 @@ int pl_init_htable(unsigned int hsize) for(i = 0; i < _pl_pipes_ht->htsize; i++) { if(lock_init(&_pl_pipes_ht->slots[i].lock) == 0) { LM_ERR("cannot initialize lock[%d]\n", i); - i--; - while(i >= 0) { - lock_destroy(&_pl_pipes_ht->slots[i].lock); - i--; + j = i - 1; + while(j >= 0) { + lock_destroy(&_pl_pipes_ht->slots[j].lock); + j--; } shm_free(_pl_pipes_ht->slots); shm_free(_pl_pipes_ht); diff --git a/src/modules/pipelimit/pl_statistics.c b/src/modules/pipelimit/pl_statistics.c index c350acb0fc1..40d48b0a7c3 100644 --- a/src/modules/pipelimit/pl_statistics.c +++ b/src/modules/pipelimit/pl_statistics.c @@ -184,7 +184,7 @@ int get_socket_list_from_proto_and_family( return 0; } - *ipList = pkg_malloc(numberOfSockets * (num_ip_octets + 1) * sizeof(int)); + *ipList = pkg_malloc(sizeof(int) * numberOfSockets * (num_ip_octets + 1)); /* We couldn't allocate memory for the IP List. So all we can do is * fail. */

1 0

git:master:d439a040: sms: more printing to buffer with size limit
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: d439a0400caee337419cb2645b549d4926ede04e URL: https://github.com/kamailio/kamailio/commit/d439a0400caee337419cb2645b549d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T12:58:17+01:00 sms: more printing to buffer with size limit --- Modified: src/modules/sms/libsms_getsms.c Modified: src/modules/sms/libsms_modem.c Modified: src/modules/sms/sms_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/d439a0400caee337419cb2645b549d4… Patch: https://github.com/kamailio/kamailio/commit/d439a0400caee337419cb2645b549d4… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index 94f50f917b2..e4ff2296707 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -160,7 +160,7 @@ static int fetchsms(struct modem *mdm, int sim, char *pdu) } } else { LM_DBG("Trying to get stored message %i\n", sim); - clen = sprintf(command, "AT+CMGR=%i\r", sim); + clen = snprintf(command, 16, "AT+CMGR=%i\r", sim); put_command(mdm, command, clen, answer, sizeof(answer), 50, 0); /* search for beginning of the answer */ position = strstr(answer, "+CMGR:"); @@ -200,7 +200,7 @@ static void deletesms(struct modem *mdm, int sim) int clen; LM_DBG("Deleting message %i !\n", sim); - clen = sprintf(command, "AT+CMGD=%i\r", sim); + clen = snprintf(command, 32, "AT+CMGD=%i\r", sim); put_command(mdm, command, clen, answer, sizeof(answer), 50, 0); } @@ -308,13 +308,13 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) } /* Get the date */ start = end + 3; - sprintf(dbuf, "%c%c-%c%c-%c%c", start[3], start[4], start[0], start[1], - start[6], start[7]); + snprintf(dbuf, DATE_LEN + 1, "%c%c-%c%c-%c%c", start[3], start[4], start[0], + start[1], start[6], start[7]); memcpy(sms->date, dbuf, DATE_LEN); /* Get the time */ start += 9; - sprintf(tbuf, "%c%c:%c%c:%c%c", start[0], start[1], start[3], start[4], - start[7], start[7]); + snprintf(tbuf, TIME_LEN + 1, "%c%c:%c%c:%c%c", start[0], start[1], start[3], + start[4], start[7], start[7]); memcpy(sms->time, tbuf, TIME_LEN); sms->userdatalength = strlen(sms->ascii); return 1; diff --git a/src/modules/sms/libsms_modem.c b/src/modules/sms/libsms_modem.c index 1740b2ab463..7540b99ab33 100644 --- a/src/modules/sms/libsms_modem.c +++ b/src/modules/sms/libsms_modem.c @@ -225,7 +225,8 @@ int initmodem(struct modem *mdm, cds_report cds_report_f) put_command(mdm, "AT+CPIN?\r", 9, answer, sizeof(answer), 50, 0); if(strstr(answer, "+CPIN: SIM PIN")) { LM_INFO("Modem needs PIN, entering PIN...\n"); - clen = sprintf(command, "AT+CPIN=\"%s\"\r", mdm->pin); + clen = snprintf( + command, MAX_CHAR_BUF + 12, "AT+CPIN=\"%s\"\r", mdm->pin); put_command(mdm, command, clen, answer, sizeof(answer), 100, 0); put_command(mdm, "AT+CPIN?\r", 9, answer, sizeof(answer), 50, 0); if(!strstr(answer, "+CPIN: READY")) { @@ -377,7 +378,7 @@ int setsmsc(struct modem *mdm, char *smsc) int clen; if(smsc && smsc[0]) { - clen = sprintf(command, "AT+CSCA=\"+%s\"\r", smsc); + clen = snprintf(command, 100, "AT+CSCA=\"+%s\"\r", smsc); put_command(mdm, command, clen, answer, sizeof(answer), 50, 0); } return 0; diff --git a/src/modules/sms/sms_funcs.c b/src/modules/sms/sms_funcs.c index 7c45d8c5967..f0cf47afa7d 100644 --- a/src/modules/sms/sms_funcs.c +++ b/src/modules/sms/sms_funcs.c @@ -487,7 +487,7 @@ int send_as_sms(struct sms_msg *sms_messg, struct modem *mdm) goto error; if(sms_report_type != NO_REPORT) add_sms_into_report_queue(ret_code, sms_messg, - p - use_nice * (nr_chunks > 1) * SMS_EDGE_PART_LEN, + p - SMS_EDGE_PART_LEN * use_nice * (nr_chunks > 1), len_array[i]); }

1 0

git:5.6:3a7afccf: rabbitmq: backport of RABBITMQ_ERR_CREATE needed for handling allocation error
by Victor Seva 21 Nov '23

21 Nov '23

Module: kamailio Branch: 5.6 Commit: 3a7afccf8db3936d46bcc1b190ea23c3b5d27447 URL: https://github.com/kamailio/kamailio/commit/3a7afccf8db3936d46bcc1b190ea23c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-21T14:37:33+01:00 rabbitmq: backport of RABBITMQ_ERR_CREATE needed for handling allocation error (cherry picked from commit f764cef139d55adb5d38ffc6a1a65fd14bda5f4c) --- Modified: src/modules/rabbitmq/rabbitmq.h --- Diff: https://github.com/kamailio/kamailio/commit/3a7afccf8db3936d46bcc1b190ea23c… Patch: https://github.com/kamailio/kamailio/commit/3a7afccf8db3936d46bcc1b190ea23c… --- diff --git a/src/modules/rabbitmq/rabbitmq.h b/src/modules/rabbitmq/rabbitmq.h index 30f39ca7fd5..4eb31958643 100644 --- a/src/modules/rabbitmq/rabbitmq.h +++ b/src/modules/rabbitmq/rabbitmq.h @@ -49,6 +49,7 @@ typedef enum RABBITMQ_ERR_CHANNEL, RABBITMQ_ERR_QUEUE, RABBITMQ_ERR_PUBLISH, + RABBITMQ_ERR_CREATE, RABBITMQ_ERR_SOCK, RABBITMQ_ERR_CONSUME, RABBITMQ_ERR_NULL,

1 0

git:master:1ded1730: mediaproxy: print to buffer with size limit
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 1ded1730c7fe81596d874fdc314dab64a7dab25b URL: https://github.com/kamailio/kamailio/commit/1ded1730c7fe81596d874fdc314dab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T12:04:01+01:00 mediaproxy: print to buffer with size limit --- Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/1ded1730c7fe81596d874fdc314dab6… Patch: https://github.com/kamailio/kamailio/commit/1ded1730c7fe81596d874fdc314dab6… --- diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 8b8d87616ad..782bc202893 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -1614,7 +1614,7 @@ static int use_media_proxy( if(session.supported_count == 0) return 1; // there are no supported media streams. we have nothing to do. - len = sprintf(media_str, "%s", "media: "); + len = snprintf(media_str, sizeof(media_str), "%s", "media: "); for(i = 0, str_buf.len = sizeof(media_str) - len - 2, str_buf.s = media_str + len; i < session.stream_count; i++) { @@ -1628,15 +1628,15 @@ static int use_media_proxy( (unsigned long)sizeof(media_str)); return -1; } - len = sprintf(str_buf.s, "%.*s:%.*s:%.*s:%.*s:%s,", stream.type.len, - stream.type.s, stream.ip.len, stream.ip.s, stream.port.len, - stream.port.s, stream.direction.len, stream.direction.s, - stream.has_ice ? "ice=yes" : "ice=no"); + len = snprintf(str_buf.s, str_buf.len, "%.*s:%.*s:%.*s:%.*s:%s,", + stream.type.len, stream.type.s, stream.ip.len, stream.ip.s, + stream.port.len, stream.port.s, stream.direction.len, + stream.direction.s, stream.has_ice ? "ice=yes" : "ice=no"); str_buf.s += len; str_buf.len -= len; } *(str_buf.s - 1) = 0; // remove the last comma - sprintf(str_buf.s - 1, "%s", "\r\n"); + snprintf(str_buf.s - 1, str_buf.len + 1, "%s", "\r\n"); } else { media_str[0] = 0; } @@ -1819,7 +1819,7 @@ static int use_media_proxy( : ice_data->priority; port = strtoint(&tokens[j]); candidate.s = buf; - candidate.len = sprintf(candidate.s, + candidate.len = snprintf(candidate.s, sizeof(buf), "a=candidate:R%x 1 UDP %u %.*s %i typ relay%.*s", hexip.s_addr, priority, tokens[0].len, tokens[0].s, port, session.separator.len, session.separator.s); @@ -1833,7 +1833,7 @@ static int use_media_proxy( if(stream.has_rtcp_ice) { candidate.s = buf; - candidate.len = sprintf(candidate.s, + candidate.len = snprintf(candidate.s, sizeof(buf), "a=candidate:R%x 2 UDP %u %.*s %i typ relay%.*s", hexip.s_addr, priority - 1, tokens[0].len, tokens[0].s, port + 1, session.separator.len, session.separator.s); @@ -2199,4 +2199,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_mediaproxy_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:7a2ad119: sms: print to buffer with size limit
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 7a2ad1190553911770e3a78246ef037c6de49e5c URL: https://github.com/kamailio/kamailio/commit/7a2ad1190553911770e3a78246ef037… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:49:12+01:00 sms: print to buffer with size limit --- Modified: src/modules/sms/libsms_putsms.c --- Diff: https://github.com/kamailio/kamailio/commit/7a2ad1190553911770e3a78246ef037… Patch: https://github.com/kamailio/kamailio/commit/7a2ad1190553911770e3a78246ef037… --- diff --git a/src/modules/sms/libsms_putsms.c b/src/modules/sms/libsms_putsms.c index 1622a1bb0f5..a130d4acf6c 100644 --- a/src/modules/sms/libsms_putsms.c +++ b/src/modules/sms/libsms_putsms.c @@ -101,7 +101,8 @@ int binary2pdu(char *binary, int length, char *pdu) /* make the PDU string. The destination variable pdu has to be big enough. */ -int make_pdu(struct sms_msg *msg, struct modem *mdm, char *pdu) +int make_pdu(struct sms_msg *msg, struct modem *mdm, char *pdu, + unsigned int pdu_size) { int coding; int flags; @@ -127,11 +128,11 @@ int make_pdu(struct sms_msg *msg, struct modem *mdm, char *pdu) flags += 16; // Validity field /* concatenate the first part of the PDU string */ if(mdm->mode == MODE_OLD) - pdu_len += sprintf(pdu, "%02X00%02X91%s00%02X%02X", flags, msg->to.len, - tmp, coding, msg->text.len); - else - pdu_len += sprintf(pdu, "00%02X00%02X91%s00%02XA7%02X", flags, + pdu_len += snprintf(pdu, pdu_size, "%02X00%02X91%s00%02X%02X", flags, msg->to.len, tmp, coding, msg->text.len); + else + pdu_len += snprintf(pdu, pdu_size, "00%02X00%02X91%s00%02XA7%02X", + flags, msg->to.len, tmp, coding, msg->text.len); /* Create the PDU string of the message */ /* pdu_len += binary2pdu(msg->text.s,msg->text.len,pdu+pdu_len); */ pdu_len += @@ -180,20 +181,20 @@ int putsms(struct sms_msg *sms_messg, struct modem *mdm) int pdu_len; int sms_id; - pdu_len = make_pdu(sms_messg, mdm, pdu); + pdu_len = make_pdu(sms_messg, mdm, pdu, 500); if(mdm->mode == MODE_OLD) - clen = sprintf(command, "AT+CMGS=%i\r", pdu_len / 2); + clen = snprintf(command, 500, "AT+CMGS=%i\r", pdu_len / 2); else if(mdm->mode == MODE_ASCII) - clen = sprintf(command, "AT+CMGS=\"+%.*s\"\r", sms_messg->to.len, + clen = snprintf(command, 500, "AT+CMGS=\"+%.*s\"\r", sms_messg->to.len, sms_messg->to.s); else - clen = sprintf(command, "AT+CMGS=%i\r", pdu_len / 2 - 1); + clen = snprintf(command, 500, "AT+CMGS=%i\r", pdu_len / 2 - 1); if(mdm->mode == MODE_ASCII) - clen2 = sprintf( - command2, "%.*s\x1A", sms_messg->text.len, sms_messg->text.s); + clen2 = snprintf(command2, 500, "%.*s\x1A", sms_messg->text.len, + sms_messg->text.s); else - clen2 = sprintf(command2, "%.*s\x1A", pdu_len, pdu); + clen2 = snprintf(command2, 500, "%.*s\x1A", pdu_len, pdu); sms_id = 0; for(err_code = 0, retries = 0; err_code < 2 && retries < mdm->retry;

1 0

git:master:20b690a3: topos: open db connection in mod init only when checking table version
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 20b690a31ee0d3fbaa86fdf87790d842a982bcf5 URL: https://github.com/kamailio/kamailio/commit/20b690a31ee0d3fbaa86fdf87790d84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:36:10+01:00 topos: open db connection in mod init only when checking table version --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/20b690a31ee0d3fbaa86fdf87790d84… Patch: https://github.com/kamailio/kamailio/commit/20b690a31ee0d3fbaa86fdf87790d84… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 40133099bf4..440936f294c 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -79,6 +79,9 @@ db_func_t _tpsdbf; /* sruid to get internal uid */ sruid_t _tps_sruid; +extern str tt_table_name; +extern str td_table_name; + /** module parameters */ static str _tps_db_url = str_init(DEFAULT_DB_URL); int _tps_param_mask_callid = 0; @@ -259,26 +262,24 @@ static int mod_init(void) "provide all functions needed\n"); return -1; } - topos_db_con = _tpsdbf.init(&_tps_db_url); - if(topos_db_con == NULL) { - LM_ERR("failed to open database connection\n"); - goto dberror; - } - if(_tps_version_table_check != 0 - && db_check_table_version(&_tpsdbf, topos_db_con, - &td_table_name, TD_TABLE_VERSION) - < 0) { - DB_TABLE_VERSION_ERROR(td_table_name); - goto dberror; - } - if(_tps_version_table_check != 0 - && db_check_table_version(&_tpsdbf, topos_db_con, - &tt_table_name, TT_TABLE_VERSION) - < 0) { - DB_TABLE_VERSION_ERROR(tt_table_name); - goto dberror; - } - if(topos_db_con) { + if(_tps_version_table_check != 0) { + topos_db_con = _tpsdbf.init(&_tps_db_url); + if(topos_db_con == NULL) { + LM_ERR("failed to open database connection\n"); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &td_table_name, TD_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(td_table_name); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &tt_table_name, TT_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(tt_table_name); + goto dberror; + } _tpsdbf.close(topos_db_con); topos_db_con = NULL; } diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index 65d2c5d8be9..4c2585a1ff6 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -85,8 +85,6 @@ typedef struct tps_data int32_t expires; } tps_data_t; -extern str tt_table_name; -extern str td_table_name; int tps_storage_dialog_find(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_save(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_rm(sip_msg_t *msg, tps_data_t *td);

1 0

git:master:650117eb: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 650117ebc0a3e0369dd47015f7e96358515fedc9 URL: https://github.com/kamailio/kamailio/commit/650117ebc0a3e0369dd47015f7e9635… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-21T11:32:12+01:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/650117ebc0a3e0369dd47015f7e9635… Patch: https://github.com/kamailio/kamailio/commit/650117ebc0a3e0369dd47015f7e9635… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index ad13698a204..70af19ae47e 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -52,6 +52,7 @@ Frederic Gaisnon 3.19. methods_nocontact (str) 3.20. header_mode (int) 3.21. methods_noinitial (str) + 3.22. version_table (integer) 4. Functions @@ -87,11 +88,12 @@ Frederic Gaisnon 1.19. Set methods_nocontact parameter 1.20. Set header_mode parameter 1.21. Set methods_noinitial parameter - 1.22. tps_set_context usage - 1.23. Usage of event_route[topos:msg-outgoing] - 1.24. Usage of event_route[topos:msg-sending] - 1.25. Usage of event_route[topos:msg-incoming] - 1.26. Usage of event_route[topos:msg-receiving] + 1.22. version_table parameter usage + 1.23. tps_set_context usage + 1.24. Usage of event_route[topos:msg-outgoing] + 1.25. Usage of event_route[topos:msg-sending] + 1.26. Usage of event_route[topos:msg-incoming] + 1.27. Usage of event_route[topos:msg-receiving] Chapter 1. Admin Guide @@ -126,6 +128,7 @@ Chapter 1. Admin Guide 3.19. methods_nocontact (str) 3.20. header_mode (int) 3.21. methods_noinitial (str) + 3.22. version_table (integer) 4. Functions @@ -202,6 +205,7 @@ Chapter 1. Admin Guide 3.19. methods_nocontact (str) 3.20. header_mode (int) 3.21. methods_noinitial (str) + 3.22. version_table (integer) 3.1. storage (str) @@ -526,6 +530,17 @@ modparam("topos", "header_mode", 1) modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") ... +3.22. version_table (integer) + + If set to 0, the module will skip checking the version of the tables. + + Default value is ��1 (check for table version)��. + + Example 1.22. version_table parameter usage +... +modparam("topos", "version_table", 0) +... + 4. Functions 4.1. tps_set_context(ctx) @@ -537,7 +552,7 @@ modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") This function can be used from ANY_ROUTE. - Example 1.22. tps_set_context usage + Example 1.23. tps_set_context usage ... request_route { ... @@ -565,7 +580,7 @@ request_route { reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.23. Usage of event_route[topos:msg-outgoing] + Example 1.24. Usage of event_route[topos:msg-outgoing] ... event_route[topos:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -584,7 +599,7 @@ event_route[topos:msg-outgoing] { $sndto(proto) point to the destination. The SIP message is the one to be sent out. - Example 1.24. Usage of event_route[topos:msg-sending] + Example 1.25. Usage of event_route[topos:msg-sending] ... event_route[topos:msg-sending] { if(is_request() and $fU=="alice") { @@ -604,7 +619,7 @@ event_route[topos:msg-sending] { internally generated one at startup, to avoid reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.25. Usage of event_route[topos:msg-incoming] + Example 1.26. Usage of event_route[topos:msg-incoming] ... event_route[topos:msg-incoming] { if($si=="10.1.1.10") { @@ -622,7 +637,7 @@ event_route[topos:msg-incoming] { Inside the event route the variables $si, $sp and $proto point to the source address. The SIP message is the one to be sent out. - Example 1.26. Usage of event_route[topos:msg-receiving] + Example 1.27. Usage of event_route[topos:msg-receiving] ... event_route[topos:msg-receiving] { if(is_request() and $fU=="alice") {

1 0

[kamailio/kamailio] topos: Add db version check (PR #3639)
by Xenofon Karamanos 21 Nov '23

21 Nov '23

#### 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  Add a database version check and fail gracefully if it does not match. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3639 -- Commit Summary -- * topos: Add db version check -- File Changes -- M src/modules/topos/topos_mod.c (26) M src/modules/topos/tps_storage.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3639.patch https://github.com/kamailio/kamailio/pull/3639.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3639 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3639(a)github.com>

2 9

git:master:dab123bf: topos: Add version_table documentation
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: dab123bf9c19bbd67eab05cbadf9efea5682c0dc URL: https://github.com/kamailio/kamailio/commit/dab123bf9c19bbd67eab05cbadf9efe… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Add version_table documentation --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dab123bf9c19bbd67eab05cbadf9efe… Patch: https://github.com/kamailio/kamailio/commit/dab123bf9c19bbd67eab05cbadf9efe… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 441c099d8ec..4ccc4b7790f 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -600,6 +600,23 @@ modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") </programlisting> </example> </section> + <section id="topos.p.version_table"> + <title><varname>version_table</varname> (integer)</title> + <para> + If set to 0, the module will skip checking the version of the tables. + </para> + <para> + Default value is <quote>1 (check for table version)</quote>. + </para> + <example> + <title><varname>version_table</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("topos", "version_table", 0) +... + </programlisting> + </example> + </section> </section> <section>

1 0

git:master:356f4f9e: topos: Add version_table parameter
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 356f4f9e1319ecfdede4b46f636de3143b85ca5e URL: https://github.com/kamailio/kamailio/commit/356f4f9e1319ecfdede4b46f636de31… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Add version_table parameter --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/356f4f9e1319ecfdede4b46f636de31… Patch: https://github.com/kamailio/kamailio/commit/356f4f9e1319ecfdede4b46f636de31… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index d7efd055535..40133099bf4 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -104,6 +104,9 @@ int _tps_clean_interval = 60; #define TPS_EVENTRT_RECEIVING 8 #define TT_TABLE_VERSION 2 #define TD_TABLE_VERSION 2 + +static int _tps_version_table_check = 1; + static int _tps_eventrt_mode = TPS_EVENTRT_OUTGOING | TPS_EVENTRT_SENDING | TPS_EVENTRT_INCOMING | TPS_EVENTRT_RECEIVING; static int _tps_eventrt_outgoing = -1; @@ -177,6 +180,7 @@ static param_export_t params[] = {{"storage", PARAM_STR, &_tps_storage}, {"context", PARAM_STR, &_tps_context_param}, {"methods_nocontact", PARAM_STR, &_tps_methods_nocontact_list}, {"methods_noinitial", PARAM_STR, &_tps_methods_noinitial_list}, + {"version_table", INT_PARAM, &_tps_version_table_check}, {0, 0, 0}}; @@ -260,15 +264,17 @@ static int mod_init(void) LM_ERR("failed to open database connection\n"); goto dberror; } - if(db_check_table_version( - &_tpsdbf, topos_db_con, &td_table_name, TD_TABLE_VERSION) - < 0) { + if(_tps_version_table_check != 0 + && db_check_table_version(&_tpsdbf, topos_db_con, + &td_table_name, TD_TABLE_VERSION) + < 0) { DB_TABLE_VERSION_ERROR(td_table_name); goto dberror; } - if(db_check_table_version( - &_tpsdbf, topos_db_con, &tt_table_name, TT_TABLE_VERSION) - < 0) { + if(_tps_version_table_check != 0 + && db_check_table_version(&_tpsdbf, topos_db_con, + &tt_table_name, TT_TABLE_VERSION) + < 0) { DB_TABLE_VERSION_ERROR(tt_table_name); goto dberror; }

1 0

git:master:132a0024: topos: Close db connection
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 132a0024394494da8766c31c94f42822c79a0a51 URL: https://github.com/kamailio/kamailio/commit/132a0024394494da8766c31c94f4282… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Close db connection --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/132a0024394494da8766c31c94f4282… Patch: https://github.com/kamailio/kamailio/commit/132a0024394494da8766c31c94f4282… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 3d570953cff..d7efd055535 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -272,6 +272,10 @@ static int mod_init(void) DB_TABLE_VERSION_ERROR(tt_table_name); goto dberror; } + if(topos_db_con) { + _tpsdbf.close(topos_db_con); + topos_db_con = NULL; + } } else { if(_tps_storage.len != 7 && strncmp(_tps_storage.s, "redis", 5) != 0) { LM_ERR("unknown storage type: %.*s\n", _tps_storage.len,

1 0

git:master:c0639031: topos: Add db version check
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: c06390319a7afcca498a4a72cdcd0c11b7bb2ff2 URL: https://github.com/kamailio/kamailio/commit/c06390319a7afcca498a4a72cdcd0c1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Add db version check --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/c06390319a7afcca498a4a72cdcd0c1… Patch: https://github.com/kamailio/kamailio/commit/c06390319a7afcca498a4a72cdcd0c1… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 4540382b725..3d570953cff 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -102,6 +102,8 @@ int _tps_clean_interval = 60; #define TPS_EVENTRT_SENDING 2 #define TPS_EVENTRT_INCOMING 4 #define TPS_EVENTRT_RECEIVING 8 +#define TT_TABLE_VERSION 2 +#define TD_TABLE_VERSION 2 static int _tps_eventrt_mode = TPS_EVENTRT_OUTGOING | TPS_EVENTRT_SENDING | TPS_EVENTRT_INCOMING | TPS_EVENTRT_RECEIVING; static int _tps_eventrt_outgoing = -1; @@ -198,6 +200,7 @@ struct module_exports exports = { */ static int mod_init(void) { + db1_con_t *topos_db_con = NULL; _tps_eventrt_outgoing = route_lookup(&event_rt, _tps_eventrt_outgoing_name.s); if(_tps_eventrt_outgoing < 0 @@ -252,6 +255,23 @@ static int mod_init(void) "provide all functions needed\n"); return -1; } + topos_db_con = _tpsdbf.init(&_tps_db_url); + if(topos_db_con == NULL) { + LM_ERR("failed to open database connection\n"); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &td_table_name, TD_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(td_table_name); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &tt_table_name, TT_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(tt_table_name); + goto dberror; + } } else { if(_tps_storage.len != 7 && strncmp(_tps_storage.s, "redis", 5) != 0) { LM_ERR("unknown storage type: %.*s\n", _tps_storage.len, @@ -303,6 +323,12 @@ static int mod_init(void) return 0; error: return -1; +dberror: + if(topos_db_con) { + _tpsdbf.close(topos_db_con); + topos_db_con = NULL; + } + return -1; } /** diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index 4c2585a1ff6..65d2c5d8be9 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -85,6 +85,8 @@ typedef struct tps_data int32_t expires; } tps_data_t; +extern str tt_table_name; +extern str td_table_name; int tps_storage_dialog_find(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_save(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_rm(sip_msg_t *msg, tps_data_t *td);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev