sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
394 discussions

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

← Newer
1
...
18
19
20
21
22
23
24
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023