sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
252 discussions

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

6 months, 4 weeks

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

6 months, 4 weeks

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;

6 months, 4 weeks

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

6 months, 4 weeks

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

6 months, 4 weeks

git:5.8:cafe437d: tls: clear thread-local variables up to tls_pthreads_key_mark

by S-P Chan

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

6 months, 4 weeks

git:master:fe6f4fcd: tls: clear thread-local variables up to tls_pthreads_key_mark

by S-P Chan

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

6 months, 4 weeks

git:master:27351e3f: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]

by Kamailio Dev

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.

6 months, 4 weeks

git:master:48dab490: ims_ipsec_pcscf: handle tls for replies

by Daniel-Constantin Mierla

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 {

6 months, 4 weeks

git:master:f7f93828: ims_ipsec_pcscf: updated comments for ipsec_forward() flags

by Daniel-Constantin Mierla

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)

6 months, 4 weeks

← Newer
1
2
3
4
5
6
7
8
9
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024