- sr-dev - kamailio.org

[kamailio/kamailio] tm: memory leak in case dropping messages in local-request event route (PR #3403)
by Simon Darienko 01 May '24

01 May '24

#### 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 I faced an issue with memory leak in case drop NOTIFY messages in the "local-request" event route in `mem_copy_subs` and `build_uac_req` analysis of mem leak: kamcmd corex.shm_summary <code>... Mar 23 12:00:28 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 11 size= 7520 bytes from presence: hash.c: mem_copy_subs(141)<br> Mar 23 12:00:28 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 23 size= 22536 bytes from tm: t_msgbuilder.c: build_uac_req(1618) ...</code> a lot of dropped messages in local-request event route <code>... Mar 23 12:01:09 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 83 size= 51256 bytes from presence: hash.c: mem_copy_subs(141) Mar 23 12:01:09 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 98 size= 116864 bytes from tm: t_msgbuilder.c: build_uac_req(1618) ...</code> no messages, no activities <code>... Mar 23 12:02:34 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 83 size= 51256 bytes from presence: hash.c: mem_copy_subs(141) Mar 23 12:02:34 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 96 size= 115432 bytes from tm: t_msgbuilder.c: build_uac_req(1618) ...</code> In the code, we have a comment like "never free cbp here because if t_uac_prepare fails, cbp is not freed and thus caller has no chance to discover if it is freed or not", but we'll free the cbp in two cases: 1. in case of error, but we have if (ret == E_DROP) then ret = 0; (so, no error result) 2. in case call insert_tmcb for cbp, but we don't do it for E_DROP You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3403 -- Commit Summary -- * tm: memory leak in case dropping messages in local-request event route -- File Changes -- M src/modules/tm/uac.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3403.patch https://github.com/kamailio/kamailio/pull/3403.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3403 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3403(a)github.com>

4 9

git:master:3f774f37: modules: readme files regenerated - sipcapture ... [skip ci]
by Kamailio Dev 30 Apr '24

30 Apr '24

Module: kamailio Branch: master Commit: 3f774f37a7ce6e102e1691707b2ba88cd4edfee1 URL: https://github.com/kamailio/kamailio/commit/3f774f37a7ce6e102e1691707b2ba88… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-30T16:46:09+02:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/3f774f37a7ce6e102e1691707b2ba88… Patch: https://github.com/kamailio/kamailio/commit/3f774f37a7ce6e102e1691707b2ba88… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index dda17d994c6..c9bb2daca98 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -218,7 +218,7 @@ Chapter 1. Admin Guide Database URL. - Default value is "". + Default value is ��DEFAULT_DB_URL��. Example 1.1. Set db_url parameter ...

1 0

[kamailio/kamailio] sipcapture: docs - fix default value for parameter (PR #3836)
by Jannik 30 Apr '24

30 Apr '24

#### 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) _== Fix of documentation of a long standing error_ - [ ] 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 The sipcapture module actually uses the DEFAULT_DB_URL instead of "no database at all". When you do not set the parameter, the module will try to connect to the default db. [See source code of parameter](https://github.com/volkland/kamailio/blob/74361cdeacee8864216d30…. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3836 -- Commit Summary -- * sipcapture: docs - fix default value for parameter -- File Changes -- M src/modules/sipcapture/doc/sipcapture_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3836.patch https://github.com/kamailio/kamailio/pull/3836.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3836 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3836(a)github.com>

2 2

git:master:265c9482: sipcapture: docs - fix default value for parameter
by Henning Westerholt 30 Apr '24

30 Apr '24

Module: kamailio Branch: master Commit: 265c948286f2df5136179c95fbb1d7f1255e4c71 URL: https://github.com/kamailio/kamailio/commit/265c948286f2df5136179c95fbb1d7f… Author: Jannik <40364587+volkland(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-30T16:38:40+02:00 sipcapture: docs - fix default value for parameter --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/265c948286f2df5136179c95fbb1d7f… Patch: https://github.com/kamailio/kamailio/commit/265c948286f2df5136179c95fbb1d7f… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 8bca159432f..6a428133866 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -89,7 +89,7 @@ </para> <para> <emphasis> - Default value is "". + Default value is <quote>DEFAULT_DB_URL</quote>. </emphasis> </para> <example>

1 0

git:master:60d2ab64: ims_ipsec_pcscf: cascade on options to get the uri for fill_contact()
by Daniel-Constantin Mierla 30 Apr '24

30 Apr '24

Module: kamailio Branch: master Commit: 60d2ab6464657abf38136a771c297c6f5536e27a URL: https://github.com/kamailio/kamailio/commit/60d2ab6464657abf38136a771c297c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-30T10:19:35+02:00 ims_ipsec_pcscf: cascade on options to get the uri for fill_contact() --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/60d2ab6464657abf38136a771c297c6… Patch: https://github.com/kamailio/kamailio/commit/60d2ab6464657abf38136a771c297c6… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index b5c009dfcf8..05079834252 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -187,7 +187,7 @@ static int fill_contact( if(m->first_line.type == SIP_REQUEST) { char *alias_start; struct sip_uri uri; - str suri; + str suri = STR_NULL; memset(&uri, 0, sizeof(struct sip_uri)); @@ -196,17 +196,20 @@ static int fill_contact( 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) { + } + if((sflags & IPSEC_DSTADDR_SEARCH) && suri.s == NULL + && 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); - } else if((sflags & IPSEC_RURIADDR_SEARCH) && m->new_uri.s != NULL - && m->new_uri.len > 0) { + } + if((sflags & IPSEC_RURIADDR_SEARCH) && suri.s == NULL + && m->new_uri.s != NULL && m->new_uri.len > 0) { suri = m->new_uri; LM_DBG("using new r-uri for contact filling: %.*s\n", suri.len, suri.s); - } else { + } + if(suri.s == NULL) { suri = m->first_line.u.request.uri; LM_DBG("using original uri for contact filling: %.*s\n", suri.len, suri.s);

1 0

[kamailio/kamailio] registrar: adding contact and UA to xavp_cfg (Issue #3753)
by nirvanr-nextiva 30 Apr '24

30 Apr '24

### Description We are using Kamailio as a 'mid-registrar', and saving the location record (i.e calling registrar.save()) in the reply-route depending on received status code from other registrar. We noticed the saved location record had the contact URI (incl. instance id) and UA from response message; instead we would like to use the contact and UA from the original request. This feature change is similar to what was added for `tcpconn_id` in PR: https://github.com/kamailio/kamailio/pull/3430. i.e. we would set the request's contact URI and UA in `xavp_cfg` variable. Then `registrar.save.c` would use the contact and UA from `xavp_cfg`. Thanks. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3753 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3753(a)github.com>

2 3

[kamailio/kamailio] app_python3: make compatible with TLS refactoring (Issue #3832)
by space88man 29 Apr '24

29 Apr '24

### 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>

2 3

[kamailio/kamailio] ims_registrar_scscf: fix memleaks, minor refactors (PR #3787)
by Alexander Couzens 29 Apr '24

29 Apr '24

#### 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>

4 5

git:master:c3e6c1ed: ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter
by Henning Westerholt 29 Apr '24

29 Apr '24

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; }

1 0

git:master:6f908f05: ims_registrar_scscf: fix typo in function name uint_fixup
by Henning Westerholt 29 Apr '24

29 Apr '24

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;

1 0

git:master:82a6d7ea: ims_registrar_scscf: refactor save_fixup4
by Henning Westerholt 29 Apr '24

29 Apr '24

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); }

1 0

git:master:20a75004: ims_registrar_scscf: fix uninitialized arguments in save()
by Henning Westerholt 29 Apr '24

29 Apr '24

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))); }

1 0

git:5.8:cafe437d: tls: clear thread-local variables up to tls_pthreads_key_mark
by S-P Chan 29 Apr '24

29 Apr '24

Module: kamailio Branch: 5.8 Commit: cafe437dcb637b0e571a2d2ffd04d911584404d9 URL: https://github.com/kamailio/kamailio/commit/cafe437dcb637b0e571a2d2ffd04d91… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-04-29T21:27:38+08:00 tls: clear thread-local variables up to tls_pthreads_key_mark - other libraries may set thread-locals via pthread_setspecific - assume that tls_pthreads_key_mark demarcates libssl's values - only clean thread-local values up to tls_pthreads_key_mark Currently only used by app_python[s] (cherry picked from commit fe6f4fcde2fa06a3c00479cef169c27dc32ae490) --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/cafe437dcb637b0e571a2d2ffd04d91… Patch: https://github.com/kamailio/kamailio/commit/cafe437dcb637b0e571a2d2ffd04d91… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 83b86d99d58..baa1a7c76d1 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -343,10 +343,11 @@ static tls_domains_cfg_t* tls_use_modparams(void) * is < 10 * */ +static int tls_pthreads_key_mark; static void fork_child(void) { - int k = 0; - for(k = 0; k < 16; k++) { + int k; + for(k = 0; k < tls_pthreads_key_mark; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); } @@ -356,6 +357,8 @@ static int mod_init(void) { int method; int verify_client; + unsigned char rand_buf[32]; + int k; if(tls_disable) { LM_WARN("tls support is disabled " @@ -464,6 +467,23 @@ static int mod_init(void) if(ksr_tls_threads_mode == 2) { pthread_atfork(NULL, NULL, &fork_child); } + +#if OPENSSL_VERSION_NUMBER >= 0x010101000L + /* + * force creation of all thread-locals now so that other libraries + * that use pthread_key_create(), e.g. python, + * will have larger key values + */ + if(ksr_tls_threads_mode > 0) { + ERR_clear_error(); + RAND_bytes(rand_buf, sizeof(rand_buf)); + for(k = 0; k < 32; k++) { + if(pthread_getspecific(k)) + tls_pthreads_key_mark = k + 1; + } + LM_WARN("set maximum pthreads key to %d\n", tls_pthreads_key_mark); + } +#endif return 0; error: tls_h_mod_destroy_f(); @@ -500,6 +520,7 @@ static int mod_child_hook(int *rank, void *dummy) if(tls_fix_domains_cfg(*tls_domains_cfg, &mod_params, &mod_params) < 0) return -1; } + return 0; } @@ -509,17 +530,26 @@ static OSSL_LIB_CTX *new_ctx; #endif static int mod_child(int rank) { + int k; + if(tls_disable || (tls_domains_cfg == 0)) return 0; /* - * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in thread executor - * to avoid init of libssl in thread#1: ksr_tls_threads_mode = 1 - */ + * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in thread executor + * to avoid init of libssl in thread#1: ksr_tls_threads_mode = 1 + */ if(rank == PROC_INIT) { return run_thread4PP((_thread_proto4PP)mod_child_hook, &rank, NULL); } + if(ksr_tls_threads_mode == 1 && rank && rank != PROC_INIT + && rank != PROC_POSTCHILDINIT) { + for(k = 0; k < tls_pthreads_key_mark; k++) + pthread_setspecific(k, 0x0); + LM_WARN("clean-up of thread-locals key < %d\n", tls_pthreads_key_mark); + } + #ifdef KSR_SSL_COMMON /* * after the child is fork()ed we go through the TLS domains diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 58ddc853acd..7bbcf3a628c 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -21,10 +21,10 @@ #define _TLS_RAND_H_ #include <openssl/ssl.h> +#include <openssl/rand.h> #if OPENSSL_VERSION_NUMBER >= 0x10100000L \ && OPENSSL_VERSION_NUMBER < 0x030000000L -#include <openssl/rand.h> const RAND_METHOD *RAND_ksr_krand_method(void); const RAND_METHOD *RAND_ksr_fastrand_method(void);

1 0

git:master:fe6f4fcd: tls: clear thread-local variables up to tls_pthreads_key_mark
by S-P Chan 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: fe6f4fcde2fa06a3c00479cef169c27dc32ae490 URL: https://github.com/kamailio/kamailio/commit/fe6f4fcde2fa06a3c00479cef169c27… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-04-29T21:20:20+08:00 tls: clear thread-local variables up to tls_pthreads_key_mark - other libraries may set thread-locals via pthread_setspecific - assume that tls_pthreads_key_mark demarcates libssl's values - only clean thread-local values up to tls_pthreads_key_mark Currently only used by app_python[s] --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/fe6f4fcde2fa06a3c00479cef169c27… Patch: https://github.com/kamailio/kamailio/commit/fe6f4fcde2fa06a3c00479cef169c27… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 83b86d99d58..baa1a7c76d1 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -343,10 +343,11 @@ static tls_domains_cfg_t* tls_use_modparams(void) * is < 10 * */ +static int tls_pthreads_key_mark; static void fork_child(void) { - int k = 0; - for(k = 0; k < 16; k++) { + int k; + for(k = 0; k < tls_pthreads_key_mark; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); } @@ -356,6 +357,8 @@ static int mod_init(void) { int method; int verify_client; + unsigned char rand_buf[32]; + int k; if(tls_disable) { LM_WARN("tls support is disabled " @@ -464,6 +467,23 @@ static int mod_init(void) if(ksr_tls_threads_mode == 2) { pthread_atfork(NULL, NULL, &fork_child); } + +#if OPENSSL_VERSION_NUMBER >= 0x010101000L + /* + * force creation of all thread-locals now so that other libraries + * that use pthread_key_create(), e.g. python, + * will have larger key values + */ + if(ksr_tls_threads_mode > 0) { + ERR_clear_error(); + RAND_bytes(rand_buf, sizeof(rand_buf)); + for(k = 0; k < 32; k++) { + if(pthread_getspecific(k)) + tls_pthreads_key_mark = k + 1; + } + LM_WARN("set maximum pthreads key to %d\n", tls_pthreads_key_mark); + } +#endif return 0; error: tls_h_mod_destroy_f(); @@ -500,6 +520,7 @@ static int mod_child_hook(int *rank, void *dummy) if(tls_fix_domains_cfg(*tls_domains_cfg, &mod_params, &mod_params) < 0) return -1; } + return 0; } @@ -509,17 +530,26 @@ static OSSL_LIB_CTX *new_ctx; #endif static int mod_child(int rank) { + int k; + if(tls_disable || (tls_domains_cfg == 0)) return 0; /* - * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in thread executor - * to avoid init of libssl in thread#1: ksr_tls_threads_mode = 1 - */ + * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in thread executor + * to avoid init of libssl in thread#1: ksr_tls_threads_mode = 1 + */ if(rank == PROC_INIT) { return run_thread4PP((_thread_proto4PP)mod_child_hook, &rank, NULL); } + if(ksr_tls_threads_mode == 1 && rank && rank != PROC_INIT + && rank != PROC_POSTCHILDINIT) { + for(k = 0; k < tls_pthreads_key_mark; k++) + pthread_setspecific(k, 0x0); + LM_WARN("clean-up of thread-locals key < %d\n", tls_pthreads_key_mark); + } + #ifdef KSR_SSL_COMMON /* * after the child is fork()ed we go through the TLS domains diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 58ddc853acd..7bbcf3a628c 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -21,10 +21,10 @@ #define _TLS_RAND_H_ #include <openssl/ssl.h> +#include <openssl/rand.h> #if OPENSSL_VERSION_NUMBER >= 0x10100000L \ && OPENSSL_VERSION_NUMBER < 0x030000000L -#include <openssl/rand.h> const RAND_METHOD *RAND_ksr_krand_method(void); const RAND_METHOD *RAND_ksr_fastrand_method(void);

1 0

git:master:27351e3f: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: 27351e3f9f551a86ffecbc1e6aa269a2946d55d1 URL: https://github.com/kamailio/kamailio/commit/27351e3f9f551a86ffecbc1e6aa269a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-29T10:16:08+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/27351e3f9f551a86ffecbc1e6aa269a… Patch: https://github.com/kamailio/kamailio/commit/27351e3f9f551a86ffecbc1e6aa269a… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index 8dd070ffe7d..bce99b791da 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -308,7 +308,7 @@ ipsec_create("location", "1"); then this must be name of the table which stores the contacts. flags - bitwise flag: + 0x01 (1) - set force socket for request messages. Useful for - ipsec and TCP. + ipsec and TCP/TLS. + 0x02 (2) - reverse search for a contact in the memory. Useful when contact alias is disabled. + 0x04 (4) - use destination URI for IPSec tunnel search. Useful @@ -317,12 +317,13 @@ ipsec_create("location", "1"); + 0x10 (16) - do not look for alias parameter to set received details. + 0x20 (32) - do not reset the destination URI. - + 0x40 (64) - use user equipment client port as target for TCP - requests. + + 0x40 (64) - use user equipment client port as target for + TCP/TLS requests (try to reuse the UE client connection). + 0x80 (128) - set transport parameter in the new dst uri for - TCP requests. + TCP/TLS requests. + 0x100 (256) - use Via attributes (port and protocol) for - routing UDP reply. + routing UDP reply, and protocol from next hop address for + request (otherwise it taken from saved contact). + 0x200 (512) - try TCP if corresponding UDP socket is not found. This is an optional parameter, default value - 0.

1 0

git:master:48dab490: ims_ipsec_pcscf: handle tls for replies
by Daniel-Constantin Mierla 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: 48dab490965fa7f2f7200d95edd7dbb1407b2536 URL: https://github.com/kamailio/kamailio/commit/48dab490965fa7f2f7200d95edd7dbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T10:08:29+02:00 ims_ipsec_pcscf: handle tls for replies --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/48dab490965fa7f2f7200d95edd7dbb… Patch: https://github.com/kamailio/kamailio/commit/48dab490965fa7f2f7200d95edd7dbb… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index b1e36ae2e24..b5c009dfcf8 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1053,13 +1053,15 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } if(m->first_line.type == SIP_REPLY) { + /* reply handling */ if(_cflags & IPSEC_FORWARD_USEVIA) { + /* req - corresponding request from transaction */ dst_proto = vb ? vb->proto : req->rcv.proto; // As per ETSI TS 133 203 V11.2.0, 7.1 Security association parameters // https://tools.ietf.org/html/rfc3261#section-18 // From Reply and TCP send via the same ports Request was recevied. - if(dst_proto == PROTO_TCP) { + if(dst_proto == PROTO_TCP || dst_proto == PROTO_TLS) { src_port = req->rcv.dst_port; dst_port = req->rcv.src_port; } else { @@ -1073,25 +1075,34 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } } } else { - // for Reply get the dest proto from the received request + // dest proto from the corresponding request from transaction dst_proto = req->rcv.proto; - // for Reply and TCP sends from P-CSCF server port, for Reply and UDP sends from P-CSCF client port - src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; + if(dst_proto == PROTO_TCP || dst_proto == PROTO_TLS) { + // for TCP/TLS send from P-CSCF server port + src_port = s->port_ps; - // for Reply and TCP sends to UE client port, for Reply and UDP sends to UE server port - dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; + // for TCP/TLS send to UE client port + dst_port = s->port_uc; + } else { + // for UDP send from P-CSCF client port + src_port = s->port_pc; - // Check send socket + // for UDP send to UE server port + dst_port = s->port_us; + } + // find send socket client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); if(!client_sock) { + /* fallback: P-CSCF client port to UE server port */ src_port = s->port_pc; dst_port = s->port_us; } } } else { + /* request handling */ if(_cflags & IPSEC_FORWARD_USEVIA) { dst_proto = ims_ipsec_get_forward_proto(m); } else {

1 0

git:master:f7f93828: ims_ipsec_pcscf: updated comments for ipsec_forward() flags
by Daniel-Constantin Mierla 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: f7f93828993b5975dfe5f26ad63ba6c489aa69f7 URL: https://github.com/kamailio/kamailio/commit/f7f93828993b5975dfe5f26ad63ba6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T06:49:47+02:00 ims_ipsec_pcscf: updated comments for ipsec_forward() flags --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/f7f93828993b5975dfe5f26ad63ba6c… Patch: https://github.com/kamailio/kamailio/commit/f7f93828993b5975dfe5f26ad63ba6c… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index fff9def48a2..b1e36ae2e24 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -88,11 +88,12 @@ extern struct tm_binds tmb; #define IPSEC_NOALIAS_SEARCH (1 << 4) /* if set - do not reset dst uri for IPsec forward */ #define IPSEC_NODSTURI_RESET (1 << 5) -/* if set - use user equipment client port as target for requests over TCP */ +/* if set - use user equipment client port as target for requests over TCP/TLS */ #define IPSEC_TCPPORT_UEC (1 << 6) -/* if set - build new dst uri with transport parameter for TCP */ +/* if set - build new dst uri with transport parameter for TCP/TLS */ #define IPSEC_SETDSTURI_FULL (1 << 7) -/* if set - use Via attributes for routing reply */ +/* if set - use Via attributes for routing reply + * and protocol from next hop address for request */ #define IPSEC_FORWARD_USEVIA (1 << 8) /* if set - try TCP if corresponding UDP socket is not found */ #define IPSEC_FORWARD_TRYTCP (1 << 9)

1 0

git:master:575b17d2: ims_ipsec_pcscf: docs updated for ipsec_forward() flags
by Daniel-Constantin Mierla 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: 575b17d23cd5fa060f775bc56b42c735048bc849 URL: https://github.com/kamailio/kamailio/commit/575b17d23cd5fa060f775bc56b42c73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T06:46:56+02:00 ims_ipsec_pcscf: docs updated for ipsec_forward() flags --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/575b17d23cd5fa060f775bc56b42c73… Patch: https://github.com/kamailio/kamailio/commit/575b17d23cd5fa060f775bc56b42c73… --- 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 ff65668e6e1..ee58f16fb63 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 @@ -284,7 +284,7 @@ ipsec_create("location", "1"); <itemizedlist> <listitem> <para> - <emphasis>0x01</emphasis> (1) - set force socket for request messages. Useful for ipsec and TCP. + <emphasis>0x01</emphasis> (1) - set force socket for request messages. Useful for ipsec and TCP/TLS. </para> </listitem> <listitem> @@ -316,17 +316,19 @@ ipsec_create("location", "1"); </listitem> <listitem> <para> - <emphasis>0x40</emphasis> (64) - use user equipment client port as target for TCP requests. + <emphasis>0x40</emphasis> (64) - use user equipment client port as target for TCP/TLS requests + (try to reuse the UE client connection). </para> </listitem> <listitem> <para> - <emphasis>0x80</emphasis> (128) - set transport parameter in the new dst uri for TCP requests. + <emphasis>0x80</emphasis> (128) - set transport parameter in the new dst uri for TCP/TLS requests. </para> </listitem> <listitem> <para> - <emphasis>0x100</emphasis> (256) - use Via attributes (port and protocol) for routing UDP reply. + <emphasis>0x100</emphasis> (256) - use Via attributes (port and protocol) for routing UDP reply, + and protocol from next hop address for request (otherwise it taken from saved contact). </para> </listitem> <listitem>

1 0

git:master:ab261540: ims_ipsec_pcscf: decouple IPSEC_FORWARD_USEVIA and IPSEC_TCPPORT_UEC for requests
by Daniel-Constantin Mierla 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: ab261540d656ed456bac8876f77f940457a9baf6 URL: https://github.com/kamailio/kamailio/commit/ab261540d656ed456bac8876f77f940… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T06:32:07+02:00 ims_ipsec_pcscf: decouple IPSEC_FORWARD_USEVIA and IPSEC_TCPPORT_UEC for requests - both flags should be avaible for use at the same time in ipsec_forward() - for request IPSEC_FORWARD_USEVIA gets the protocol from the next hop address --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/ab261540d656ed456bac8876f77f940… Patch: https://github.com/kamailio/kamailio/commit/ab261540d656ed456bac8876f77f940… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index b5a598b44ba..fff9def48a2 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -942,6 +942,37 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) return ret; } +/** + * + */ +int ims_ipsec_get_forward_proto(sip_msg_t *msg) +{ + struct sip_uri parsed_uri; + str uri; + + if(msg == NULL) { + LM_ERR("no message structure - fallback to UDP\n"); + return PROTO_UDP; + } + + if(msg->dst_uri.s != NULL && msg->dst_uri.len > 0) { + uri = msg->dst_uri; + } else { + if(msg->new_uri.s != NULL && msg->new_uri.len > 0) { + uri = msg->new_uri; + } else { + uri = msg->first_line.u.request.uri; + } + } + if(parse_uri(uri.s, uri.len, &parsed_uri) != 0) { + LM_ERR("failed to parse next hop uri [%.*s]\n", uri.len, uri.s); + return PROTO_UDP; + } + if(parsed_uri.proto == PROTO_NONE || parsed_uri.proto == PROTO_OTHER) { + return PROTO_UDP; + } + return parsed_uri.proto; +} int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) { @@ -1061,43 +1092,24 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } } else { if(_cflags & IPSEC_FORWARD_USEVIA) { - if(req->first_line.u.request.method_value == METHOD_REGISTER) { - // for Request get the dest proto from the saved contact - dst_proto = pcontact->received_proto; - } else { - if(m->dst_uri.s != NULL - && strstr(m->dst_uri.s, ";transport=tcp") != NULL) { - dst_proto = PROTO_TCP; - } else if(m->dst_uri.s != NULL - && strstr(m->dst_uri.s, ";transport=tls") != NULL) { - dst_proto = PROTO_TLS; - } else { - dst_proto = m->rcv.proto; - } - } - - // for Request sends from P-CSCF client port - src_port = s->port_pc; - // for Request sends to UE server port - dst_port = s->port_us; + dst_proto = ims_ipsec_get_forward_proto(m); } else { - // for Request get the dest proto from the saved contact dst_proto = pcontact->received_proto; + } + if((_cflags & IPSEC_TCPPORT_UEC) + && ((dst_proto == PROTO_TCP) || (dst_proto == PROTO_TLS))) { + // TCP/TLS send from P-CSCF server port, UDP sends from P-CSCF client port + src_port = s->port_ps; - if(_cflags & IPSEC_TCPPORT_UEC) { - // for Request and TCP sends from P-CSCF server port, for Request and UDP sends from P-CSCF client port - src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; - - // for Request and TCP sends to UE client port, for Request and UDP sends to UE server port - dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; + // for TCP/TLS sends to UE client port, for UDP sends to UE server port + dst_port = s->port_uc; - } else { - // for Request sends from P-CSCF client port - src_port = s->port_pc; + } else { + // send from P-CSCF client port + src_port = s->port_pc; - // for Request sends to UE server port - dst_port = s->port_us; - } + // send to UE server port + dst_port = s->port_us; } }

1 0

git:5.7:afd6189d: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 29 Apr '24

29 Apr '24

Module: kamailio Branch: 5.7 Commit: afd6189d65b06b80a433b6e4e321ac509af0c40c URL: https://github.com/kamailio/kamailio/commit/afd6189d65b06b80a433b6e4e321ac5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-29T05:31:24+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/smsops/README --- Diff: https://github.com/kamailio/kamailio/commit/afd6189d65b06b80a433b6e4e321ac5… Patch: https://github.com/kamailio/kamailio/commit/afd6189d65b06b80a433b6e4e321ac5… --- diff --git a/src/modules/smsops/README b/src/modules/smsops/README index 65e410de6ba..0dc5edbd605 100644 --- a/src/modules/smsops/README +++ b/src/modules/smsops/README @@ -33,6 +33,8 @@ Carsten Bock 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + List of Examples 1.1. isRPDATA() usage @@ -57,6 +59,8 @@ Chapter 1. Admin Guide 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + 1. Overview This module collects the Transformations for 3GPP-SMS. @@ -115,3 +119,12 @@ if (isRPDATA()) ... smsdump(); ... + +5. Variables + + Several variables are exported by the module to access the attributes + of the SMS. + * $smsack + $smsbody + $rpdata(key) + $tpdu(key)

1 0

git: new commits in branch 5.7
by Daniel-Constantin Mierla 29 Apr '24

29 Apr '24

- URL: https://github.com/kamailio/kamailio/commit/fb685a8bd5d5e34edde44614f313cbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:02:09+02:00 jansson: declare variables at the beginning of blocks (cherry picked from commit a2bff77c3f7bfee8dae90c3ef20522d480f2e14d) - URL: https://github.com/kamailio/kamailio/commit/2758754f2bb427bff06b2a6e8217587… Author: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-04-29T05:05:31+02:00 core: properly handle drop() action for kemi engines - GH #3718 (cherry picked from commit 82593a09f8ef6d53e7e88238c057bbcdd9ab287b) - URL: https://github.com/kamailio/kamailio/commit/4b88c5bf30054739f476388523e8d2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:08:18+02:00 core: rthreads - init return variable (cherry picked from commit 181c602616e13323786335e8e28f182871aa5e9b) (cherry picked from commit 0747c18d5c4db2e7e8408ad2c7efa120ec76523e) - URL: https://github.com/kamailio/kamailio/commit/02b877493cd6ffc6cfdf7da114d255d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:08:56+02:00 core: ppcfg - jump to end when defexp eval does not get a str val (cherry picked from commit daac0bdb88f6f732bda7c683af45b90f87fdb7c9) (cherry picked from commit 4c78a564c5ad8662014cf686428a37238a6d8476) - URL: https://github.com/kamailio/kamailio/commit/cea618ede170bd02bb7ccd478a4f1a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:09:18+02:00 core: select - handle ws and wss inside select_ip_port() (cherry picked from commit d8e0942c9e83c8cad7c182bf41c156ba35bf24d2) (cherry picked from commit 089bf63178039b13cde0beccfacab1536af76179) - URL: https://github.com/kamailio/kamailio/commit/92d3b52ca4595a7e4d8ab003951191c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:09:31+02:00 core: parser rr - check for rr value before serializing (cherry picked from commit 6ee26a3ae3293aaeb4507d5d0b16ad31173cc39a) (cherry picked from commit 4626cb7f0e0b273153ce0004900a92553783a893) - URL: https://github.com/kamailio/kamailio/commit/d12613c8e357a8dc882eefe2d84fedd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:10:14+02:00 ctl: reset log prefix on reading ctl traffic - it may be previously set in process by some event route (cherry picked from commit 5b8b2717ee2f57da932132683b27eb33cea3fd59) (cherry picked from commit d45c78eeeaea6a9fc9dcb927436f834392d9d7c9) - URL: https://github.com/kamailio/kamailio/commit/f225edd2fdc87b0ebf72e15d8a11255… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:12:20+02:00 acc: more log messages of failure arsing extra acc string (cherry picked from commit 04a73ace6572dd5c95a8f50b39b2ce712f7ebe84) (cherry picked from commit 91b0962679092f28abb5022d1505372356460f7d) - URL: https://github.com/kamailio/kamailio/commit/c90b736a098e1d76224c1e97c2a7142… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-04-29T05:13:20+02:00 core: resolve/create_srv_pref_list() - insert at correct position in list (cherry picked from commit f35cf8904119dcf582ea2451648de5fef095466b) (cherry picked from commit dbf9208f3a402844c9981fb7ed09493a1338dfdd) - URL: https://github.com/kamailio/kamailio/commit/a82d1575d9ac7820e526741fc169033… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-04-29T05:13:27+02:00 corex: fix conditions for dns_cache modparam srv attributes (cherry picked from commit 8114b2016d032484edafe4edd04fb02d52cfd058) (cherry picked from commit 3f44cabcfc0abc83ae1971ac74fbb0bd36829ce4) - URL: https://github.com/kamailio/kamailio/commit/edbcfff018145372fd6fa5d1777912f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:13:56+02:00 smsops: reformat module exports structures (cherry picked from commit 9848d43cb367d6901a0b8c727759feb8a8fad930) (cherry picked from commit b21a7aaa467f2b76a52308557657c65274e34087) - URL: https://github.com/kamailio/kamailio/commit/b3935051a8112b1a2152d8eb65da29b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:14:04+02:00 smsops: short reference section about variables (cherry picked from commit 9a94930ae1168d5df79e3dc1414841cdf23a2eba) (cherry picked from commit c0c8ee05ab25256b9154d2056ee04b07f3f2290a) - URL: https://github.com/kamailio/kamailio/commit/f1969ecaacd47eb03ef6b54d71c7037… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:14:11+02:00 blst: reformat exported structures (cherry picked from commit e39557c96d2f419184c826d779f1a3309acc4269) (cherry picked from commit e394a05152b29d4009c9cb963bced72526c7651b) - URL: https://github.com/kamailio/kamailio/commit/8bb69fd5f5911098a3e567887ad2a3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:14:51+02:00 sdpops: reformat the codecs map (cherry picked from commit 359a442e14a156b0bcf60dc5b2580cbc57924e34) (cherry picked from commit 855c76780c4399d6d9881ce3c525a7df56e111c4) - URL: https://github.com/kamailio/kamailio/commit/96ff473191bb24be90e2dde82fccb5c… Author: vijay kumar <vijay.kumar(a)exotel.in> Date: 2024-04-29T05:15:24+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket (cherry picked from commit b4753ae4216b0c960ac094f4be8232fb4d0147b0) (cherry picked from commit d2cf78f5c70977639f3b7f66b852350b764e4b13) - URL: https://github.com/kamailio/kamailio/commit/550573b37b566aa46bd94a2a644e932… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-29T05:15:45+02:00 tcp_main: Add protocol argument for searching tcp/tls connections (cherry picked from commit 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8) (cherry picked from commit 2661594bf7f31558e6ac7524f33ebb358aefce21) - URL: https://github.com/kamailio/kamailio/commit/4ccf4c9b5134a0632f5ea5a653a6f5e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-29T05:15:51+02:00 tcp_main: Add proto argument to tcpconn_exists function (cherry picked from commit 6779efd430178adff0ae438d178e38c003e4e05c) (cherry picked from commit 0c070443b585c597d2d6249ac6ac32490d9c7f48) - URL: https://github.com/kamailio/kamailio/commit/63120ef838cbcde1f40862a745b9d31… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-29T05:16:03+02:00 tcp_main: Update comment docs (cherry picked from commit 0a28a93c6e060081267dc686e342d45ef03358e7) (cherry picked from commit a19e6e0e49d9881ab990d23ad31a95773fe1a00b) - URL: https://github.com/kamailio/kamailio/commit/aff1797bb83a10868914e814702367f… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-29T05:16:10+02:00 core/forward: Match protocol when forwarding (cherry picked from commit d81e5113884b933251499630d112ec5b1150b8a4) (cherry picked from commit 7d103cf3887401fca32d95f7ea7ee10f28e9e127) - URL: https://github.com/kamailio/kamailio/commit/09699ba5d4efab0cbe64869c1ed8db7… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-29T05:16:17+02:00 tcp_main: Match wss protocol (cherry picked from commit 175d755c40bc50b78b2cf4f18ad22429289af90d) (cherry picked from commit 3052565e3ce14d5d3c45d790877a562185085548) - URL: https://github.com/kamailio/kamailio/commit/6ed99ae36fa16da2f0f59e3b5700abe… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2024-04-29T05:16:32+02:00 usrloc: check on db delete the return value of memchr When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. (cherry picked from commit 49276a1f43b1a3bf4a8d681888df964000360c79) (cherry picked from commit 28bbcd5a50f45b8217125481706180a76323dc44) - URL: https://github.com/kamailio/kamailio/commit/a794cef754fb3f2bc59d2d6a6d060e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:17:02+02:00 core: tcp - keep connection id on event route cb structure (cherry picked from commit 11e7d71e5c2ee9428298658ed3b9a0f625d40f00) (cherry picked from commit db2e96ec2aacde1bd50b65ea6357388bad39e86f) - URL: https://github.com/kamailio/kamailio/commit/cc7c586fbd72fe132719f3cfdba4809… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:17:08+02:00 tcpops: reworked some debug messages (cherry picked from commit 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81) (cherry picked from commit c9fe59d6cd73179aa75e21b3b215bc0465b182aa) - URL: https://github.com/kamailio/kamailio/commit/aeba79f5d9d5bf4fffdb64dd2c603fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:17:14+02:00 core: tcp - set a global shortcut to tcp connection for event route (cherry picked from commit d114d11724dc4157e7e5809504531d26da6bcc57) (cherry picked from commit 069de99576b5f8bff002176331ed2f545afe8158) - URL: https://github.com/kamailio/kamailio/commit/50c1b5cfe1b765b98438ac071eaa47c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:17:20+02:00 pv: use global tcp connection callback for event route on $conid (cherry picked from commit f5c05a68ae72881ab0691bb8488112356fc67c79) (cherry picked from commit 7e987d8937349246f2abfa041679f568344ff402) - URL: https://github.com/kamailio/kamailio/commit/365bb5d7fd1534e467f8a2d1b120f2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:17:30+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 (cherry picked from commit 66b3c04a9653425b1602c82dd2456a7eb7cf59d1) (cherry picked from commit 794c2edeaffe059bf8de6ab1d3df5db003ed4cb0) - URL: https://github.com/kamailio/kamailio/commit/9e270790302f075317d8b9eefce9141… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:18:01+02:00 tcpops: removed unused variable introduced recently (cherry picked from commit fe8f052c29528b656062927626f9784b32b7c8f6) (cherry picked from commit e76d755de6482e51c9ddac5bba3834cb58ad79b2)

1 0

git:master:85589470: ims_registrar_scscf: init variable to fix analyzer warning
by Daniel-Constantin Mierla 28 Apr '24

28 Apr '24

Module: kamailio Branch: master Commit: 8558947034f16b162c15eda39d18f5f5df4ef562 URL: https://github.com/kamailio/kamailio/commit/8558947034f16b162c15eda39d18f5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-28T23:29:22+02:00 ims_registrar_scscf: init variable to fix analyzer warning --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/8558947034f16b162c15eda39d18f5f… Patch: https://github.com/kamailio/kamailio/commit/8558947034f16b162c15eda39d18f5f… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 836ce9ca11b..99707dae0ce 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -334,7 +334,7 @@ int term_impu_has_contact(struct sip_msg *_m, udomain_t *_d, char *_s) str aor, uri; ucontact_t *ptr = 0; int res; - int ret; + int ret = -1; impu_contact_t *impucontact;

1 0

[kamailio/kamailio] modules/statsd: ensure statsd failures do not stop execution (PR #3819)
by Ostap 28 Apr '24

28 Apr '24

#### 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  2 issues: **Issue 1:** Currently statsd functions return bool: `true` or `false` depending when the function succeeds or fails respectively. This value gets implicitly converted to `int`: `true` -> `1`, `false` -> `0`. For Kamailio `1` means succesfull execution, but `0` means to stop processing messages, which is not what we want as statsd should not impact flow execution. Instead we want to return `-1` which signifies error, but the flow continues. **Issue 2:** statsd_init executes `statsd_connect` which tries to connect to statd server. If connection fails then kamailio fails to start. This is not the desired behaviour as: 1. Kamailio should continue working even if statsd server is down, metrics should not impact runtime. 2. `statsd_connect` is also re-executed each time we try to send the metric https://github.com/salemove/kamailio/blame/master/src/modules/statsd/lib_st…, so it's initial result is not essential. Note, that before 5.8 the result of init was already ignored due to implicit conversion of `false` to `0` until after https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… was introduced (which could be considered a breaking change even if it seemingly fixes a bug in conversion). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3819 -- Commit Summary -- * modules/statsd: avoid stopping flow when sending statsd metric fails * modules/statsd: do not fail module initilization when statsd init fails -- File Changes -- M src/modules/statsd/statsd.c (51) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3819.patch https://github.com/kamailio/kamailio/pull/3819.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3819 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3819(a)github.com>

2 5

git:master:5e66ba23: modules/statsd: ensure statsd failures do not stop execution (#3819)
by GitHub 28 Apr '24

28 Apr '24

Module: kamailio Branch: master Commit: 5e66ba23851f115bcb88d7e3f71f78ab33fc1e30 URL: https://github.com/kamailio/kamailio/commit/5e66ba23851f115bcb88d7e3f71f78a… Author: Ostap <ostap_mal(a)hotmail.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-28T23:15:28+02:00 modules/statsd: ensure statsd failures do not stop execution (#3819) * modules/statsd: avoid stopping flow when sending statsd metric fails Currently statsd functions return bool: `true` or `false` depending when the function succeeds or fails respectively. This value gets implicitly converted to `int`: `true` -> `1`, `false` -> `0`. For Kamailio `1` means succesfull execution, but `0` means to stop processing messages, which is not what we want as statsd should not impact flow execution. Instead we want to return `-1` which signifies error, but the flow continues. * modules/statsd: do not fail module initilization when statsd init fails statsd_init executes `statsd_connect` which tries to connect to statd server. If connection fails then kamailio fails to start. This is not the desired behaviour as: 1. Kamailio should continue working even if statsd server is down, metrics should not impact runtime. 2. `statsd_connect` is also re-executed each time we try to send the metric https://github.com/salemove/kamailio/blame/master/src/modules/statsd/lib_st…, so it's initial result is not essential. Note, that before 5.8 the result of init was already ignored due to implicit conversion of `false` to `0` until after https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… was introduced (which could be considered a breaking change even if it seemingly fixes a bug in conversion). --- Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/5e66ba23851f115bcb88d7e3f71f78a… Patch: https://github.com/kamailio/kamailio/commit/5e66ba23851f115bcb88d7e3f71f78a…

1 0

[kamailio/kamailio] utils/kamctl: make root host/port configurable (PR #3830)
by Tyler Moore 28 Apr '24

28 Apr '24

#### 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 - add support for configuring the DB root host/port connection parameters separate from the ro/rw settings. This allows the user to authenticate over the specific socket configured (tcp/udp/unix) for each connection type (root/ro/rw). - note that support is added for mysql and postgresql connections. no changes to the other DB engine connection parameters. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3830 -- Commit Summary -- * utils/kamctl: make root host/port configurable -- File Changes -- M utils/kamctl/kamctlrc (8) M utils/kamctl/kamdbctl.base (3) M utils/kamctl/kamdbctl.mysql (23) M utils/kamctl/kamdbctl.pgsql (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3830.patch https://github.com/kamailio/kamailio/pull/3830.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3830 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3830(a)github.com>

2 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev