sr-dev

sr-dev@lists.kamailio.org

16 participants
45403 discussions

git:5.7:dee31a1e: tls_wolfssl: allow building with debian libwolfssl35
by S-P Chan 25 Jan '24

25 Jan '24

Module: kamailio Branch: 5.7 Commit: dee31a1eaace4d4c40ee5ef9591379768d4fad75 URL: https://github.com/kamailio/kamailio/commit/dee31a1eaace4d4c40ee5ef95913797… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-25T21:50:01+08:00 tls_wolfssl: allow building with debian libwolfssl35 - internal submodule is v5.6.6-stable - libwolfssl35 is at v5.5.4-stable (cherry-pick from 43ec11a7e0a37dfdaead873d555b26cb65589bd1) --- Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dee31a1eaace4d4c40ee5ef95913797… Patch: https://github.com/kamailio/kamailio/commit/dee31a1eaace4d4c40ee5ef95913797… --- diff --git a/src/modules/tls_wolfssl/tls_wolfssl_mod.c b/src/modules/tls_wolfssl/tls_wolfssl_mod.c index 6cdf2de2d1b..e95cecb7be5 100644 --- a/src/modules/tls_wolfssl/tls_wolfssl_mod.c +++ b/src/modules/tls_wolfssl/tls_wolfssl_mod.c @@ -453,7 +453,8 @@ static int ki_is_peer_verified(sip_msg_t *msg) ssl = ((struct tls_extra_data *)c->extra_data)->ssl; ssl_verify = wolfSSL_get_verify_result(ssl); - if(ssl_verify != WOLFSSL_X509_V_OK) { + // WOLFSSL_X509_V_OK / X509_V_OK + if(ssl_verify != 0) { LM_WARN("verification of presented certificate failed... return -1\n"); tcpconn_put(c); return -1;

1 0

git:master:43ec11a7: tls_wolfssl: allow building with debian libwolfssl35
by S-P Chan 25 Jan '24

25 Jan '24

Module: kamailio Branch: master Commit: 43ec11a7e0a37dfdaead873d555b26cb65589bd1 URL: https://github.com/kamailio/kamailio/commit/43ec11a7e0a37dfdaead873d555b26c… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-25T21:48:08+08:00 tls_wolfssl: allow building with debian libwolfssl35 - internal submodule is v5.6.6-stable - libwolfssl35 is at v5.5.4-stable --- Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/43ec11a7e0a37dfdaead873d555b26c… Patch: https://github.com/kamailio/kamailio/commit/43ec11a7e0a37dfdaead873d555b26c… --- diff --git a/src/modules/tls_wolfssl/tls_wolfssl_mod.c b/src/modules/tls_wolfssl/tls_wolfssl_mod.c index 6cdf2de2d1b..e95cecb7be5 100644 --- a/src/modules/tls_wolfssl/tls_wolfssl_mod.c +++ b/src/modules/tls_wolfssl/tls_wolfssl_mod.c @@ -453,7 +453,8 @@ static int ki_is_peer_verified(sip_msg_t *msg) ssl = ((struct tls_extra_data *)c->extra_data)->ssl; ssl_verify = wolfSSL_get_verify_result(ssl); - if(ssl_verify != WOLFSSL_X509_V_OK) { + // WOLFSSL_X509_V_OK / X509_V_OK + if(ssl_verify != 0) { LM_WARN("verification of presented certificate failed... return -1\n"); tcpconn_put(c); return -1;

1 0

Re: [kamailio/kamailio] tls_wolfssl: clean-up; continue to remove OpenSSL-isms (5d3c11c)
by space88man 25 Jan '24

25 Jan '24

What are the configure flags for the nightly builds? Is this using a system libwolfssl-dev or the submodule. The module expects wolfssl ~ v5.6.6-stable which is equivalent to libwolfssl42(5.6.6-1.2) libwolfssl-dev_5.6.6. For RPM based-distros I build the module both with the in-tree submodule and external package wolfssl42-5.6.6. ``` # debian does this ./configure --enable-distro --enable-pkcs11 # libwolfssl35 ma 2422 * to the user. This is set by default with 2423 * OPENSSL_COMPATIBLE_DEFAULTS. The macro 2424 * WOLFSSL_MODE_AUTO_RETRY_ATTEMPTS is used to 2425 * limit the possibility of an infinite retry loop 2426 */ 2427 SSL_MODE_RELEASE_BUFFERS = -1, /* For libwebsockets build. No current use. */ 2428 /* Errors used in wolfSSL. utilize the values from the defines in 2429 * wolfssl/openssl/x509.h, but without the WOLFSSL_ prefix. 2430 */ 2431 WOLFSSL_X509_V_OK = 0, 2432 WOLFSSL_X509_V_ERR_CERT_SIGNATURE_FAILURE = 7, 2433 WOLFSSL_X509_V_ERR_CERT_NOT_YET_VALID = 9, 2434 WOLFSSL_X509_V_ERR_CERT_HAS_EXPIRED = 10, 2435 WOLFSSL_X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD = 13, 2436 WOLFSSL_X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD = 14, 2437 WOLFSSL_X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT = 18, 2438 WOLFSSL_X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY = 20, 2439 WOLFSSL_X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE = 21, 2440 WOLFSSL_X509_V_ERR_CERT_CHAIN_TOO_LONG = 22, 2441 WOLFSSL_X509_V_ERR_CERT_REVOKED = 23, 2442 WOLFSSL_X509_V_ERR_INVALID_CA = 24, 2443 WOLFSSL_X509_V_ERR_PATH_LENGTH_EXCEEDED = 25, 2444 WOLFSSL_X509_V_ERR_CERT_REJECTED = 28, 2445 WOLFSSL_X509_V_ERR_SUBJECT_ISSUER_MISMATCH = 29, ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/5d3c11c5e0854ce74424a10a88b0cca… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/5d3c11c5e0854ce74424a10a88b0cca4453cee75/137779830(a)github.com>

2 1

git:master:aaa3b102: pkg/kamailio/deb: remove support for tls_wolfssl on bookworm/jammy
by Victor Seva 25 Jan '24

25 Jan '24

Module: kamailio Branch: master Commit: aaa3b102c62af9ac0abe1aaac12876abaa7ad351 URL: https://github.com/kamailio/kamailio/commit/aaa3b102c62af9ac0abe1aaac12876a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-25T12:23:47+01:00 pkg/kamailio/deb: remove support for tls_wolfssl on bookworm/jammy > module expects wolfssl ~ v5.6.6-stable which is equivalent to libwolfssl42(5.6.6-1.2) libwolfssl-dev_5.6.6 --- Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/debian/backports/bookworm Modified: pkg/kamailio/deb/debian/backports/jammy Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules --- Diff: https://github.com/kamailio/kamailio/commit/aaa3b102c62af9ac0abe1aaac12876a… Patch: https://github.com/kamailio/kamailio/commit/aaa3b102c62af9ac0abe1aaac12876a…

1 0

Re: [kamailio/kamailio] tls_wolfssl: clean-up; continue to remove OpenSSL-isms (5d3c11c)
by Victor Seva 25 Jan '24

25 Jan '24

Sorry but bookworm has 5.5.4-2 [libwolfssl35](https://packages.debian.org/bookworm/libwolfssl35) and jammy has 5.2.0-2 [libwolfssl32](https://packages.ubuntu.com/jammy/libwolfssl32) I will remove the support for bookworm and jammy for tls_wolfssl then -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/5d3c11c5e0854ce74424a10a88b0cca… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/5d3c11c5e0854ce74424a10a88b0cca4453cee75/137782904(a)github.com>

1 0

Re: [kamailio/kamailio] tls_wolfssl: clean-up; continue to remove OpenSSL-isms (5d3c11c)
by Victor Seva 25 Jan '24

25 Jan '24

This broke the nightly build: https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… ``` tls_wolfssl_mod.c: In function 'ki_is_peer_verified': tls_wolfssl_mod.c:456:26: error: 'WOLFSSL_X509_V_OK' undeclared (first use in this function); did you mean 'WOLFSSL_X509_V3'? 456 | if(ssl_verify != WOLFSSL_X509_V_OK) { | ^~~~~~~~~~~~~~~~~ | WOLFSSL_X509_V3 tls_wolfssl_mod.c:456:26: note: each undeclared identifier is reported only once for each function it appears in ``` And the test build failed too: https://github.com/kamailio/kamailio/actions/runs/7647318901/job/20838004797 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/5d3c11c5e0854ce74424a10a88b0cca… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/5d3c11c5e0854ce74424a10a88b0cca4453cee75/137775133(a)github.com>

1 0

git:master:5d3c11c5: tls_wolfssl: clean-up; continue to remove OpenSSL-isms
by S-P Chan 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 5d3c11c5e0854ce74424a10a88b0cca4453cee75 URL: https://github.com/kamailio/kamailio/commit/5d3c11c5e0854ce74424a10a88b0cca… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-25T06:58:39+08:00 tls_wolfssl: clean-up; continue to remove OpenSSL-isms --- Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_select.c Modified: src/modules/tls_wolfssl/tls_verify.c Modified: src/modules/tls_wolfssl/tls_verify.h Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5d3c11c5e0854ce74424a10a88b0cca… Patch: https://github.com/kamailio/kamailio/commit/5d3c11c5e0854ce74424a10a88b0cca…

1 0

git:master:099eceec: modules: readme files regenerated - ims_charging ... [skip ci]
by Kamailio Dev 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 099eceecab7af118bfa0bdfca68a8c0b30cec6f0 URL: https://github.com/kamailio/kamailio/commit/099eceecab7af118bfa0bdfca68a8c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-24T21:31:18+01:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/099eceecab7af118bfa0bdfca68a8c0… Patch: https://github.com/kamailio/kamailio/commit/099eceecab7af118bfa0bdfca68a8c0… --- diff --git a/src/modules/ims_charging/README b/src/modules/ims_charging/README index 8e61583c0c4..b37cf9ae3a4 100644 --- a/src/modules/ims_charging/README +++ b/src/modules/ims_charging/README @@ -67,6 +67,8 @@ Carlos Ruiz Diaz 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) 4.29. strip_plus_from_e164 (int) + 4.30. use_pani_from_term_invite (int) + 4.31. node_func (int) 5. Functions @@ -125,8 +127,10 @@ Carlos Ruiz Diaz 1.27. vendor_specific_chargeinfoparameter usage 1.28. vendor_specific_idparameter usage 1.29. strip_plus_from_e164parameter usage - 1.30. Ro_CCR - 1.31. Ro_set_session_id_avp + 1.30. use_pani_from_term_inviteparameter usage + 1.31. node_funcparameter usage + 1.32. Ro_CCR + 1.33. Ro_set_session_id_avp Chapter 1. Admin Guide @@ -175,6 +179,8 @@ Chapter 1. Admin Guide 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) 4.29. strip_plus_from_e164 (int) + 4.30. use_pani_from_term_invite (int) + 4.31. node_func (int) 5. Functions @@ -378,6 +384,8 @@ Chapter 1. Admin Guide 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) 4.29. strip_plus_from_e164 (int) + 4.30. use_pani_from_term_invite (int) + 4.31. node_func (int) 4.1. hash_size(int) @@ -772,6 +780,34 @@ modparam("ims_charging", "vendor_specific_id", 10) modparam("ims_charging", "strip_plus_from_e164", 1) ... +4.30. use_pani_from_term_invite (int) + + P-Access-Network-Info is normally relevant for the "orig" scenario + where it's extracted from INVITE. This setting instruct Kamailio to + include it in "term" scenario too, where it might have been added to + the INVITE based on info from a REGISTER. Normally used to start a + charging session when the user is roaming. + + Default value is 0. + + Example 1.30. use_pani_from_term_inviteparameter usage +... +modparam("ims_charging", "use_pani_from_term_invite", 1) +... + +4.31. node_func (int) + + Defines what should be sent as Node-Functionality (862) in the Diameter + Ro request. Possible values are: 0 (S-CSCF), 1 (P-CSCF), 2 (I-CSCF), 3 + (MRFC), 4 (MGCF), 5 (BFCF) or 6 (AS) + + Default value is 0 (S-CSCF). + + Example 1.31. node_funcparameter usage +... +modparam("ims_charging", "node_func", 1) +... + 5. Functions 5.1. Ro_CCR(route_name, direction, reservation_units, @@ -799,7 +835,7 @@ outgoing_trunk_id) This method is executed asynchronously. See example on how to retrieve return value. - Example 1.30. Ro_CCR + Example 1.32. Ro_CCR ... xlog("L_DBG","Sending initial CCR Request for call\n"); Ro_CCR("RO_ASYNC_TERM_REPLY", "term", 30, "1", "1"); @@ -835,7 +871,7 @@ n"); This function can be used from REQUEST_ROUTE or ONREPLY_ROUTE. - Example 1.31. Ro_set_session_id_avp + Example 1.33. 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] ims_charging: Add option to get and use P-Access-Network-Info for terminating scenario (PR #3726)
by Morten Tryfoss 24 Jan '24

24 Jan '24

Add option to get and use P-Access-Network-Info for the terminating scenario, for use of billing in roaming cases where the PANI header is already known. Currently PANI is only used for the originating scenario. Fixed partly implemented config option to specific role of diameter client. It was currently hardcoded to S-CSCF.  #### 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) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3726 -- Commit Summary -- * ims_charging: Add option to get and use P-Access-Network-Info for terminating scenario -- File Changes -- M src/modules/ims_charging/Ro_data.c (2) M src/modules/ims_charging/config.h (2) M src/modules/ims_charging/doc/ims_charging_admin.xml (41) M src/modules/ims_charging/ims_charging_mod.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3726.patch https://github.com/kamailio/kamailio/pull/3726.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3726 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3726(a)github.com>

1 1

git:master:76cd7979: ims_charging: Add option to get and use P-Access-Network-Info for terminating scenario (#3726)
by GitHub 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 76cd7979aae176b3fde3b3d73975629b06cd509c URL: https://github.com/kamailio/kamailio/commit/76cd7979aae176b3fde3b3d73975629… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: GitHub <noreply(a)github.com> Date: 2024-01-24T21:16:08+01:00 ims_charging: Add option to get and use P-Access-Network-Info for terminating scenario (#3726) Add option to configure node functionality for Ro requests --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/config.h Modified: src/modules/ims_charging/doc/ims_charging_admin.xml Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/76cd7979aae176b3fde3b3d73975629… Patch: https://github.com/kamailio/kamailio/commit/76cd7979aae176b3fde3b3d73975629…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev