sr-dev April 2024

sr-dev@lists.kamailio.org

11 participants
230 discussions

[kamailio/kamailio] app_python3: make compatible with TLS refactoring (Issue #3832)

by space88man

### Description app_python3 loads libssl and also calls `pthread_setspecific()`. This makes it incompatible with tls_thread_mode refactoring. Reported by user @igorolhovskiy on the mailing list: https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… ### Troubleshooting #### Reproduction #### Debugging Data #### Log Messages #### SIP Traffic ### Possible Solutions - make it compatible with `tls_threads_mode = 1` ### Additional Information -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3832 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3832(a)github.com>

36 minutes

[kamailio/kamailio] uac: add reload_delta parameter (PR #3829)

by Tyler Moore

#### 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 Add support for setting a different RPC reload interval than the reg_gc_interval parameter. This allows the cleanup timer to match the user's re-transmission timeout without constraining RPC reload times to a large interval. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3829 -- Commit Summary -- * uac: add reload_delta parameter -- File Changes -- M src/modules/uac/doc/uac.xml (9) M src/modules/uac/doc/uac_admin.xml (37) M src/modules/uac/uac.c (5) M src/modules/uac/uac_reg.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3829.patch https://github.com/kamailio/kamailio/pull/3829.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3829 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3829(a)github.com>

1 hour, 44 minutes

[kamailio/kamailio] Uint fixes (PR #3828)

by Tyler Moore

#### 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) - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Adding support for converting unsigned integers from database tables into kamailio pseudo variables usable in the routing config. This is quite useful when pulling `int unsigned` fields from a database, in modules that support "extra fields" in their module parameters. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3828 -- Commit Summary -- * permissions: fixup uint support in address table reload * htable: add uint support when packing an htable * lib/srdb1: add uint support for db->pv conversions -- File Changes -- M src/lib/srdb1/db_ut.c (4) M src/modules/htable/ht_db.c (6) M src/modules/permissions/address.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3828.patch https://github.com/kamailio/kamailio/pull/3828.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3828 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3828(a)github.com>

1 hour, 45 minutes

[kamailio/kamailio] Mem leak in smsops which leads to the udp receiver process leak memory continuously (Issue #3833)

by paresh-panda

Hi, I am using Kamailio 5.8.1 ( ubuntu 22.04 Jammy 64 Bit),. Below are the observations. I am running a load of 500 3GPP IMS SMS which kamailio decodes and sends to another application over Rabbit MQ (Kazoo Module). **-m 512 -M 256** , using 512 MB Shared memory and 256MB Package Memory. When the load for 20 mins the available Memory drops from **80% to 25%** And I see below error logs > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:324]: qm_find_free(): qm_find_free(0x7ff912e21010, 192); Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:463]: qm_malloc(): qm_malloc(0x7ff912e21010, 192) called from smsops: smsops_impl.c: decode_3gpp_sms(813), module: smsops; Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:324]: qm_find_free(): qm_find_free(0x7ff912e21010, 192); Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:463]: qm_malloc(): qm_malloc(0x7ff912e21010, 192) called from smsops: smsops_impl.c: decode_3gpp_sms(813), module: smsops; Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/pvapi.c:1136]: pv_parse_format(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/sr_module.c:1318]: fix_param(): bad PVE format: "PRD-IR92/11 term-Motorola/XT2205-1-T2STS33.105-51-11-1-2-2 device-type/smart-phone" > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mod_fix.c:601]: fixup_spve_null(): Cannot convert function parameter 1 to spve > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): runtime fixup failed for jansson_set param 3 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:539 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/sr_module.c:1208]: fix_param(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mod_fix.c:601]: fixup_spve_null(): Cannot convert function parameter 1 to spve > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): runtime fixup failed for jansson_set param 3 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:540 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/sr_module.c:1208]: fix_param(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mod_fix.c:601]: fixup_spve_null(): Cannot convert function parameter 1 to spve > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): runtime fixup failed for jansson_set param 3 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:541 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:542 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:543 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:555 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:556 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1171]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:559 > I am attaching the configuration for reference. Help on this is much appreciated [configfiles.tar.gz](https://github.com/kamailio/kamailio/files/15148792/con… , I am looking into this issue for quite a long time. Thank you! Regards Paresh -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3833 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3833(a)github.com>

2 hours, 7 minutes

[kamailio/kamailio] usrloc: delete location_attrs in db_only mode on delete_urecord (PR #3827)

by Rick Barenthin

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When calling delete_urecord in DB_ONLY mode the location_attrs are not deleted. This fix makes sure to delete location_attrs when calling db_delete_urecord is called. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3827 -- Commit Summary -- * usrloc: delete location_attrs in db_only mode on delete_urecord -- File Changes -- M src/modules/usrloc/ucontact.c (36) M src/modules/usrloc/urecord.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3827.patch https://github.com/kamailio/kamailio/pull/3827.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3827 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3827(a)github.com>

2 hours, 36 minutes

[kamailio/kamailio] ims_registrar_scscf: fix memleaks, minor refactors (PR #3787)

by Alexander Couzens

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description A couple small changes to the ims_registrar_scscf which prevents kamailio from crashing on my system. I would love to have more testing because I only did tests in my single user IMS setup. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3787 -- Commit Summary -- * ims_registrar_scscf: fix uninitialized arguments in save() * ims_registrar_scscf: refactor save_fixup4 * ims_registrar_scscf: fix typo in function name uint_fixup * ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter -- File Changes -- M src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c (55) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3787.patch https://github.com/kamailio/kamailio/pull/3787.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3787 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3787(a)github.com>

2 hours, 52 minutes

git:master:c3e6c1ed: ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter

by Henning Westerholt

Module: kamailio Branch: master Commit: c3e6c1edc7531406208efe2965243e6e81506127 URL: https://github.com/kamailio/kamailio/commit/c3e6c1edc7531406208efe2965243e6… Author: Alexander Couzens <lynxis(a)fe80.eu> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-29T19:27:15+02:00 ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter The free_uint_fixup() freed the wrong parameter in the past. --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c3e6c1edc7531406208efe2965243e6… Patch: https://github.com/kamailio/kamailio/commit/c3e6c1edc7531406208efe2965243e6… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index 80535d77b5a..714ae571518 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -814,7 +814,7 @@ static int uint_fixup(void **param, int param_no) static int free_uint_fixup(void **param, int param_no) { - if(*param && param_no == 2) { + if(*param && param_no == 4) { pkg_free(*param); *param = 0; }

2 hours, 52 minutes

git:master:6f908f05: ims_registrar_scscf: fix typo in function name uint_fixup

by Henning Westerholt

Module: kamailio Branch: master Commit: 6f908f05d4691abcb1b3a745048d3cc2a9996676 URL: https://github.com/kamailio/kamailio/commit/6f908f05d4691abcb1b3a745048d3cc… Author: Alexander Couzens <lynxis(a)fe80.eu> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-29T19:27:15+02:00 ims_registrar_scscf: fix typo in function name uint_fixup --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6f908f05d4691abcb1b3a745048d3cc… Patch: https://github.com/kamailio/kamailio/commit/6f908f05d4691abcb1b3a745048d3cc… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index 854ed2d484f..80535d77b5a 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -786,7 +786,7 @@ static int assign_save_fixup3_async(void **param, int param_no) return 0; } -static int unit_fixup(void **param, int param_no) +static int uint_fixup(void **param, int param_no) { str s; unsigned int *num; @@ -826,7 +826,7 @@ static int save_fixup4(void **param, int param_no) if(param_no < 4) { return assign_save_fixup3_async(param, param_no); } else if(param_no == 4) { - return unit_fixup(param, param_no); + return uint_fixup(param, param_no); } return 0;

2 hours, 52 minutes

git:master:82a6d7ea: ims_registrar_scscf: refactor save_fixup4

by Henning Westerholt

Module: kamailio Branch: master Commit: 82a6d7ea6edbaca60879a38c5e74e40920e89342 URL: https://github.com/kamailio/kamailio/commit/82a6d7ea6edbaca60879a38c5e74e40… Author: Alexander Couzens <lynxis(a)fe80.eu> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-29T19:27:15+02:00 ims_registrar_scscf: refactor save_fixup4 Rename function to match argument number. Use assign_save_fixup3_async instead of the code copy --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82a6d7ea6edbaca60879a38c5e74e40… Patch: https://github.com/kamailio/kamailio/commit/82a6d7ea6edbaca60879a38c5e74e40… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index d17b5e38823..854ed2d484f 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -145,7 +145,7 @@ static int w_lookup_path_to_contact(struct sip_msg *_m, char *contact_uri); static int domain_fixup(void **param, int param_no); static int assign_save_fixup3_async(void **param, int param_no); static int free_uint_fixup(void **param, int param_no); -static int save_fixup3(void **param, int param_no); +static int save_fixup4(void **param, int param_no); static int unreg_fixup(void **param, int param_no); static int fetchc_fixup(void **param, int param_no); /*! \brief Functions */ @@ -237,7 +237,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE | ONREPLY_ROUTE}, {"save", (cmd_function)w_save3, 3, assign_save_fixup3_async, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, - {"save", (cmd_function)w_save4, 4, save_fixup3, free_uint_fixup, + {"save", (cmd_function)w_save4, 4, save_fixup4, free_uint_fixup, REQUEST_ROUTE | ONREPLY_ROUTE}, {"lookup", (cmd_function)w_lookup, 1, domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, @@ -821,27 +821,10 @@ static int free_uint_fixup(void **param, int param_no) return 0; } -static int save_fixup3(void **param, int param_no) +static int save_fixup4(void **param, int param_no) { - if(strlen((char *)*param) <= 0) { - LM_ERR("empty parameter %d not allowed\n", param_no); - return -1; - } - - if(param_no == 1) { //route name - static or dynamic string (config vars) - if(fixup_spve_null(param, param_no) < 0) - return -1; - return 0; - } else if(param_no == 2) { - udomain_t *d; - - if(ul.register_udomain((char *)*param, &d) < 0) { - LM_ERR("Error doing fixup on save"); - return -1; - } - *param = (void *)d; - } else if(param_no == 3) { - return 0; + if(param_no < 4) { + return assign_save_fixup3_async(param, param_no); } else if(param_no == 4) { return unit_fixup(param, param_no); }

2 hours, 52 minutes

git:master:20a75004: ims_registrar_scscf: fix uninitialized arguments in save()

by Henning Westerholt

Module: kamailio Branch: master Commit: 20a75004d53a06da0f22b11804a4d83496ad8919 URL: https://github.com/kamailio/kamailio/commit/20a75004d53a06da0f22b11804a4d83… Author: Alexander Couzens <lynxis(a)fe80.eu> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-29T19:27:15+02:00 ims_registrar_scscf: fix uninitialized arguments in save() The script "save" command can be used with different arguments: 2, 3 and 4. But internally for all save() calls the exact same function is use, w_save(). When calling save("PRE_REG_SAR_REPLY","location"); as given by the examples, kamailio will call w_save(). Because the command code will cast the function pointer, the w_save() function is called with 2 uninitialized arguments *mode, *c_flags. mode is unused, seems a legacy argument. c_flags is referenced resulting in a crash if not null. Use separate wrapper functions to handle different argument number. Fixes: a627c9a04a74 ("ims_registrar_scscf: Extend save() with optional flag") --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/20a75004d53a06da0f22b11804a4d83… Patch: https://github.com/kamailio/kamailio/commit/20a75004d53a06da0f22b11804a4d83… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index 07403a2b1e6..d17b5e38823 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -131,7 +131,9 @@ struct _pv_req_data _pv_treq; static int mod_init(void); static int child_init(int); static void mod_destroy(void); -static int w_save( +static int w_save2(struct sip_msg *_m, char *_route, char *_d); +static int w_save3(struct sip_msg *_m, char *_route, char *_d, char *mode); +static int w_save4( struct sip_msg *_m, char *_route, char *_d, char *mode, char *_cflags); static int w_assign_server_unreg( struct sip_msg *_m, char *_route, char *_d, char *_direction); @@ -231,11 +233,11 @@ static pv_export_t mod_pvs[] = { * Exported functions */ static cmd_export_t cmds[] = { - {"save", (cmd_function)w_save, 2, assign_save_fixup3_async, 0, + {"save", (cmd_function)w_save2, 2, assign_save_fixup3_async, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, - {"save", (cmd_function)w_save, 3, assign_save_fixup3_async, 0, + {"save", (cmd_function)w_save3, 3, assign_save_fixup3_async, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, - {"save", (cmd_function)w_save, 4, save_fixup3, free_uint_fixup, + {"save", (cmd_function)w_save4, 4, save_fixup3, free_uint_fixup, REQUEST_ROUTE | ONREPLY_ROUTE}, {"lookup", (cmd_function)w_lookup, 1, domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, @@ -677,9 +679,21 @@ AAAMessage *callback_cdp_request(AAAMessage *request, void *param) /*! \brief * Wrapper to save(location) */ -static int w_save( +static int w_save2(struct sip_msg *_m, char *_route, char *_d) +{ + return save(_m, _d, _route, 0); +} + +static int w_save3(struct sip_msg *_m, char *_route, char *_d, char *_mode) +{ + /* mode is unsed. Docs says legacy parameter? Maybe to be compatible with registrar/save? */ + return save(_m, _d, _route, 0); +} + +static int w_save4( struct sip_msg *_m, char *_route, char *_d, char *mode, char *_cflags) { + /* mode is unsed. Docs says legacy parameter? Maybe to be compatible with registrar/save? */ if(_cflags) { return save(_m, _d, _route, ((int)(*_cflags))); }

2 hours, 52 minutes

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024