Module: kamailio
Branch: 5.8
Commit: 9527d0bfb52127a2ec6b9d8aaa4794fdcf133f67
URL: https://github.com/kamailio/kamailio/commit/9527d0bfb52127a2ec6b9d8aaa4794f…
Author: Xenofon Karamanos <xk(a)gilawa.com>
Committer: Xenofon Karamanos <xk(a)gilawa.com>
Date: 2026-03-31T16:53:01Z
ims_ocs: Fix typos in comments
(cherry picked from commit 0eb01e0515c84314b0b7e334b348b331afeaf233)
---
Modified: src/modules/ims_ocs/ocs_avp_helper.c
---
Diff: https://github.com/kamailio/kamailio/commit/9527d0bfb52127a2ec6b9d8aaa4794f…
Patch: https://github.com/kamailio/kamailio/commit/9527d0bfb52127a2ec6b9d8aaa4794f…
---
diff --git a/src/modules/ims_ocs/ocs_avp_helper.c b/src/modules/ims_ocs/ocs_avp_helper.c
index fbefea83d8f..5f88f76c21a 100644
--- a/src/modules/ims_ocs/ocs_avp_helper.c
+++ b/src/modules/ims_ocs/ocs_avp_helper.c
@@ -27,9 +27,9 @@
/**
* Returns the value of a certain AVP from a Diameter message.
- * @param m - Diameter message to look into
+ * @param msg - Diameter message to look into
* @param avp_code - the code to search for
- * @param vendorid - the value of the vendor id to look for or 0 if none
+ * @param vendor_id - the value of the vendor id to look for or 0 if none
* @param func - the name of the calling function, for debugging purposes
* @returns the str with the payload on success or an empty string on failure
*/
Module: kamailio
Branch: master
Commit: 9e1d97dd3f0b4515195554b432660cc3f3d17821
URL: https://github.com/kamailio/kamailio/commit/9e1d97dd3f0b4515195554b432660cc…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2026-03-31T16:46:10+02:00
modules: readme files regenerated - tls_wolfssl ... [skip ci]
---
Modified: src/modules/tls_wolfssl/README
---
Diff: https://github.com/kamailio/kamailio/commit/9e1d97dd3f0b4515195554b432660cc…
Patch: https://github.com/kamailio/kamailio/commit/9e1d97dd3f0b4515195554b432660cc…
---
diff --git a/src/modules/tls_wolfssl/README b/src/modules/tls_wolfssl/README
index 88bd5196a4d..299085d591e 100644
--- a/src/modules/tls_wolfssl/README
+++ b/src/modules/tls_wolfssl/README
@@ -38,9 +38,9 @@ Chapter 1. Admin Guide
1. Overview
This module implements the TLS transport for Kamailio using the wolfSSL
- library (https://www.wolfssl.com). To enable the Kamailio TLS support
- this module must be loaded and enable_tls=yes core setting must be
- added to the Kamailio config file.
+ library (https://www.wolfssl.com). To enable it, the module must be
+ configured and loaded and the enable_tls=yes core setting must set.
+ This module is mutually exclusive with the tls module.
Is is highly recommended to run this module with MT-mode
(tcp_main_threads = 1).
@@ -48,7 +48,7 @@ Chapter 1. Admin Guide
This module is derived from the tls module and adapted to wolfSSL.
Credit goes to the authors of the tls module.
- This module build from wolfSSl 5.2.0 onwards. There is a git submodule
+ This module builds from wolfSSl 5.2.0 onwards. There is a git submodule
that contains a recent version of wolfSSL for easier building.
This user is referred to the documentation of the tls module for
@@ -71,7 +71,7 @@ Chapter 1. Admin Guide
3. Important Notes
The wolfSSL TLS module is intended to be compiled with a recent version
- of wolfSSL (5.2.0+).
+ of wolfSSL - 5.8.4+ is recommended.
Kamailio shared memory allocators, used in MP-mode(tcp_main_threads =
0), support 16-byte alignment - it is possible to use this module with
@@ -101,12 +101,12 @@ ble-pkcs11
5. Support for externalized keys (PKCS#11)
- The module now supports loading a key from PKCS#11. MT-mode is required
- for this functionality. The key naming convention follows a PKCS#11-URI
- style:
+ The module now supports loading keys from PKCS#11 and up to 4 tokens
+ are supported. This feature is available in both MT- and MP- modes. The
+ key naming convention for keys follows a PKCS#11-URI-like style:
...
-# in tls.cfg these pseudo-file names to refer to PKCS#11 keys
-# MUST run in MT-mode
+# in tls.cfg these pseudo-file names to refer to PKCS#11 keys; this format
+# is not conformant to RFC 7512
private_key = /uri:pkcs11:module=/usr/lib64/libsoftokn3.so;token=MyToken;object=
MyPrivateKey;pin=12345678
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [ ] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
1. First copy the value data and then free the avp (there was an extra free avp)
2. Add memory check for shm_malloc
3. Fix comments to match parameters
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4675?email_source=notifications&a…
-- Commit Summary --
* ims_ocs: Free after copying the values
* ims_ocs: Add memory check
* ims_ocs: Fix typos in comments
-- File Changes --
M src/modules/ims_ocs/ims_ocs_mod.c (8)
M src/modules/ims_ocs/ocs_avp_helper.c (7)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4675.patch?email_source=notificat…
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/4675
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/4675(a)github.com>
Module: kamailio
Branch: master
Commit: 0eb01e0515c84314b0b7e334b348b331afeaf233
URL: https://github.com/kamailio/kamailio/commit/0eb01e0515c84314b0b7e334b348b33…
Author: Xenofon Karamanos <xk(a)gilawa.com>
Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Date: 2026-03-31T14:22:17+02:00
ims_ocs: Fix typos in comments
---
Modified: src/modules/ims_ocs/ocs_avp_helper.c
---
Diff: https://github.com/kamailio/kamailio/commit/0eb01e0515c84314b0b7e334b348b33…
Patch: https://github.com/kamailio/kamailio/commit/0eb01e0515c84314b0b7e334b348b33…
---
diff --git a/src/modules/ims_ocs/ocs_avp_helper.c b/src/modules/ims_ocs/ocs_avp_helper.c
index 378b2a209bc..18b143a60ad 100644
--- a/src/modules/ims_ocs/ocs_avp_helper.c
+++ b/src/modules/ims_ocs/ocs_avp_helper.c
@@ -29,9 +29,9 @@
/**
* Returns the value of a certain AVP from a Diameter message.
- * @param m - Diameter message to look into
+ * @param msg - Diameter message to look into
* @param avp_code - the code to search for
- * @param vendorid - the value of the vendor id to look for or 0 if none
+ * @param vendor_id - the value of the vendor id to look for or 0 if none
* @param func - the name of the calling function, for debugging purposes
* @returns the str with the payload on success or an empty string on failure
*/