sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
223 discussions

git:master:fabd1eb4: modules: readme files regenerated - ims_icscf ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: fabd1eb423b62a5899857cf6c0974bb26fd8be30 URL: https://github.com/kamailio/kamailio/commit/fabd1eb423b62a5899857cf6c0974bb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-17T16:01:09+02:00 modules: readme files regenerated - ims_icscf ... [skip ci] --- Modified: src/modules/ims_icscf/README Modified: src/modules/ims_usrloc_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/fabd1eb423b62a5899857cf6c0974bb… Patch: https://github.com/kamailio/kamailio/commit/fabd1eb423b62a5899857cf6c0974bb…

5 months, 1 week

[kamailio/kamailio] ims_icscf: add missing documents for database params (PR #3874)

by H. Yavari

- Adding missing ims_icscf database parameters to admin documents. - Change the default value for ims_icscf db_url to Kamailio default db_url value.   #### Pre-Submission Checklist    - [ :white_check_mark: ] Commit message has the format required by CONTRIBUTING guide - [ :white_check_mark:] Commits are split per component (core, individual modules, libs, utils, ...) - [ :white_check_mark:] Each component has a single commit (if not, squash them into one commit) - [ :white_check_mark:] 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 - [ :white_check_mark:] 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 - [ :white_check_mark:] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Only an improvement for users to know they need to set database params for ims_icscf module. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3874 -- Commit Summary -- * ims_icscf: add missing documents for database params -- File Changes -- M src/modules/ims_icscf/doc/ims_icscf_admin.xml (100) M src/modules/ims_icscf/ims_icscf_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3874.patch https://github.com/kamailio/kamailio/pull/3874.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3874 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3874(a)github.com>

5 months, 1 week

git:master:04e065af: ims_usrloc_pcscf: Update the module document

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 04e065af3d46e4b0def5ed3de6502442466f04bc URL: https://github.com/kamailio/kamailio/commit/04e065af3d46e4b0def5ed3de650244… Author: H.Yavari <hyavari(a)senasoftware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-17T15:52:08+02:00 ims_usrloc_pcscf: Update the module document - Fixing the db_url param value from int to string in admin document. --- Modified: src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/04e065af3d46e4b0def5ed3de650244… Patch: https://github.com/kamailio/kamailio/commit/04e065af3d46e4b0def5ed3de650244…

5 months, 1 week

git:master:57087e42: ims_icscf: add missing documents for database params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 57087e42f1b1cae86132c558aa9497f4839af7e0 URL: https://github.com/kamailio/kamailio/commit/57087e42f1b1cae86132c558aa9497f… Author: H.Yavari <hyavari(a)senasoftware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-17T15:52:08+02:00 ims_icscf: add missing documents for database params - Adding missing ims_icscf database parameters to admin documents. - Change the default value for ims_icscf db_url to Kamailio default db_url value. --- Modified: src/modules/ims_icscf/doc/ims_icscf_admin.xml Modified: src/modules/ims_icscf/ims_icscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/57087e42f1b1cae86132c558aa9497f… Patch: https://github.com/kamailio/kamailio/commit/57087e42f1b1cae86132c558aa9497f… --- diff --git a/src/modules/ims_icscf/doc/ims_icscf_admin.xml b/src/modules/ims_icscf/doc/ims_icscf_admin.xml index 9ae046e6794..e3c552a1c57 100644 --- a/src/modules/ims_icscf/doc/ims_icscf_admin.xml +++ b/src/modules/ims_icscf/doc/ims_icscf_admin.xml @@ -111,6 +111,106 @@ modparam("ims_icscf","scscf_entry_expiry", 300) </example> </section> + <section> + <title><varname>db_url</varname> (string)</title> + + <para> + &url; of the database to be used. + </para> + + <para> + If the db_url string is empty, the default database URL + will be used. + </para> + + <para> + <emphasis> + Default value is <quote>&defaultrodb;</quote>. + </emphasis> + </para> + + <example> + <title>Set <varname>db_url</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ims_icscf", "db_url", "&exampledb;") +... + </programlisting> + </example> + </section> + + <section> + <title> + <varname>db_nds_table</varname> (string)</title> + + <para> + NDS (Network Domain Security) table name in database to be used. + </para> + + <para> + <emphasis> + Default value is <quote>nds_trusted_domains</quote>. + </emphasis> + </para> + + <example> + <title>Set <varname>db_nds_table</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ims_icscf", "db_nds_table", "nds_trusted_domains") +... + </programlisting> + </example> + </section> + + <section> + <title> + <varname>db_scscf_table</varname> (string)</title> + + <para> + S-CSCF table name in database to be used. + </para> + + <para> + <emphasis> + Default value is <quote>s_cscf</quote>. + </emphasis> + </para> + + <example> + <title>Set <varname>db_scscf_table</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ims_icscf", "db_scscf_table", "s_cscf") +... + </programlisting> + </example> + </section> + + <section> + <title> + <varname>db_capabilities_table</varname> (string)</title> + + <para> + S-CSCF capabilities table name in database to be used. + </para> + + <para> + <emphasis> + Default value is <quote>s_cscf_capabilities</quote>. + </emphasis> + </para> + + <example> + <title>Set <varname>db_capabilities_table</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ims_icscf", "db_capabilities_table", "s_cscf_capabilities") +... + </programlisting> + </example> + </section> + <section> <title><varname>cxdx_forced_peer</varname> (string)</title> diff --git a/src/modules/ims_icscf/ims_icscf_mod.c b/src/modules/ims_icscf/ims_icscf_mod.c index 502fcf68174..a690891ee46 100644 --- a/src/modules/ims_icscf/ims_icscf_mod.c +++ b/src/modules/ims_icscf/ims_icscf_mod.c @@ -71,7 +71,7 @@ stat_var *uar_replies_response_time = NULL; stat_var *lir_replies_response_time = NULL; //module parameters -char *ims_icscf_db_url = "mysql://icscf:heslo@localhost/hssdata"; /**< DB URL */ +char *ims_icscf_db_url = DEFAULT_RODB_URL; /**< DB URL */ char *ims_icscf_db_nds_table = "nds_trusted_domains"; /**< NDS table in DB */ char *ims_icscf_db_scscf_table = "s_cscf"; /**< S-CSCF table in db */ char *ims_icscf_db_capabilities_table =

5 months, 1 week

[kamailio/kamailio] tls: enable statistics (PR #3852)

by Cedric Müller

#### 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  This enables tls module statistics. This is needed for the xhttp_prom module to export tls module statistics. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3852 -- Commit Summary -- * tls: enable statistics * tls: code formatting -- File Changes -- M src/modules/tls/tls_mod.c (43) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3852.patch https://github.com/kamailio/kamailio/pull/3852.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3852 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3852(a)github.com>

5 months, 1 week

git:master:30248b18: tls: enable statistics

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 30248b184ca169e6d348c98b0236efd230a5446e URL: https://github.com/kamailio/kamailio/commit/30248b184ca169e6d348c98b0236efd… Author: Cedric Mueller <cmueller(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-17T15:48:09+02:00 tls: enable statistics --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/30248b184ca169e6d348c98b0236efd… Patch: https://github.com/kamailio/kamailio/commit/30248b184ca169e6d348c98b0236efd… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index baa1a7c76d1..5d06e7040b5 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -42,6 +42,8 @@ #include "../../core/dprint.h" #include "../../core/mod_fix.h" #include "../../core/kemi.h" +#include "../../core/counters.h" +#include "../../core/tcp_info.h" #define KSR_RTHREAD_SKIP_P #define KSR_RTHREAD_NEED_4PP @@ -56,6 +58,7 @@ #include "tls_mod.h" #include "tls_cfg.h" #include "tls_rand.h" +#include "tls_ct_wrq.h" #ifndef TLS_HOOKS #error "TLS_HOOKS must be defined, or the tls module won't work" @@ -107,6 +110,20 @@ MODULE_VERSION #define KEY_PREFIX_LEN (strlen(KEY_PREFIX)) #endif +#ifdef STATISTICS +unsigned long tls_stats_connections_no(void); +unsigned long tls_stats_max_connections(void); +unsigned long tls_stats_ct_wq_total_bytes(void); + +static stat_export_t mod_stats[] = { + {"opened_connections", STAT_IS_FUNC, + (stat_var **)tls_stats_connections_no}, + {"max_connections", STAT_IS_FUNC, + (stat_var **)tls_stats_max_connections}, + {"clear_text_write_queued_bytes", STAT_IS_FUNC, + (stat_var **)tls_stats_ct_wq_total_bytes}, + {0, 0, 0}}; +#endif extern str sr_tls_event_callback; str sr_tls_xavp_cfg = {0, 0}; @@ -360,6 +377,14 @@ static int mod_init(void) unsigned char rand_buf[32]; int k; +#ifdef STATISTICS + /* register statistics */ + if(register_module_stats("tls", mod_stats) != 0) { + LM_ERR("failed to register statistics\n"); + return -1; + } +#endif + if(tls_disable) { LM_WARN("tls support is disabled " "(set enable_tls=1 in the config to enable it)\n"); @@ -929,3 +954,24 @@ EVP_PKEY *tls_engine_private_key(const char *key_id) return pkey; } #endif + +#ifdef STATISTICS +unsigned long tls_stats_connections_no(void) +{ + struct tcp_gen_info ti; + tcp_get_info(&ti); + return ti.tls_connections_no; +} + +unsigned long tls_stats_max_connections(void) +{ + struct tcp_gen_info ti; + tcp_get_info(&ti); + return ti.tls_max_connections; +} + +unsigned long tls_stats_ct_wq_total_bytes(void) +{ + return tls_ct_wq_total_bytes(); +} +#endif

5 months, 1 week

[kamailio/kamailio] Fix handling of pending reg contacts in P-CSCF (PR #3869)

by Supreeth Herle

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3869 -- Commit Summary -- * ims_registrar_pcscf: fix typo in comments * ims_ipsec_pcscf: update security params of newly created ipsec tunnel in contact -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (12) M src/modules/ims_registrar_pcscf/save.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3869.patch https://github.com/kamailio/kamailio/pull/3869.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3869 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3869(a)github.com>

5 months, 1 week

git:master:bf863877: ims_ipsec_pcscf: update security params of newly created ipsec tunnel in contact

by Supreeth Herle

Module: kamailio Branch: master Commit: bf863877f666dd8350e855bf933270b2fd8ad0fd URL: https://github.com/kamailio/kamailio/commit/bf863877f666dd8350e855bf933270b… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Supreeth Herle <herlesupreeth(a)gmail.com> Date: 2024-06-17T13:37:12+02:00 ims_ipsec_pcscf: update security params of newly created ipsec tunnel in contact --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/bf863877f666dd8350e855bf933270b… Patch: https://github.com/kamailio/kamailio/commit/bf863877f666dd8350e855bf933270b… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 05079834252..3ce36d27952 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -900,12 +900,10 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) goto cleanup; } - if(ul.update_pcontact(d, &ci, pcontact) != 0) { - LM_ERR("Error updating contact\n"); - goto cleanup; - } - if(ci.via_port == SIP_PORT) { + if(req_sec_params != NULL) { + pcontact->security_temp->data.ipsec = s; + } // Update temp security parameters if(ul.update_temp_security(d, pcontact->security_temp->type, pcontact->security_temp, pcontact) @@ -914,6 +912,10 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) } } + if(ul.update_pcontact(d, &ci, pcontact) != 0) { + LM_ERR("Error updating contact\n"); + goto cleanup; + } if(add_supported_secagree_header(m) != 0) { goto cleanup;

5 months, 1 week

git:master:d17b97a8: ims_registrar_pcscf: fix typo in comments

by Supreeth Herle

Module: kamailio Branch: master Commit: d17b97a864585782e03eedada6d226550630f7bb URL: https://github.com/kamailio/kamailio/commit/d17b97a864585782e03eedada6d2265… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Supreeth Herle <herlesupreeth(a)gmail.com> Date: 2024-06-17T13:37:12+02:00 ims_registrar_pcscf: fix typo in comments --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/d17b97a864585782e03eedada6d2265… Patch: https://github.com/kamailio/kamailio/commit/d17b97a864585782e03eedada6d2265… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 679abc99ca5..025cb78a5d8 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -289,7 +289,7 @@ static inline int update_contacts(struct sip_msg *req, struct sip_msg *rpl, LM_DBG("Error subscribing for contact\n"); } - // After successful registration try to unregister all callbacks for pending contacts ralated to this contact. + // After successful registration try to unregister all callbacks for pending contacts related to this contact. ul.unreg_pending_contacts_cb( _d, pcontact, PCSCF_CONTACT_EXPIRE); }

5 months, 1 week

[kamailio/kamailio] Kamailio ims_charging module Ro Interface User-Equipment-Info-Type AVP (Issue #3807)

by svinson1121

The Kamailio ims_charging module Ro interface is sending: AVP: User-Equipment-Info(458) -> AVP: User-Equipment-Info-Type(459) l=12 f=-M- val=MAC (1) see attached Ro.pcapng packet #7. but (unless I'm not understanding correctly) according to TS 132 299 this AVP should be of type IMEISV and not MAC for the Ro charging interface. also, the MAC is not encoded correctly. again, see the attached pcap at packet #7 from TS 132 299: "User-Equipment-Info-Type This field determines the type of the identifier. The used value is 0 for the international mobile equipment identifier and software version according to TS 23.003[224]. User-Equipment-Info-Value This field contains the user IMEI." "For PS charging, when the User-Equipment-Info-Type AVP (AVP code 459) is set to IMEISV (0), the value within the User-Equipment-Info-Value AVP (AVP code 460) is of type OctetString and shall be a UTF-8 encoded hexadecimal. The composition of the IMEISV follows the definition in TS 23.003 [224] . If only IMEI is received a filler ‘F’ is used to make it 16 digits." "For IMS charging, when the User-Equipment-Info-Type AVP (AVP code 459) is set to IMEISV (0), the value within the User-Equipment-Info-Value AVP (AVP code 460) is of type OctetString and shall be a UTF-8 encoded decimal. The composition of the IMEISV follows the definition in TS 23.003 [224]. If only IMEI is received the number of digits are truncated to 15." I have tested and found this in the following versions: version: kamailio 5.9.0-dev0 (x86_64/linux) 4fb8ac version: kamailio 5.3.2 (x86_64/linux) 87e8a1 Thank you so much for your help with this issue, [Ro.zip](https://github.com/kamailio/kamailio/files/14924042/Ro.zip) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3807 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3807(a)github.com>

5 months, 1 week

← Newer
1
...
9
10
11
12
13
14
15
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024