- sr-dev - kamailio.org

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

git:master:de23dc10: utils/kamctl: make root host/port configurable
by Daniel-Constantin Mierla 28 Apr '24

28 Apr '24

Module: kamailio Branch: master Commit: de23dc1035e4b885f45bc4150d282c26b294db64 URL: https://github.com/kamailio/kamailio/commit/de23dc1035e4b885f45bc4150d282c2… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-28T23:14:16+02:00 utils/kamctl: make root host/port configurable - 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. --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.base Modified: utils/kamctl/kamdbctl.mysql Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/de23dc1035e4b885f45bc4150d282c2… Patch: https://github.com/kamailio/kamailio/commit/de23dc1035e4b885f45bc4150d282c2… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index ce0bd9d93bc..67af483d9c6 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -44,6 +44,14 @@ ## database access host (from where is kamctl used) # DBACCESSHOST=192.168.0.1 +## database host for super user (useful for specifying a local socket or virtual hostname) +# defaults to value of DBHOST when not set +# DBROOTHOST="localhost" + +## database port for super user (on some DB specifying the port will force TCP connections) +# default value will depend on client DB tool +# DBROOTPORT="" + ## database super user (for ORACLE this is 'scheme-creator' user) # DBROOTUSER="root" diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 4a3beccaef4..5579c9e8373 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -20,6 +20,9 @@ DBROUSER=${DBROUSER:-kamailioro} # password for read-only user DBROPW=${DBROPW:-kamailioro} +# address of database server for root connections +DBROOTHOST=${DBROOTHOST:-$DBHOST} + # user name column USERCOL=${USERCOL:-username} diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 81a730bbe65..49915dc7954 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -27,23 +27,22 @@ fi # config vars ################################################################# -# full privileges MySQL user -if [ -z "$DBROOTUSER" ]; then - DBROOTUSER="root" -fi - # Set DBROOTPW in kamctlrc or via next line to set the database # root password if you want to run this script without any user prompt. # This is unsafe, but useful e.g. for automatic testing. #DBROOTPW="" - -if [ -z "$DBPORT" ] ; then - CMD="mysql -h $DBHOST -u$DBROOTUSER " - DUMP_CMD="mysqldump -h $DBHOST -u$DBROOTUSER -c -t " -else - CMD="mysql -h $DBHOST -P $DBPORT -u$DBROOTUSER " - DUMP_CMD="mysqldump -h $DBHOST -P $DBPORT -u$DBROOTUSER -c -t " +# build the client base commands one param at a time +# let the client choose defaults where not specified +CMD="mysql -h $DBROOTHOST" +DUMP_CMD="mysqldump -c -t -h $DBROOTHOST" +if [ -n "$DBROOTPORT" ] ; then + CMD="$CMD -P $DBROOTPORT" + DUMP_CMD="$DUMP_CMD -P $DBROOTPORT" +fi +if [ -n "$DBROOTUSER" ]; then + CMD="$CMD -u $DBROOTUSER" + DUMP_CMD="mysqldump -u $DBROOTUSER" fi ################################################################# diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index 1eb5d88d2b8..3b46c04294f 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -51,12 +51,12 @@ if [ -z "$DBROOTUSER" ]; then fi fi -if [ -z "$DBPORT" ] ; then - CMD="psql -q -h $DBHOST -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -U $DBROOTUSER -c" +if [ -z "$DBROOTPORT" ] ; then + CMD="psql -q -h $DBROOTHOST -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBROOTHOST -U $DBROOTUSER -c" else - CMD="psql -q -h $DBHOST -p $DBPORT -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -p $DBPORT -U $DBROOTUSER -c" + CMD="psql -q -h $DBROOTHOST -p $DBROOTPORT -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBROOTHOST -p $DBROOTPORT -U $DBROOTUSER -c" fi #################################################################

1 0

git:master:f0caa96e: phonenum: clang format cpp file
by Daniel-Constantin Mierla 27 Apr '24

27 Apr '24

Module: kamailio Branch: master Commit: f0caa96e7622c40200d22d730ca904f27e5fe752 URL: https://github.com/kamailio/kamailio/commit/f0caa96e7622c40200d22d730ca904f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-27T08:46:17+02:00 phonenum: clang format cpp file --- Modified: src/modules/phonenum/cphonenumber.cpp --- Diff: https://github.com/kamailio/kamailio/commit/f0caa96e7622c40200d22d730ca904f… Patch: https://github.com/kamailio/kamailio/commit/f0caa96e7622c40200d22d730ca904f…

1 0

git:master:5b0e1e6d: modules: readme files regenerated - phonenum ... [skip ci]
by Kamailio Dev 27 Apr '24

27 Apr '24

Module: kamailio Branch: master Commit: 5b0e1e6d23fb0bf028589ae27949f11be2b22837 URL: https://github.com/kamailio/kamailio/commit/5b0e1e6d23fb0bf028589ae27949f11… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-27T08:46:10+02:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/5b0e1e6d23fb0bf028589ae27949f11… Patch: https://github.com/kamailio/kamailio/commit/5b0e1e6d23fb0bf028589ae27949f11… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index 87cb9e485f5..5d50ebf8f2e 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -191,7 +191,8 @@ if(phonenum_match_cn("1-484-555-8888", "US", "src")) { + number - phone number that is matched + valid - 1 if the matched number has a valid result; 0 otherwise - + normalized - normalized phone number + + normalized - normalized (E164) phone number + + natnum - nationally formatted phone number + cctel - country code for phone number + ccname - country code name + ltype - local network type

1 0

[kamailio/kamailio] phonenum: add national number (PR #3820)
by Daniel Donoghue 27 Apr '24

27 Apr '24

- add natnum property, containing the nationally formatted number, to pv   #### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3820 -- Commit Summary -- * phonenum: add national number -- File Changes -- M src/modules/phonenum/cphonenumber.cpp (12) M src/modules/phonenum/cphonenumber.h (1) M src/modules/phonenum/doc/phonenum_admin.xml (5) M src/modules/phonenum/phonenum_pv.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3820.patch https://github.com/kamailio/kamailio/pull/3820.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3820 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3820(a)github.com>

2 2

git:master:efffd1db: phonenum: add national number
by Daniel-Constantin Mierla 27 Apr '24

27 Apr '24

Module: kamailio Branch: master Commit: efffd1db25f2da411f53fdab4954c60c16c021ae URL: https://github.com/kamailio/kamailio/commit/efffd1db25f2da411f53fdab4954c60… Author: Daniel Donoghue <daniel.donoghue(a)aurorainnovation.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-27T08:44:10+02:00 phonenum: add national number - add natnum property, containing the nationally formatted number, to pv --- Modified: src/modules/phonenum/cphonenumber.cpp Modified: src/modules/phonenum/cphonenumber.h Modified: src/modules/phonenum/doc/phonenum_admin.xml Modified: src/modules/phonenum/phonenum_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/efffd1db25f2da411f53fdab4954c60… Patch: https://github.com/kamailio/kamailio/commit/efffd1db25f2da411f53fdab4954c60… --- diff --git a/src/modules/phonenum/cphonenumber.cpp b/src/modules/phonenum/cphonenumber.cpp index 60f5039c88f..94cc9d2cddb 100644 --- a/src/modules/phonenum/cphonenumber.cpp +++ b/src/modules/phonenum/cphonenumber.cpp @@ -128,9 +128,11 @@ telnum_t* telnum_parse(char* number, char* region) return res; } res->valid = 1; - string formattedNumber; - _phoneUtil.Format(parsedNumber, PhoneNumberUtil::E164, &formattedNumber); - res->normalized = strdup(formattedNumber.c_str()); + string formattedNumberE164, formattedNumberNational; + _phoneUtil.Format(parsedNumber, PhoneNumberUtil::E164, &formattedNumberE164); + _phoneUtil.Format(parsedNumber, PhoneNumberUtil::NATIONAL, &formattedNumberNational); + res->normalized = strdup(formattedNumberE164.c_str()); + res->natnum = strdup(formattedNumberNational.c_str()); string descNumber = _phoneGeoCoder->GetDescriptionForNumber(parsedNumber, Locale("en")); res->ndesc = strdup(descNumber.c_str()); res->ltype = strdup(telnum_linetype(_phoneUtil.GetNumberType(parsedNumber))); @@ -156,6 +158,7 @@ telnum_t* telnum_new(char* number) tn->ltype = NULL; tn->ndesc = NULL; tn->ccname = NULL; + tn->natnum = NULL; tn->error = NULL; return tn; } @@ -183,5 +186,8 @@ void telnum_free(telnum_t* tn) if (tn->ccname) { free(tn->ccname); } + if (tn->natnum) { + free(tn->natnum); + } free(tn); } diff --git a/src/modules/phonenum/cphonenumber.h b/src/modules/phonenum/cphonenumber.h index 1a6a06df861..b9e1dc09d96 100644 --- a/src/modules/phonenum/cphonenumber.h +++ b/src/modules/phonenum/cphonenumber.h @@ -37,6 +37,7 @@ extern "C" char *ltype; char *ndesc; char *ccname; + char *natnum; char *error; int cctel; int valid; diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index f3a3e98ede0..740ec4780a3 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -205,7 +205,10 @@ if(phonenum_match_cn("1-484-555-8888", "US", "src")) { valid result; 0 otherwise </para></listitem> <listitem><para> - <emphasis>normalized</emphasis> - normalized phone number + <emphasis>normalized</emphasis> - normalized (E164) phone number + </para></listitem> + <listitem><para> + <emphasis>natnum</emphasis> - nationally formatted phone number </para></listitem> <listitem><para> <emphasis>cctel</emphasis> - country code for phone number diff --git a/src/modules/phonenum/phonenum_pv.c b/src/modules/phonenum/phonenum_pv.c index f6bcc025f66..5970c6b9845 100644 --- a/src/modules/phonenum/phonenum_pv.c +++ b/src/modules/phonenum/phonenum_pv.c @@ -190,6 +190,8 @@ int pv_parse_phonenum_name(pv_spec_p sp, str *in) gpv->type = 0; else if(strncmp(pvs.s, "ccname", 6) == 0) gpv->type = 7; + else if(strncmp(pvs.s, "natnum", 6) == 0) + gpv->type = 8; else goto error; break; @@ -268,6 +270,10 @@ int pv_get_phonenum(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(gpv->item->r.record->ccname == NULL) return pv_get_null(msg, param, res); return pv_get_strzval(msg, param, res, gpv->item->r.record->ccname); + case 8: /* natnum */ + if(gpv->item->r.record->natnum == NULL) + return pv_get_null(msg, param, res); + return pv_get_strzval(msg, param, res, gpv->item->r.record->natnum); default: /* number */ if(gpv->item->r.record->number == NULL) return pv_get_null(msg, param, res);

1 0

git:master:465994de: modules: readme files regenerated - ims_usrloc_scscf ... [skip ci]
by Kamailio Dev 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 465994de2859c7863b4cef8457be0a207f15c932 URL: https://github.com/kamailio/kamailio/commit/465994de2859c7863b4cef8457be0a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-26T15:46:09+02:00 modules: readme files regenerated - ims_usrloc_scscf ... [skip ci] --- Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/465994de2859c7863b4cef8457be0a2… Patch: https://github.com/kamailio/kamailio/commit/465994de2859c7863b4cef8457be0a2…

1 0

git:master:8506a6fe: ims_usrloc_scscf: enclose examples in dotted lines for better visibility
by Daniel-Constantin Mierla 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 8506a6fe781e6e0b0b1418f4087db50480db6b57 URL: https://github.com/kamailio/kamailio/commit/8506a6fe781e6e0b0b1418f4087db50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-26T14:35:22+02:00 ims_usrloc_scscf: enclose examples in dotted lines for better visibility --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8506a6fe781e6e0b0b1418f4087db50… Patch: https://github.com/kamailio/kamailio/commit/8506a6fe781e6e0b0b1418f4087db50…

1 0

git:master:15d859e1: ims_usrloc_scscf: reformat exported structures
by Daniel-Constantin Mierla 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 15d859e1e96552fca2708cf56047021beae29711 URL: https://github.com/kamailio/kamailio/commit/15d859e1e96552fca2708cf56047021… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-26T14:24:16+02:00 ims_usrloc_scscf: reformat exported structures --- Modified: src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/15d859e1e96552fca2708cf56047021… Patch: https://github.com/kamailio/kamailio/commit/15d859e1e96552fca2708cf56047021…

1 0

git:master:9f284503: uid_auth_db: spelling fix in documentation
by Henning Westerholt 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 9f28450312749dfbc021a8cbc23472c8a39d3fef URL: https://github.com/kamailio/kamailio/commit/9f28450312749dfbc021a8cbc23472c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-26T05:54:27Z uid_auth_db: spelling fix in documentation --- Modified: src/modules/uid_auth_db/auth_db.xml --- Diff: https://github.com/kamailio/kamailio/commit/9f28450312749dfbc021a8cbc23472c… Patch: https://github.com/kamailio/kamailio/commit/9f28450312749dfbc021a8cbc23472c… --- diff --git a/src/modules/uid_auth_db/auth_db.xml b/src/modules/uid_auth_db/auth_db.xml index 25849663c54..99e5eb7c594 100644 --- a/src/modules/uid_auth_db/auth_db.xml +++ b/src/modules/uid_auth_db/auth_db.xml @@ -66,7 +66,7 @@ the <serdoc:module>textops</serdoc:module> module. </para> <para> - The reason for the failure can be determined from the interger + The reason for the failure can be determined from the integer return value stored in the <varname>$?</varname> attribute. A value of <literal>-3</literal> indicates that it was impossible to retrieve credentials from the request. A 400 (Bad Request)

1 0

git:master:db176a49: core: spelling fix in comment and log message
by Henning Westerholt 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: db176a4918c0b500f5f051cad16fd8d442450ab7 URL: https://github.com/kamailio/kamailio/commit/db176a4918c0b500f5f051cad16fd8d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-26T05:53:30Z core: spelling fix in comment and log message --- Modified: src/core/switch.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/db176a4918c0b500f5f051cad16fd8d… Patch: https://github.com/kamailio/kamailio/commit/db176a4918c0b500f5f051cad16fd8d… --- diff --git a/src/core/switch.c b/src/core/switch.c index 79cee21c501..e12b7e5f6d1 100644 --- a/src/core/switch.c +++ b/src/core/switch.c @@ -203,7 +203,7 @@ int fix_switch(struct action *t) return E_BUG; } if(rval_expr_eval_long(0, 0, &c->label.match_int, c->ct_rve) < 0) { - LM_ERR("case expression (%d,%d) has non-interger type\n", + LM_ERR("case expression (%d,%d) has non-integer type\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col); return E_BUG; } diff --git a/src/core/ut.h b/src/core/ut.h index ff8d964e559..1efd7abd242 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -315,7 +315,7 @@ static inline char *int2strbuf(unsigned long l, char *r, int r_size, int *len) } extern char ut_buf_int2str[INT2STR_MAX_LEN]; -/** interger(long) to string conversion. +/** integer(long) to string conversion. * This version uses a static buffer (shared with sint2str()). * WARNING: other function calls might overwrite the static buffer, so * either always save the result immediately or use int2strbuf(...).

1 0

[kamailio/kamailio] ERROR: <core> [core/ppcfg.c:275]: pp_ifdef_level_error(): different number of preprocessor directives: 1 more #!if[n]def as #!endif (Issue #3826)
by FeTristan 25 Apr '24

25 Apr '24

Hi, I am trying to learn Kamailio to set up a SIP/RTP proxy for WebRTC with FreeSWITCH, and I wanted to use this configuration file template as a starting point. (Source: https://github.com/havfo/WEBRTC-to-SIP) ``` #!KAMAILIO # #!define WITH_MYSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_TLS #!define WITH_HOMER #!define WITH_WEBSOCKETS #!define WITH_ANTIFLOOD #!define WITH_IPV6 ##!define WITH_BRIDGE_ON_FAIL #!define WITH_LOCALHOST_WS ##!define WITH_LOCALHOST_SIP #!substdef "!MY_SIP_PORT!5060!g" #!substdef "!MY_SIPS_PORT!5061!g" #!substdef "!MY_WS_PORT!8080!g" #!substdef "!MY_WSS_PORT!4443!g" #!substdef "!MY_IP4_ADDR!XXXXX-XXXXX!g" #!substdef "!IP4_LOCALHOST!127.0.0.1!g" #!substdef "!MY_WS4_ADDR!tcp:MY_IP4_ADDR:MY_WS_PORT!g" #!substdef "!MY_WSS4_ADDR!tls:MY_IP4_ADDR:MY_WSS_PORT!g" #!substdef "!LOCALHOST_WS4_ADDR!tcp:IP4_LOCALHOST:MY_WS_PORT!g" #!substdef "!LOCALHOST_WSS4_ADDR!tls:IP4_LOCALHOST:MY_WSS_PORT!g" #!ifdef WITH_IPV6 #!substdef "!MY_IP6_ADDR![XXXXXX-XXXXXX]!g" #!substdef "!IP6_LOCALHOST![::1]!g" #!substdef "!MY_WS6_ADDR!tcp:MY_IP6_ADDR:MY_WS_PORT!g" #!substdef "!MY_WSS6_ADDR!tls:MY_IP6_ADDR:MY_WSS_PORT!g" #!substdef "!LOCALHOST_WS6_ADDR!tcp:IP6_LOCALHOST:MY_WS_PORT!g" #!substdef "!LOCALHOST_WSS6_ADDR!tls:IP6_LOCALHOST:MY_WSS_PORT!g" #!endif #!substdef "!MY_DOMAIN!XXXX-XXXX!g" # *** Value defines - IDs used later in config #!ifdef WITH_MYSQL # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. #!ifndef DBURL #!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" #!endif #!endif # - flags # FLT_ - per transaction (message) flags # FLB_ - per branch flags #!define FLT_NATS 5 #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 #!define FLB_RTPWS 8 #!define FLB_IPV6 9 #!define FLB_V4V6 10 #!define FLB_BRIDGE 11 ####### Global Parameters ######### ### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR #!ifdef WITH_DEBUG debug=4 log_stderror=no #!else debug=2 log_stderror=no #!endif memdbg=5 memlog=5 log_facility=LOG_LOCAL0 fork=yes children=4 port=MY_SIP_PORT tls_port_no=MY_SIPS_PORT #!ifdef WITH_TLS enable_tls=yes #!endif listen=MY_IP4_ADDR #!ifdef WITH_LOCALHOST_SIP listen=IP4_LOCALHOST #!endif #!ifdef WITH_IPV6 listen=MY_IP6_ADDR #!ifdef WITH_LOCALHOST_SIP listen=IP6_LOCALHOST #!endif #!endif #!ifdef WITH_WEBSOCKETS listen=MY_WS4_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WS4_ADDR #!endif #!ifdef WITH_IPV6 listen=MY_WS6_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WS6_ADDR #!endif #!endif #!ifdef WITH_TLS listen=MY_WSS4_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WSS4_ADDR #!endif #!ifdef WITH_IPV6 listen=MY_WSS6_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WSS6_ADDR #!endif #!endif #!endif #!endif use_dns_cache = on # Use KAMAILIO internal DNS cache use_dns_failover = on # Depends on KAMAILIO internal DNS cache dns_srv_loadbalancing = on # dns_try_naptr = on # dns_retr_time=1 # Time in seconds before retrying a DNS request dns_retr_no=3 # Number of DNS retransmissions before giving up # Set protocol preference order - ignore target priority dns_naptr_ignore_rfc= yes # Ignore target NAPTR priority dns_tls_pref=50 # First priority: TLS dns_tcp_pref=30 # Second priority: TCP dns_udp_pref=10 # Third priority: UDP tcp_connection_lifetime=3604 tcp_accept_no_cl=yes tcp_rd_buf_size=16384 # set paths to location of modules (to sources or installation folders) #!ifdef WITH_SRCPATH mpath="modules/" #!else mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" #!endif #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "sdpops.so" loadmodule "textopsx.so" #!ifdef WITH_AUTH loadmodule "auth.so" loadmodule "auth_db.so" #!ifdef WITH_IPAUTH loadmodule "permissions.so" #!endif #!endif #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_HOMER loadmodule "siptrace.so" #!endif #!ifdef WITH_WEBSOCKETS loadmodule "xhttp.so" loadmodule "websocket.so" loadmodule "nathelper.so" loadmodule "rtpengine.so" #!endif #!ifdef WITH_ANTIFLOOD loadmodule "htable.so" loadmodule "pike.so" #!endif #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif # ----------------- setting module-specific parameters --------------- # ----- rr params ----- # add value to ;lr param to cope with most of the UAs modparam("rr", "enable_full_lr", 1) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) # ----- registrar params ----- modparam("registrar", "method_filtering", 1) # max value for expires of registrations modparam("registrar", "max_expires", 3600) # ----- usrloc params ----- /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) #!endif # ----- auth_db params ----- #!ifdef WITH_AUTH modparam("auth_db", "db_url", DBURL) modparam("auth_db", "calculate_ha1", 1) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") #!endif #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) #!endif ##!ifdef WITH_NAT # ----- rtpproxy params ----- modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:22222") modparam("rtpengine", "extra_id_pv", "$avp(extra_id)") # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("nathelper", "sipping_from", "sip:pinger@XXXX-XXXX") modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", FLB_NATB) ##!endif # ----- corex params ----- modparam("corex", "alias_subdomains", "MY_DOMAIN") #!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "config", "/etc/kamailio/tls.cfg") modparam("tls", "tls_force_run", 1) #!endif #!ifdef WITH_WEBSOCKETS modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") #!endif #!ifdef WITH_HOMER #Siptrace modparam("siptrace", "duplicate_uri", "sip:127.0.0.1:9060") modparam("siptrace", "hep_mode_on", 1) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "trace_flag", 22) modparam("siptrace", "trace_on", 1) #!endif #!ifdef WITH_ANTIFLOOD # ----- pike params ----- modparam("pike", "sampling_time_unit", 2) modparam("pike", "reqs_density_per_unit", 16) modparam("pike", "remove_latency", 4) # ----- htable params ----- # ip ban htable with autoexpire after 5 minutes modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) #!endif ####### Routing Logic ######## request_route { #!ifdef WITH_HOMER # start duplicate the SIP message here sip_trace(); setflag(22); #!endif # per request initial checks route(REQINIT); xlog("L_INFO", "START: $rm from $fu (IP:$si:$sp)\n"); #!ifdef WITH_WEBSOCKETS if (nat_uac_test(64)) { # Do NAT traversal stuff for requests from a WebSocket # connection - even if it is not behind a NAT! # This won't be needed in the future if Kamailio and the # WebSocket client support Outbound and Path. force_rport(); if (is_method("REGISTER")) { fix_nated_register(); } else if (!add_contact_alias()) { xlog("L_ERR", "Error aliasing contact <$ct>\n"); sl_send_reply("400", "Bad Request"); exit; } } #!endif # NAT detection route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) t_check_trans(); # authentication route(AUTH); # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); if (is_method("INVITE|SUBSCRIBE")) { record_route(); } # dispatch requests to foreign domains route(SIPOUT); ### requests for my local domains # handle presence related requests route(PRESENCE); # handle registrations route(REGISTRAR); if ($rU == $null) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; } # user location service route(LOCATION); } # Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests # - serial forking, RTP relaying handling, a.s.o. if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { if (!t_is_set("branch_route")) { t_on_branch("MANAGE_BRANCH"); } } if (is_method("INVITE|SUBSCRIBE|UPDATE")) { if (!t_is_set("onreply_route")) { t_on_reply("MANAGE_REPLY"); } } if (is_method("INVITE")) { if (!t_is_set("failure_route")) { t_on_failure("MANAGE_FAILURE"); } } if (!t_relay()) { sl_reply_error(); } exit; } # Per SIP request initial checks route[REQINIT] { #!ifdef WITH_ANTIFLOOD # flood dection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if (src_ip != myself) { if ($sht(ipban=>$si) != $null) { # ip is already blocked xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); exit; } if (!pike_check_req()) { xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); $sht(ipban=>$si) = 1; exit; } } #!endif if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); exit; } if (!sanity_check("1511", "7")) { xlog("Malformed SIP message from $si:$sp\n"); exit; } } # Handle requests within SIP dialogs route[WITHINDLG] { if (has_totag()) { # sequential request withing a dialog should # take the path determined by record-routing if (loose_route()) { #!ifdef WITH_WEBSOCKETS if ($du == "") { if (!handle_ruri_alias()) { xlog("L_ERR", "Bad alias <$ru>\n"); sl_send_reply("400", "Bad Request"); exit; } } #!endif route(DLGURI); if (is_method("ACK")) { # ACK is forwarded statelessy route(NATMANAGE); } else if (is_method("NOTIFY")) { # Add Record-Route for in-dialog NOTIFY as per RFC 6665. record_route(); } route(RELAY); } else { if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); exit; } if (is_method("ACK")) { if (t_check_trans()) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 from upstream server route(RELAY); exit; } else { # ACK without matching transaction ... ignore and discard exit; } } sl_send_reply("404","Not here"); } exit; } } # Handle SIP registrations route[REGISTRAR] { if (is_method("REGISTER")) { if (isflagset(FLT_NATS)) { setbflag(FLB_NATB); # uncomment next line to do SIP NAT pinging ## setbflag(FLB_NATSIPPING); } #!ifdef WITH_IPV6 if (af == INET6) { setbflag(FLB_IPV6); } #!endif if (!save("location")) { sl_reply_error(); } exit; } } # USER location service route[LOCATION] { if (!lookup("location")) { $var(rc) = $rc; t_newtran(); switch ($var(rc)) { case -1: case -3: send_reply("404", "Not Found"); exit; case -2: send_reply("405", "Method Not Allowed"); exit; } } route(RELAY); exit; } # Presence server route route[PRESENCE] { if (!is_method("PUBLISH|SUBSCRIBE")) { return; } if (is_method("SUBSCRIBE") && $hdr(Event) == "message-summary") { # returns here if no voicemail server is configured sl_send_reply("404", "No voicemail service"); exit; } #!ifdef WITH_PRESENCE if (!t_newtran()) { sl_reply_error(); exit; } if (is_method("PUBLISH")) { handle_publish(); t_release(); } else if (is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif # if presence enabled, this part will not be executed if (is_method("PUBLISH") || $rU == $null) { sl_send_reply("404", "Not here"); exit; } return; } # Authentication route route[AUTH] { #!ifdef WITH_AUTH if (is_method("REGISTER") || from_uri == myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header if (!is_method("REGISTER|PUBLISH")) { consume_credentials(); } } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here if (from_uri != myself && uri != myself) { sl_send_reply("403","Not relaying"); exit; } #!endif return; } # Caller NAT detection route route[NATDETECT] { #!ifdef WITH_IPV6 if(af==INET6) { return; } #!endif force_rport(); if (nat_uac_test("19")) { if (is_method("REGISTER")) { fix_nated_register(); } else if (is_first_hop()) { set_contact_alias(); } setflag(FLT_NATS); } return; } # NAT handling route[NATMANAGE] { if (is_request()) { if (has_totag()) { if (check_route_param("nat=yes")) { setbflag(FLB_NATB); } if (check_route_param("rtp=bridge")) { setbflag(FLB_BRIDGE); } if (check_route_param("rtp=ws")) { setbflag(FLB_RTPWS); } #!ifdef WITH_IPV6 if (check_route_param("rtp=v46")) { setbflag(FLB_V4V6); } #!endif } } if (!isbflagset(FLB_BRIDGE)) { return; } if ( !(isflagset(FLT_NATS) || isbflagset(FLB_NATB) || isbflagset(FLB_RTPWS) #!ifdef WITH_IPV6 || isbflagset(FLB_V4V6) #!endif ) ) { return; } $xavp(r=>$T_branch_idx) = "replace-origin replace-session-connection"; if (!nat_uac_test("8")) { $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " trust-address"; } if (is_request()) { if (!has_totag()) { if (!t_is_failure_route()) { $avp(extra_id) = @via[1].branch + $T_branch_idx; $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " via-branch=extra"; } } } if (is_reply()) { $avp(extra_id) = @via[2].branch + $T_branch_idx; $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " via-branch=extra"; } #!ifdef WITH_IPV6 if (af == INET && isbflagset(FLB_IPV6)) { # IPv4 --> IPv6 $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " address-family=IP6"; } else if (af == INET6 && !isbflagset(FLB_IPV6)) { # IPv6 --> IPv4 $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " address-family=IP4"; } #!endif if (isbflagset(FLB_RTPWS)) { if ($proto =~ "ws") { # web --> SIP $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " rtcp-mux-demux DTLS=off SDES-off ICE=remove RTP/AVP"; } else { # SIP --> web $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " rtcp-mux-offer generate-mid DTLS=passive SDES-off ICE=force RTP/SAVPF"; } } else { if ($proto =~ "ws") { # web --> web $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " generate-mid DTLS=passive SDES-off ICE=force"; } # else { # $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + ""; # } } xlog("L_INFO", "NATMANAGE branch_id:$T_branch_idx ruri: $ru, method:$rm, status:$rs, extra_id: $avp(extra_id), rtpengine_manage: $xavp(r=>$T_branch_idx)\n"); rtpengine_manage($xavp(r=>$T_branch_idx)); if (is_request()) { if (!has_totag()) { if (t_is_branch_route()) { if (isbflagset(FLB_NATB)) { add_rr_param(";nat=yes"); } if (isbflagset(FLB_BRIDGE)) { add_rr_param(";rtp=bridge"); } if (isbflagset(FLB_RTPWS)) { add_rr_param(";rtp=ws"); } #!ifdef WITH_IPV6 if (isbflagset(FLB_V4V6)) { add_rr_param(";rtp=v46"); } #!endif } } } if (is_reply()) { if (isbflagset(FLB_NATB)) { if (is_first_hop()) { if (af == INET) { set_contact_alias(); } } } } return; } # URI update for dialog requests route[DLGURI] { if (!isdsturiset()) { handle_ruri_alias(); } return; } # Routing to foreign domains route[SIPOUT] { if (!uri == myself) { append_hf("P-hint: outbound\r\n"); route(RELAY); } } route[BRIDGING] { if (!has_totag()) { if ($proto =~ "ws" && !($ru =~ "transport=ws")) { # Coming from WS, NOT to WS setbflag(FLB_RTPWS); # Need bridging } else if (!($proto =~ "ws") && $ru =~ "transport=ws") { # Coming from NOT WS, going to WS setbflag(FLB_RTPWS); # Need bridging } #!ifdef WITH_IPV6 if (af == INET6 && !isbflagset(FLB_IPV6)) { setbflag(FLB_V4V6); } else if(af == INET && isbflagset(FLB_IPV6)) { setbflag(FLB_V4V6); } #!endif } } # manage outgoing branches branch_route[MANAGE_BRANCH] { xlog("L_INFO", "MANAGE_BRANCH: New branch [$T_branch_idx] to $ru\n"); t_on_branch_failure("rtpengine"); #!ifndef WITH_BRIDGE_ON_FAIL setbflag(FLB_BRIDGE); #!endif route(BRIDGING); route(NATMANAGE); } # manage incoming replies onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if (status =~ "[12][0-9][0-9]") { route(NATMANAGE); } } # manage failure routing cases failure_route[MANAGE_FAILURE] { xlog("L_INFO", "Failure: $rs"); } #!ifdef WITH_WEBSOCKETS onreply_route { if ((($Rp == MY_WS_PORT || $Rp == MY_WSS_PORT) && !(proto == WS || proto == WSS))) { xlog("L_WARN", "SIP response received on $Rp\n"); drop; } if (nat_uac_test(64)) { # Do NAT traversal stuff for replies to a WebSocket connection # - even if it is not behind a NAT! # This won't be needed in the future if Kamailio and the # WebSocket client support Outbound and Path. add_contact_alias(); } } event_route[tm:branch-failure:rtpengine] { xlog("L_INFO", "BRANCH FAILED: $sel(via[1].branch) + $T_branch_idx"); #!ifdef WITH_BRIDGE_ON_FAIL if (!isbflagset(FLB_BRIDGE) && t_check_status("415|488")) { t_reuse_branch(); setbflag(FLB_BRIDGE); xlog("L_INFO", "event_route[branch-failure:rtpengine]: trying again\n"); route(RELAY); } else { $avp(extra_id) = @via[1].branch + $T_branch_idx; rtpengine_delete("via-branch=extra"); xlog("L_INFO", "event_route[branch-failure:rtpengine]: failed\n"); } #!else $avp(extra_id) = @via[1].branch + $T_branch_idx; rtpengine_delete("via-branch=extra"); #!endif } event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if ($Rp != MY_WS_PORT #!ifdef WITH_TLS && $Rp != MY_WSS_PORT #!endif ) { xlog("L_WARN", "HTTP request received on $Rp\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } xlog("L_INFO", "HTTP Request Received\n"); if ($hdr(Upgrade) =~ "websocket" && $hdr(Connection) =~ "Upgrade" && $rm =~ "GET" ) { # Validate Host - make sure the client is using the correct # alias for WebSockets if ($hdr(Host) == $null || !is_myself("sip:" + $hdr(Host))) { xlog("L_WARN", "Bad host $hdr(Host)\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } # Optional... validate Origin - make sure the client is from an # authorised website. For example, # # if ($hdr(Origin) != "https://example.com" # && $hdr(Origin) != "https://example.com") { # xlog("L_WARN", "Unauthorised client $hdr(Origin)\n"); # xhttp_reply("403", "Forbidden", "", ""); # exit; # } # Optional... perform HTTP authentication # ws_handle_handshake() exits (no further configuration file # processing of the request) when complete. if (ws_handle_handshake()) { # Optional... cache some information about the # successful connection exit; } } xhttp_reply("404", "Not Found", "", ""); } event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection from $si:$sp has closed\n"); } #!endif ``` But i have the error : **ERROR: <core> [core/ppcfg.c:275]: pp_ifdef_level_error(): different number of preprocessor directives: 1 more #!if[n]def as #!endif** I don't understand because I checked and everything seems okay with the if/endif statements to me. ``` # grep '#!ifndef' kamailio.cfg | wc -l 2 # grep '#!ifdef' kamailio.cfg | wc -l 49 # grep '#!endif' kamailio.cfg | wc -l 51 ``` And it's ok for chat gpt too : ``` #!ifdef : 49 occurrences #!ifndef : 2 occurrences Total (#!ifdef and #!ifndef) : 51 occurrences #!endif : 51 occurrences ``` Is there a problem with the parser or a compatibility problem (i am on 5.6.3) ? Thank. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3826 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3826(a)github.com>

2 2

git:master:36fc03ea: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: 36fc03eaa49ba8ff02acd451699185ac18d8618e URL: https://github.com/kamailio/kamailio/commit/36fc03eaa49ba8ff02acd451699185a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-25T14:16:08+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/36fc03eaa49ba8ff02acd451699185a… Patch: https://github.com/kamailio/kamailio/commit/36fc03eaa49ba8ff02acd451699185a… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 75f47f5f445..00b6a209c81 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -852,6 +852,7 @@ sht_rm_value_re("ha=>.*"); * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. * ew - match the val parameter as 'ends with'. + * in - match the val parameter as 'includes'. All parameters can be static strings or contain variables. @@ -871,6 +872,7 @@ sht_rm_name("ha", "re", ".*"); * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. * ew - match the val parameter as 'ends with'. + * in - match the val parameter as 'includes'. All parameters can be static strings or contain variables.

1 0

git:5.8:03ff5051: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Apr '24

25 Apr '24

Module: kamailio Branch: 5.8 Commit: 03ff5051b640d2478dd68ea89ad74d516752ab0f URL: https://github.com/kamailio/kamailio/commit/03ff5051b640d2478dd68ea89ad74d5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-25T14:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_redis/README Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/03ff5051b640d2478dd68ea89ad74d5… Patch: https://github.com/kamailio/kamailio/commit/03ff5051b640d2478dd68ea89ad74d5… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index d2baa50e72d..4cfdcaa5b4f 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -39,7 +39,7 @@ Joel Centelles Martin 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -75,7 +75,7 @@ Chapter 1. Admin Guide 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -203,7 +203,7 @@ allid,time_hires&cid:callid 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 4.1. schema_path (string) @@ -247,6 +247,12 @@ modparam("db_redis", "verbosity", 0) Controls TLS usage while connecting to a remote DB. If set to 1, TLS is used to connect to the DB. + If TLS is enabled, the module will validate the Redis server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the Redis server must therefore be turned + off. + Default value: 0. Example 1.4. Enabling TLS connection @@ -265,9 +271,10 @@ modparam("db_redis", "opt_tls", 1) modparam("db_redis", "db_pass", "r3d1sPass") ... -4.6. ac_path (string) +4.6. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the Redis server + certificate are stored. Default value: "" (empty). diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 1cdfc842db3..90071f5e3f0 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -55,7 +55,7 @@ Joel Centelles Martin 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -103,7 +103,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -149,7 +149,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 3.1. server (str) @@ -168,6 +168,12 @@ Chapter 1. Admin Guide many REDIS servers, just give different attributes and use the specific server name when querying the REDIS instance. + If tls is enabled, the module will validate the REDIS server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the REDIS server must therefore be turned + off. + Default value is NULL. Example 1.1. Set server parameter @@ -346,9 +352,10 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "debug", 1) ... -3.11. ac_path (string) +3.11. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the REDIS server + certificate are stored. Default value: "" (empty).

1 0

git:master:39a2679f: htable: docs for in operator for remove functions
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: 39a2679fe165e34a225615ec32c58692fdcaf6a8 URL: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T14:00:40+02:00 htable: docs for in operator for remove functions --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… Patch: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index c5cc20e22ed..23a159c6982 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -916,6 +916,11 @@ sht_rm_value_re("ha=>.*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>in</emphasis> - match the val parameter as 'includes'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables. @@ -962,6 +967,11 @@ sht_rm_name("ha", "re", ".*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>in</emphasis> - match the val parameter as 'includes'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables.

1 0

git:master:c0d80f9e: htable: added in operator for rm functions
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: c0d80f9eb42b025802c4680f19d788d01497301a URL: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:53:31+02:00 htable: added in operator for rm functions --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… Patch: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index afda3dc6c54..ecc49b547d6 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1389,8 +1389,12 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) == 0) { match = 1; } + } else if(op == HT_RM_OP_IN) { + if(sre->len <= it->name.len + && str_search(&it->name, sre) != NULL) { + match = 1; + } } - } else { if(op == HT_RM_OP_SW) { if(it->flags & AVP_VAL_STR) { @@ -1410,6 +1414,13 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) match = 1; } } + } else if(op == HT_RM_OP_IN) { + if(it->flags & AVP_VAL_STR) { + if(sre->len <= it->value.s.len + && str_search(&it->value.s, sre) != NULL) { + match = 1; + } + } } } if(match == 1) { diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 7c7642ef5df..f7bd8ed42c0 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -126,6 +126,8 @@ int ht_reset_content(ht_t *ht); #define HT_RM_OP_SW 3 #define HT_RM_OP_EW 3 #define HT_RM_OP_RE 4 +#define HT_RM_OP_IN 5 + int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op); int ht_match_cell_op_str(str *sre, ht_t *ht, int mode, int op); diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index 7577e445a76..5388d8e00df 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -40,7 +40,8 @@ typedef enum HT_DMQ_DEL_CELL, HT_DMQ_RM_CELL_RE, HT_DMQ_RM_CELL_SW, - HT_DMQ_RM_CELL_EW + HT_DMQ_RM_CELL_EW, + HT_DMQ_RM_CELL_IN } ht_dmq_action_t; int ht_dmq_initialize(); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 6f775bb33ce..414bd5556b1 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -527,6 +527,18 @@ static int ht_rm_items(sip_msg_t *msg, str *hname, str *op, str *val, int mkey) return -1; } return 1; + } else if(strncmp(op->s, "ew", 2) == 0) { + isval.s = *val; + if((ht->dmqreplicate > 0) + && ht_dmq_replicate_action(HT_DMQ_RM_CELL_IN, &ht->name, + NULL, AVP_VAL_STR, &isval, mkey) + != 0) { + LM_ERR("dmq replication failed (op %d)\n", mkey); + } + if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_IN) < 0) { + return -1; + } + return 1; } LM_WARN("unsupported match operator: %.*s\n", op->len, op->s); break;

1 0

git:5.8:e76d755d: tcpops: removed unused variable introduced recently
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: 5.8 Commit: e76d755de6482e51c9ddac5bba3834cb58ad79b2 URL: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:50:44+02:00 tcpops: removed unused variable introduced recently (cherry picked from commit fe8f052c29528b656062927626f9784b32b7c8f6) --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… Patch: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9c648c1f2a3..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,7 +248,6 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; - int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git:master:fe8f052c: tcpops: removed unused variable introduced recently
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: fe8f052c29528b656062927626f9784b32b7c8f6 URL: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:49:58+02:00 tcpops: removed unused variable introduced recently --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… Patch: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9c648c1f2a3..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,7 +248,6 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; - int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

- URL: https://github.com/kamailio/kamailio/commit/bb48da13adfe36716c3d958ed1d9c41… Author: Jannik Volkland <volkland(a)sipgate.de> Date: 2024-04-25T13:31:15+02:00 db_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… (cherry picked from commit 40a50243f0bae782b7acd97cf0a9b1138185068b) - URL: https://github.com/kamailio/kamailio/commit/f337f13cdbc7e8805c0130dbae3befa… Author: Jannik Volkland <volkland(a)sipgate.de> Date: 2024-04-25T13:31:21+02:00 ndb_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… (cherry picked from commit 6faa180661e799187eff3a498f8b13e96719fa92) - URL: https://github.com/kamailio/kamailio/commit/855c76780c4399d6d9881ce3c525a7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:31:50+02:00 sdpops: reformat the codecs map (cherry picked from commit 359a442e14a156b0bcf60dc5b2580cbc57924e34) - URL: https://github.com/kamailio/kamailio/commit/7295607e680ad1dd5290b15dab7fed7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:32:18+02:00 core: parser/sdp - rename parameter to suggest better its role (cherry picked from commit b03ec73589c12e566b11ce2c653401daa915c805) - URL: https://github.com/kamailio/kamailio/commit/8d312ded02559b325cdd691bde61c54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:33:01+02:00 siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri (cherry picked from commit d1118064d04bb77c818540e68edf1766db1d560a) - URL: https://github.com/kamailio/kamailio/commit/800ed174b9402d1b253b2cb4ab04b5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:33:24+02:00 ims_ipsec_pcscf: log error message made info (cherry picked from commit 92d3573b500374d100639484e5a84cb640dc6b1d) - URL: https://github.com/kamailio/kamailio/commit/595d3f472179402dce7a51672c2dbfb… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:34:17+02:00 corex: Fix unknown af in list_sockets (cherry picked from commit 8bc64a9e6820243336387d9cd9acf81f24d89993) - URL: https://github.com/kamailio/kamailio/commit/d2cf78f5c70977639f3b7f66b852350… Author: vijay kumar <vijay.kumar(a)exotel.in> Date: 2024-04-25T13:35:18+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket (cherry picked from commit b4753ae4216b0c960ac094f4be8232fb4d0147b0) - URL: https://github.com/kamailio/kamailio/commit/2661594bf7f31558e6ac7524f33ebb3… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:38+02:00 tcp_main: Add protocol argument for searching tcp/tls connections (cherry picked from commit 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8) - URL: https://github.com/kamailio/kamailio/commit/0c070443b585c597d2d6249ac6ac324… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:45+02:00 tcp_main: Add proto argument to tcpconn_exists function (cherry picked from commit 6779efd430178adff0ae438d178e38c003e4e05c) - URL: https://github.com/kamailio/kamailio/commit/a19e6e0e49d9881ab990d23ad31a957… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:57+02:00 tcp_main: Update comment docs (cherry picked from commit 0a28a93c6e060081267dc686e342d45ef03358e7) - URL: https://github.com/kamailio/kamailio/commit/7d103cf3887401fca32d95f7ea7ee10… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:36:25+02:00 core/forward: Match protocol when forwarding (cherry picked from commit d81e5113884b933251499630d112ec5b1150b8a4) - URL: https://github.com/kamailio/kamailio/commit/3052565e3ce14d5d3c45d790877a562… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:36:39+02:00 tcp_main: Match wss protocol (cherry picked from commit 175d755c40bc50b78b2cf4f18ad22429289af90d) - URL: https://github.com/kamailio/kamailio/commit/28bbcd5a50f45b8217125481706180a… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2024-04-25T13:37:16+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) - URL: https://github.com/kamailio/kamailio/commit/db2e96ec2aacde1bd50b65ea6357388… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:37+02:00 core: tcp - keep connection id on event route cb structure (cherry picked from commit 11e7d71e5c2ee9428298658ed3b9a0f625d40f00) - URL: https://github.com/kamailio/kamailio/commit/c9fe59d6cd73179aa75e21b3b215bc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:46+02:00 tcpops: reworked some debug messages (cherry picked from commit 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81) - URL: https://github.com/kamailio/kamailio/commit/069de99576b5f8bff002176331ed2f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:54+02:00 core: tcp - set a global shortcut to tcp connection for event route (cherry picked from commit d114d11724dc4157e7e5809504531d26da6bcc57) - URL: https://github.com/kamailio/kamailio/commit/7e987d8937349246f2abfa041679f56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:01+02:00 pv: use global tcp connection callback for event route on $conid (cherry picked from commit f5c05a68ae72881ab0691bb8488112356fc67c79) - URL: https://github.com/kamailio/kamailio/commit/794c2edeaffe059bf8de6ab1d3df5db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:09+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 (cherry picked from commit 66b3c04a9653425b1602c82dd2456a7eb7cf59d1) - URL: https://github.com/kamailio/kamailio/commit/eaacc171adbcd84fb2b95b4c182cd1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:17+02:00 regex: init globals for safer shutdown on failure (cherry picked from commit 84517c14ca38a8371c67b858077a42019c2217a8) - URL: https://github.com/kamailio/kamailio/commit/c8f685359c411ac43000dd77cbc2e4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:24+02:00 regex: allocate pcres array - GH #3812 (cherry picked from commit 2cc62133db4f6875f55e73e044f37dafbb2274c2) - URL: https://github.com/kamailio/kamailio/commit/3ff024fd0057d3a9d045d3f20df5d1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:34+02:00 regex: reformat exported structures (cherry picked from commit 0ebfddd20b43396d602b4c68a88f7c2bc58ed211)

1 0

[kamailio/kamailio] Chaining Transformations {uri.param,received}{uri.host} does not work for IPv6 (Issue #3794)
by ChristianBergerSipgate 25 Apr '24

25 Apr '24

### Description Chaining the transformations {uri.param,received} and {uri.host} does not work if the address is IPv6. It works for IPv4 addresses. #### Reproduction We tested this with the following code: ``` if ($du != $null) { $var(received_uri)=$(du{uri.param,received}); if ($var(received_uri)!="") { $var(subscriber_host)=$(var(received_uri){uri.host}); } $var(test_tmp)=$(du{uri.param,received}{uri.host}); xlog("L_ERR", "WURST subscriber_host=$var(subscriber_host) test_tmp=$var(test_tmp) du=$du received_uri=$var(received_uri)"); } } #### Log Messages For IPv6 this gives us: ``` "module": "pv", "file": "pv_trans.c", "line": 1545, "function": "tr_eval_uri", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": **"invalid uri [ab:cdef:dead:beef]:1234]\n"** "module": "core", "file": "core/lvalue.c", "line": 351, "function": "lval_pvar_assign", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "non existing right pvar\n" "module": "core", "file": "core/lvalue.c", "line": 411, "function": "lval_assign", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "assignment failed at pos: (1432,19-1432,53)\n" "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "WURST subscriber_host=[2001:db8:0123:4567:89ab:cdef:dead:beef] test_tmp=0 du=sip:1.2.4.129;lr;received=sip[2001:db8:0123:4567:89ab:cdef:dead:beef]:1234 received_uri=sip:[2001:db8:0123:4567:89ab:cdef:dead:beef]:1234" "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "determineSubscribeIpFamily: contacts worked path=0 ip=[2001:db8:0123:4567:89ab:cdef:dead:beef] af=6" ``` For IPv4 it works: `{ "idx": 8, "pid": 577, "level": "ERROR", "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "WURST subscriber_host=12.34.56.78 test_tmp=12.34.56.78 du=sip:1.2.4.149;lr;received=sip:12.34.56.78:1234 received_uri=sip:12.34.56.78:1234" } ` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3794 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3794(a)github.com>

3 3

[kamailio/kamailio] Error by installing new Rel. 5.8 (Issue #3825)
by leila Mohammadinafchi 25 Apr '24

25 Apr '24

I am using this docker file for installaing kamailio. I wana use it with open5gs for trynig VoNR , I used before it for VoLTE it works but right now I have this error in installation process. ![log](https://github.com/kamailio/kamailio/assets/161492387/42017f48-3a7f-4cbe-bdf0-48dbb3443f5f) and there is docker file that Im using: FROM ubuntu:focal ENV DEBIAN_FRONTEND=noninteractive # Install updates and dependencies RUN apt-get update && \ apt-get -y install mysql-server tcpdump screen tmux ntp ntpdate git-core dkms \ gcc flex bison libmysqlclient-dev make libssl-dev libcurl4-openssl-dev \ libxml2-dev libpcre2-dev bash-completion g++ autoconf libmnl-dev \ libsctp-dev libradcli-dev libradcli4 libjson-c-dev pkg-config iproute2 net-tools \ iputils-ping # Fetch Kamailio code (branch 5.3) RUN mkdir -p /usr/local/src/ && cd /usr/local/src/ && \ git clone https://github.com/kamailio/kamailio && \ cd kamailio && git checkout 5.8 # Build and Install Kamailio RUN cd /usr/local/src/kamailio && make cfg COPY modules.lst /usr/local/src/kamailio/src RUN cd /usr/local/src/kamailio && \ make -j`nproc` Q=0 all | tee make_all.txt && \ make install | tee make_install.txt && \ ldconfig COPY kamailio_init.sh / CMD /kamailio_init.sh -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3825 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3825(a)github.com>

2 3

[kamailio/kamailio] ndb_reids module in event_route[tcp:closed] route block error: "no redis context for server" (Issue #3768)
by liangbaolin 25 Apr '24

25 Apr '24

### Description The process of using kamailio prompts the following error： ERROR: ndb_redis [redis_client.c:963]: redisc_exec(): no redis context for server: srvN I did not encounter similar errors in version 5.4.8, and there were no similar errors in other routing blocks. Suspect that the new core version has unknown logical issues with the routing block of the module in event_route.  #### Log Messages  ``` 2024-02-26T03:39:11.161557654Z 51(97) DEBUG: <core> [core/tcp_read.c:280]: tcp_read_data(): EOF on connection 0x7f24539006a0 (state: 0, flags: c018) - FD 24, bytes 0, rd-flags 10000 ([12.0.1.6]:22827 -> [12.0.1.6]:5060)51(97) DEBUG: <core> [core/tcp_read.c:343]: tcp_read(): read 0 bytes: 2024-02-26T03:39:11.161563494Z 2024-02-26T03:39:11.161567864Z 51(97) DEBUG: <core> [core/tcp_read.c:1532]: tcp_read_req(): read= 0 bytes, parsed=0, state=0, error=1 2024-02-26T03:39:11.161574144Z 51(97) DEBUG: <core> [core/tcp_read.c:1534]: tcp_read_req(): last char=0x00, parsed msg= 2024-02-26T03:39:11.161579134Z 2024-02-26T03:39:11.161584594Z 51(97) DEBUG: <core> [core/tcp_read.c:1544]: tcp_read_req(): EOF 2024-02-26T03:39:11.161598914Z 51(97) DEBUG: <core> [core/io_wait.h:598]: io_watch_del(): DBG: io_watch_del (0x563e1ce29740, 24, -1, 0x10) fd_no=2 called 2024-02-26T03:39:11.161604494Z 51(97) DEBUG: <core> [core/tcp_read.c:1927]: handle_io(): removing from list 0x7f24539006a0 id 1 fd 24, state 2, flags c018, main fd 132, refcnt 2 ([12.0.1.6]:22827 -> [12.0.1.6]:5060) 2024-02-26T03:39:11.161610294Z 51(97) DEBUG: <core> [core/tcp_read.c:1702]: release_tcpconn(): releasing con 0x7f24539006a0, state -1, fd=24, id=1 ([12.0.1.6]:22827 -> [12.0.1.6]:5060) 2024-02-26T03:39:11.161615934Z 51(97) DEBUG: <core> [core/tcp_read.c:1705]: release_tcpconn(): extra_data (nil) 2024-02-26T03:39:11.162263374Z 83(129) DEBUG: <core> [core/tcp_main.c:3747]: handle_tcp_child(): reader response= 7f24539006a0, -1 from 0 2024-02-26T03:39:11.162286594Z 83(129) DEBUG: <core> [core/tcp_main.c:3671]: tcp_emit_closed_event(): TCP closed event creation triggered (reason: 0) 2024-02-26T03:39:11.162293034Z 83(129) DEBUG: tcpops [tcpops.c:311]: tcpops_handle_tcp_closed(): received TCP closed event 2024-02-26T03:39:11.162299134Z 83(129) DEBUG: tcpops [tcpops.c:261]: tcpops_tcp_closed_run_route(): event reason id: 0 rt: 1 2024-02-26T03:39:11.162304234Z 83(129) ERROR: tcpops [tcpops.c:278]: tcpops_tcp_closed_run_route(): run_top_route() before tev->id: 1 2024-02-26T03:39:11.162311444Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162316784Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162322944Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162328584Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162333764Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162338674Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162343764Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162349254Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162355494Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 101 2024-02-26T03:39:11.162360924Z 83(129) ERROR: <script>: tcp connection closed conid: (1), tcp(conid): 1, Ri: 12.0.1.185, Rp: 5060 , si: 12.0.1.6 , sp: 22827 2024-02-26T03:39:11.162375744Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162381944Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162388024Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162395164Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162400884Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162406634Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162412284Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162417034Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162422294Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 27 2024-02-26T03:39:11.162427844Z 83(129) ERROR: <script>: tcp connection closed (1) 2024-02-26T03:39:11.162433574Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162439254Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162444184Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162449324Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162454724Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 1 2024-02-26T03:39:11.162460094Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 52 2024-02-26T03:39:11.162466084Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162471724Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162477324Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162482144Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162487154Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 52 2024-02-26T03:39:11.162501164Z 83(129) DEBUG: ndb_redis [redis_client.c:399]: redisc_get_server(): Hash 2100282857 (srvN) 2024-02-26T03:39:11.162508124Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209461 (12.0.1.9:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162514104Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209462 (12.0.1.8:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162520554Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209448 (12.0.1.7:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162526404Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210133 (12.0.1.9:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162532034Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210134 (12.0.1.8:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162537324Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210120 (12.0.1.7:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162542824Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100282854 (srvM), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162548064Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100282857 (srvN), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162554074Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100306023 (srvTPS), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162559184Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209461 (12.0.1.9:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162564524Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209462 (12.0.1.8:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162569904Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209448 (12.0.1.7:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162575334Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210133 (12.0.1.9:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162580154Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210134 (12.0.1.8:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162585964Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210120 (12.0.1.7:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162592294Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2100282854 (srvM), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162597644Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2100282857 (srvN), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162611324Z 83(129) DEBUG: ndb_redis [redis_client.c:413]: redisc_get_server(): Using entry 2100282857 (srvN) 2024-02-26T03:39:11.162617084Z 83(129) DEBUG: ndb_redis [redis_client.c:960]: redisc_exec(): rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162622004Z 83(129) ERROR: ndb_redis [redis_client.c:963]: redisc_exec(): no redis context for server: srvN 2024-02-26T03:39:11.162627834Z 83(129) ERROR: tcpops [tcpops.c:280]: tcpops_tcp_closed_run_route(): run_top_route() after tev->id: 1 2024-02-26T03:39:11.162633294Z 83(129) DEBUG: <core> [core/tcp_main.c:3904]: handle_tcp_child(): case CONN_EOF tcp_emit_closed_event before 5 ``` #### SIP Traffic  ``` event_route[tcp:closed] { xlog("L_ERR", "$proto connection closed conid: ($conid), tcp(conid): $tcp(conid), Ri: $Ri, Rp: $Rp , si: $si , sp: $sp\n"); if($conid ne $null) { xlog("L_ERR", "$proto connection closed ($conid)\n"); route(TCPEVENT); } } route[TCPEVENT] { if(redis_cmd("srvN", "get %s", "$conid", "r")) { ..... } } #redis module config loadmodule "ndb_redis" modparam("ndb_redis", "cluster", 1) modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "server", "name=srvN;addr=NDB_N_REDIS_CLUSTER_MAINADDR;port=NDB_N_REDIS_CLUSTER_MAINPORT;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=srvM;addr=NDB_M_REDIS_CLUSTER_MAINADDR;port=NDB_M_REDIS_CLUSTER_MAINPORT;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.7:7369;addr=12.0.1.7;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.8:7369;addr=12.0.1.8;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.9:7369;addr=12.0.1.9;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.7:7469;addr=12.0.1.7;port=7469;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.8:7469;addr=12.0.1.8;port=7469;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.9:7469;addr=12.0.1.9;port=7469;pass=NDB_REDIS_PASSWORD") ``` * **Operating System**:  ``` version: kamailio 5.7.4 (x86_64/linux) 9920d9-dirty flags: , EXTRA_DEBUGUSE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 9920d9 -dirty compiled on 09:59:52 Feb 26 2024 with gcc 7.5.0 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3768 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3768(a)github.com>

3 10

git:master:0ebfddd2: regex: reformat exported structures
by Daniel-Constantin Mierla 24 Apr '24

24 Apr '24

Module: kamailio Branch: master Commit: 0ebfddd20b43396d602b4c68a88f7c2bc58ed211 URL: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-24T21:34:28+02:00 regex: reformat exported structures --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… Patch: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 4bb4d7cdcee..292af692136 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -113,48 +113,54 @@ static int w_pcre_match_group(struct sip_msg *_msg, char *_s1, char *_s2); /* * Exported functions */ +/* clang-format off */ static cmd_export_t cmds[] = { - {"pcre_match", (cmd_function)w_pcre_match, 2, fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, - fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, - fixup_spve_null, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"pcre_match", (cmd_function)w_pcre_match, 2, fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, + fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, + fixup_spve_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"file", PARAM_STRING, &file}, - {"max_groups", INT_PARAM, &max_groups}, - {"group_max_size", INT_PARAM, &group_max_size}, - {"pcre_caseless", INT_PARAM, &pcre_caseless}, - {"pcre_multiline", INT_PARAM, &pcre_multiline}, - {"pcre_dotall", INT_PARAM, &pcre_dotall}, - {"pcre_extended", INT_PARAM, &pcre_extended}, {0, 0, 0}}; +static param_export_t params[] = { + {"file", PARAM_STRING, &file}, + {"max_groups", INT_PARAM, &max_groups}, + {"group_max_size", INT_PARAM, &group_max_size}, + {"pcre_caseless", INT_PARAM, &pcre_caseless}, + {"pcre_multiline", INT_PARAM, &pcre_multiline}, + {"pcre_dotall", INT_PARAM, &pcre_dotall}, + {"pcre_extended", INT_PARAM, &pcre_extended}, + {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "regex", /*!< module name */ - DEFAULT_DLFLAGS, /*!< dlopen flags */ - cmds, /*!< exported functions */ - params, /*!< exported parameters */ - 0, /*!< exported RPC functions */ - 0, /*!< exported pseudo-variables */ - 0, /*!< response handling function */ - mod_init, /*!< module initialization function */ - 0, /*!< per-child init function */ - destroy /*!< destroy function */ + "regex", /*!< module name */ + DEFAULT_DLFLAGS, /*!< dlopen flags */ + cmds, /*!< exported functions */ + params, /*!< exported parameters */ + 0, /*!< exported RPC functions */ + 0, /*!< exported pseudo-variables */ + 0, /*!< response handling function */ + mod_init, /*!< module initialization function */ + 0, /*!< per-child init function */ + destroy /*!< destroy function */ }; +/* clang-format on */ static void *pcre2_malloc(size_t size, void *ext)

1 0

[kamailio/kamailio] ERROR cfgtrace:dbg_cfg_trace() (Issue #3821)
by happytulubi 24 Apr '24

24 Apr '24

May I ask what the problem is? It prompts an error but does not affect the program's operation. Is it that the configuration file and the deployed version are inconsistent? 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=706 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=695 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=695 a=16 n=if 13(682) INFO: <script>: Call from Websocket endpoint at the DURI {sip:117.80.229.36:15060} for callee {3008} 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=691 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=685 a=25 n=has_body Here is the code for my kamailio.cfg section branch_route[MANAGE_BRANCH]{ xlog("L_INFO","Call to ru:{$ru} '$du'/'$proto'\n"); if(($du=~"transport=ws") || ($du=~"transport=wss")){ if ($du=~"transport=tls") { #sdp_remove_media("video"); xlog("L_INFO","Call to TLS endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { rtpengine_manage("record-call=off metadata=6:$ci force trust-address replace-origin replace-session-connection UDP/TLS/RTP/SAVPF"); } t_on_reply("REPLY_FROM_TLS"); $fs="tls:MY_IP_ADDR:MY_WSS_PORT"; } else if ($du=~"transport=ws") { xlog("L_INFO","Call to Websocket endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { route(GET_REAL_IP_FOR_RTPENGINE); #rtpengine_manage("record-call=off metadata=7:$ci replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=7:$ci replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"); } t_on_reply("REPLY_FROM_WS"); $du = $du + ";transport=ws"; $fs="tcp:MY_IP_ADDR:MY_WS_PORT"; } }else { if ($proto=~ "tls") { #sdp_remove_media("video"); xlog("L_INFO","Call from WSS endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { rtpengine_manage("record-call=off metadata=8:$ci trust-address replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP"); } xlog("L_INFO","media adress is $(du{s.select,1,:})\n"); t_on_reply("REPLY_TO_TLS"); } else if ($proto =~ "ws"){ xlog("L_INFO","Call from Websocket endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { route(GET_REAL_IP_FOR_RTPENGINE); #rtpengine_manage("record-call=off metadata=9:$ci replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=9:$ci replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP"); } xlog("L_INFO","media adress is $(du{s.select,1,:})\n"); t_on_reply("REPLY_TO_WS"); } if (($proto=~ "udp") || ($proto=~"tcp")) { #sdp_remove_media("video"); xlog("L_INFO","UDP Branch is {$du} for {$tU}\n"); # $avp(mediaAddr) = ''; if ( has_body('application/sdp')) { #rtpengine_manage("record-call=off metadata=10:$ci replace-origin replace-session-connection media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=10:$ci replace-origin replace-session-connection"); } t_on_reply("STANDART"); } } xlog("L_INFO", "t_on_reply set\n"); if is_method("BYE|CANCEL") { rtpengine_manage(); } } -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3821 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3821(a)github.com>

2 2

[kamailio/kamailio] tools/kemi: escape docstrings when required (PR #3824)
by tsearle 24 Apr '24

24 Apr '24

some of the documentation contains \ which need escaping   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3824 -- Commit Summary -- * tools/kemi: escape docstrings when required -- File Changes -- M misc/tools/kemi/python_mock/kemi_mock.py (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3824.patch https://github.com/kamailio/kamailio/pull/3824.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3824 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3824(a)github.com>

1 1

git:master:999d0c65: tools/kemi: escape docstrings when required (#3824)
by GitHub 24 Apr '24

24 Apr '24

Module: kamailio Branch: master Commit: 999d0c65402c99491683d694d77a01a5c1f91ecf URL: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-24T11:28:49+02:00 tools/kemi: escape docstrings when required (#3824) some of the documentation contains \ which need escaping --- Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… Patch: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… --- diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 145fcb34b3a..918551a1887 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -129,7 +129,7 @@ def generate_function_doc(module_name, func, prefix): print(prefix + "\t\"\"\"") documentation_lines = documentation[module_name]["functions"][function_prefix].split("\n") for line in documentation_lines: - print(prefix + "\t" + line) + print(prefix + "\t" + line.replace("\\", "\\\\\\\\")) print(prefix + "\t\"\"\"") break

1 0

git:master:2cc62133: regex: allocate pcres array
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 2cc62133db4f6875f55e73e044f37dafbb2274c2 URL: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T12:08:30+02:00 regex: allocate pcres array - GH #3812 --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… Patch: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 8e8c1645f0e..4bb4d7cdcee 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -462,6 +462,15 @@ static int load_pcres(int action) } shm_free(pcres); } + + if(pcres == NULL) { + if((pcres = shm_malloc(sizeof(pcre2_code *) * num_pcres_tmp)) == 0) { + LM_ERR("no more memory for pcres\n"); + goto err; + } + memset(pcres, 0, sizeof(pcre2_code *) * num_pcres_tmp); + } + *num_pcres = num_pcres_tmp; *pcres = *pcres_tmp; *pcres_addr = pcres;

1 0

git:master:84517c14: regex: init globals for safer shutdown on failure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 84517c14ca38a8371c67b858077a42019c2217a8 URL: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T11:49:23+02:00 regex: init globals for safer shutdown on failure --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… Patch: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index e7aaada852d..8e8c1645f0e 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -68,7 +68,7 @@ gen_lock_t *reload_lock; /* * Module exported parameter variables */ -static char *file; +static char *file = NULL; static int max_groups = MAX_GROUPS; static int group_max_size = GROUP_MAX_SIZE; static int pcre_caseless = 0; @@ -83,9 +83,9 @@ static int pcre_extended = 0; static pcre2_general_context *pcres_gctx = NULL; static pcre2_match_context *pcres_mctx = NULL; static pcre2_compile_context *pcres_ctx = NULL; -static pcre2_code **pcres; -static pcre2_code ***pcres_addr; -static int *num_pcres; +static pcre2_code **pcres = NULL; +static pcre2_code ***pcres_addr = NULL; +static int *num_pcres = NULL; static int pcre_options = 0x00000000;

1 0

[kamailio/kamailio] TSILO: ts_append_to(): transaction 11743:1310842517: error updating dset (-1) (Issue #3782)
by vteliatnykov 23 Apr '24

23 Apr '24

After the transaction was suspended, 1st user registered, got INVITE message, there is 2nd user wakes up and send REGISTER. Kamailio check if transaction suspended (for 2nd user, it is not suspended anymore), and checks if there is stored transaction. So, for 2nd user we have stored transaction, then it should append new branch. ts_append failed. if ($var(suspended) == 0) { if ($var(stored)) { # no suspended INVITE (i.e. there was at least one # registered contact for target) and 'stored' set # (i.e. ongoing transaction) -> this newly just # registered contact needs alerting. ts_append("location", "sip:$avp(extension)@LOCALVIRTUALIP"); xinfo("appending branches for sip:$avp(extension)@LOCALVIRTUALIP, result $rc"); } else { xinfo("no suspended transactions for $tu"); } return; } Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1339] <script>: -----------122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1348] <script>: var(suspended)=0, tsilo=>suspended::122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1349] <script>: var(stored)=1, tsilo=>stored::122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: ERROR: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1357] tsilo [ts_append.c:152]: ts_append_to(): transaction 11743:1310842517: error updating dset (-1) Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1359] <script>: appending branches for sip:1000@10.160.201.190, result 1 At this moment we have active transaction `{ cell: 0x7f313d43cda8 tindex: 11743 tlabel: 1310842517 method: INVITE from: From: "9988" <sip:9988@10.156.0.6>;tag=as081c0936 to: To: <sip:1000@10.160.201.190:5070> callid: Call-ID: 66d9dace125df36915783fb379f4e3dd@10.156.0.6:5060 cseq: CSeq: 102 uas_request: yes tflags: 69 outgoings: 3 ref_count: 1 lifetime: 5402832 } ` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3782 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3782(a)github.com>

2 3

[kamailio/kamailio] Misleading source IP of 1.0.0.127 in event routes (Issue #3817)
by Jukka Väisänen 23 Apr '24

23 Apr '24

### Description Event routes that are executed without a real SIP message available use the default "fake SIP message". The fake message has a source IPv4 address of 1.0.0.127 which belongs to CloudFlare (1.0.0.0/24).. and this led us to believe that traffic is coming from CF but could not find the messages on tcpdumps or HEP exports. Had a bit of a wild goose chase there trying to find the source. I believe the original intention has been to use 127.0.0.1 loopback address but the bytes are reversed at: https://github.com/kamailio/kamailio/blob/master/src/core/fmsg.c#L78 It would be best to change this address to well ANYTHING that doesn't imply CloudFlare is pinging you 😂 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3817 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3817(a)github.com>

3 4

git:master:66b3c04a: core: fmsg - parse loopback ip when initializing faked msg structure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 66b3c04a9653425b1602c82dd2456a7eb7cf59d1 URL: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T11:19:30+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… Patch: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 7a4f9ba87e5..b30ca9f69cf 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -25,6 +25,7 @@ #include "dprint.h" #include "globals.h" #include "dset.h" +#include "resolve.h" #include "fmsg.h" @@ -57,6 +58,8 @@ static void faked_msg_buf_init(void) static int faked_msg_init_new(sip_msg_t *fmsg) { + str loip = str_init("127.0.0.1"); + faked_msg_buf_init(); /* init faked sip msg */ @@ -75,13 +78,9 @@ static int faked_msg_init_new(sip_msg_t *fmsg) fmsg->rcv.proto = PROTO_UDP; fmsg->rcv.src_port = 5060; - fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; - fmsg->rcv.src_ip.af = AF_INET; - fmsg->rcv.src_ip.len = 4; + str2ipbuf(&loip, &fmsg->rcv.src_ip); fmsg->rcv.dst_port = 5060; - fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; - fmsg->rcv.dst_ip.af = AF_INET; - fmsg->rcv.dst_ip.len = 4; + str2ipbuf(&loip, &fmsg->rcv.dst_ip); return 0; }

1 0

git:master:f5c05a68: pv: use global tcp connection callback for event route on $conid
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: f5c05a68ae72881ab0691bb8488112356fc67c79 URL: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:42:02+02:00 pv: use global tcp connection callback for event route on $conid --- Modified: src/modules/pv/pv_core.c Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… Patch: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 40557ba4628..b10b7513a6f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2927,6 +2927,13 @@ int pv_get_tcpconn_id(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(msg == NULL) return -1; + /* use first the connection set for event_route[tcp:...] */ + con = ksr_tcpcon_evcb_get(); + if(con != NULL) { + return pv_get_sintval(msg, param, res, con->id); + } + + /* find connection from sip message structure */ if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) return pv_get_null(msg, param, res); diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 97068c627bb..9c648c1f2a3 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,6 +248,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; + int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git:master:d114d117: core: tcp - set a global shortcut to tcp connection for event route
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: d114d11724dc4157e7e5809504531d26da6bcc57 URL: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:36:35+02:00 core: tcp - set a global shortcut to tcp connection for event route --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… Patch: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 5b579b2ffb9..57dff5a291b 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -434,4 +434,6 @@ typedef struct ws_event_info int id; } ws_event_info_t; +tcp_connection_t *ksr_tcpcon_evcb_get(void); + #endif diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 957a9b97c0f..2456459cfa2 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3670,6 +3670,12 @@ int _tcpconn_write_nb( return n; } +static tcp_connection_t *_ksr_tcpcon_evcb = NULL; + +tcp_connection_t *ksr_tcpcon_evcb_get(void) +{ + return _ksr_tcpcon_evcb; +} static int tcp_emit_closed_event(struct tcp_connection *con) { @@ -3692,7 +3698,9 @@ static int tcp_emit_closed_event(struct tcp_connection *con) tev.id = con->id; tev.con = con; evp.data = (void *)(&tev); + _ksr_tcpcon_evcb = con; ret = sr_event_exec(SREV_TCP_CLOSED, &evp); + _ksr_tcpcon_evcb = NULL; } else { LM_DBG("no callback registering for handling TCP closed event\n"); }

1 0

git:master:27e3b7f3: tcpops: reworked some debug messages
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81 URL: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:21:20+02:00 tcpops: reworked some debug messages --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… Patch: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 2b767a9470e..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -249,6 +249,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sr_kemi_eng_t *keng = NULL; str *evname; + LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) { rt = -1; keng = sr_kemi_eng_get(); @@ -258,9 +259,10 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) } } else { rt = tcp_closed_routes[tev->reason]; - LM_DBG("event reason id: %d rt: %d\n", tev->reason, rt); - if(rt == -1) + if(rt == -1) { + LM_DBG("event reason id: %d - event route not set\n", tev->reason); return; + } } if(faked_msg_init() < 0) {

1 0

git:master:11e7d71e: core: tcp - keep connection id on event route cb structure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 11e7d71e5c2ee9428298658ed3b9a0f625d40f00 URL: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:19:29+02:00 core: tcp - keep connection id on event route cb structure --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… Patch: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 13301563945..5b579b2ffb9 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -422,6 +422,7 @@ typedef struct tcp_event_info typedef struct tcp_closed_event_info { enum tcp_closed_reason reason; + int id; struct tcp_connection *con; } tcp_closed_event_info_t; diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index b71e7ad37f2..957a9b97c0f 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3689,6 +3689,7 @@ static int tcp_emit_closed_event(struct tcp_connection *con) if(likely(sr_event_enabled(SREV_TCP_CLOSED))) { memset(&tev, 0, sizeof(tcp_closed_event_info_t)); tev.reason = reason; + tev.id = con->id; tev.con = con; evp.data = (void *)(&tev); ret = sr_event_exec(SREV_TCP_CLOSED, &evp);

1 0

git:master:6e6b4f06: xhttp_prom: use %lu for printing pkg fields
by Daniel-Constantin Mierla 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: 6e6b4f06546a0d9ad942847ee745b17a5aeb7f6a URL: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-22T21:54:26+02:00 xhttp_prom: use %lu for printing pkg fields --- Modified: src/modules/xhttp_prom/prom.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… Patch: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index efe111b752a..71accf21845 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -253,7 +253,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) for(; i < pkg_proc_stats_no; i++) { if(prom_body_printf(ctx, "%.*spkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " - "%d %" PRIu64 "\n", + "%lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].used, ts) @@ -263,7 +263,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_available{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].available, ts) @@ -273,7 +273,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_real_used{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].real_used, ts) @@ -283,7 +283,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_total_frags{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_frags, ts) @@ -293,7 +293,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_total_size{pid=\"%u\", rank=\"%d\" " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_size, ts)

1 0

git:master:b96de87a: ipops: define hostname size for ptr structure
by Daniel-Constantin Mierla 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: b96de87ae94db2285d7a5f022c38a746d69ae5ef URL: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-22T21:43:40+02:00 ipops: define hostname size for ptr structure - replace the strncpy with strlen with straight strcpy --- Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… Patch: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 034ec696594..acbe08a4283 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -429,7 +429,7 @@ int ptr_update_pv(str *ip_address, str *name) sr_dns_item_t *dr = NULL; struct sockaddr_in sa; struct sockaddr_in6 sa6; - char hostname[256]; + char hostname[SR_DNS_HOSTNAME_SIZE]; int result; int ip_type; if(ip_address->len > INET6_ADDRSTRLEN) { @@ -499,8 +499,7 @@ int ptr_update_pv(str *ip_address, str *name) } /* Store the hostname in the sr_dns_item_t structure. */ - strncpy(dr->hostname, hostname, strlen(hostname)); - dr->hostname[strlen(hostname)] = '\0'; + strcpy(dr->hostname, hostname); dr->count = 1; LM_DBG("reverse dns PV updated for: %s (%d)\n", dr->r[0].addr, dr->count); diff --git a/src/modules/ipops/ipops_pv.h b/src/modules/ipops/ipops_pv.h index 5e9a19be1da..cede3b4217c 100644 --- a/src/modules/ipops/ipops_pv.h +++ b/src/modules/ipops/ipops_pv.h @@ -27,7 +27,7 @@ #define PV_DNS_ADDR 64 #define PV_DNS_RECS 32 #define SR_DNS_PVIDX 1 - +#define SR_DNS_HOSTNAME_SIZE 256 typedef struct _sr_dns_record { int type; @@ -38,7 +38,7 @@ typedef struct _sr_dns_item { str name; unsigned int hashid; - char hostname[256]; + char hostname[SR_DNS_HOSTNAME_SIZE]; int count; int ipv4; int ipv6;

1 0

[kamailio/kamailio] tools/kemi: add dockstrings to the mocking (PR #3818)
by tsearle 22 Apr '24

22 Apr '24

kemi_mock.py can now optionally consume documentation information generated by the vscode-kamailio-hover project   #### 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3818 -- Commit Summary -- * tools/kemi: add dockstrings to the mocking -- File Changes -- M misc/tools/kemi/python_mock/README.md (15) M misc/tools/kemi/python_mock/kemi_mock.py (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3818.patch https://github.com/kamailio/kamailio/pull/3818.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3818 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3818(a)github.com>

1 1

git:master:6b29df73: tools/kemi: add dockstrings to the mocking (#3818)
by GitHub 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: 6b29df73115682424daf7b276d0138f004e274f7 URL: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-22T12:53:48+02:00 tools/kemi: add dockstrings to the mocking (#3818) kemi_mock.py can now optionally consume documentation information generated by the vscode-kamailio-hover project --- Modified: misc/tools/kemi/python_mock/README.md Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… Patch: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… --- diff --git a/misc/tools/kemi/python_mock/README.md b/misc/tools/kemi/python_mock/README.md index 5e72e738c58..385cbd5656a 100644 --- a/misc/tools/kemi/python_mock/README.md +++ b/misc/tools/kemi/python_mock/README.md @@ -2,7 +2,7 @@ Generate a mocking framework base on the output of app_python.api_list -Usage: +### Usage: ``` /usr/sbin/kamctl rpc app_python.api_list > api.json ./kemi_mock.py api.json > KSR.py @@ -15,6 +15,19 @@ the Union type add the --no-union flag ./kemi_mock.py api.json --no-union > KSR.py ``` +### Usage with Documentation: +run the generate.py from the following project + +https://github.com/braams/vscode-kamailio-hover + +this creates a modules.json file in a tmp directory. This file can be used to generate the KSR.py file with documentation + +pass the modules.json as a 2nd parameter to kemi_mock.py +``` +./kemi_mock.py api.json modules.json > KSR.py +``` + +## Mocking Return values can be injected through the dictionary \_mock\_data ```python diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 48a73efa232..145fcb34b3a 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -113,21 +113,41 @@ def printFunction(module_name, func, indent): else: print(prefix + "def " + func['name'] +"("+params+"):") + generate_function_doc(module_name, func, prefix) + print(prefix + "\tprint(\"Calling " + log_format_params + "\" % "+log_params+")") printMocReturn(module_name, func, indent+1) print("") +def generate_function_doc(module_name, func, prefix): + if documentation is not None and module_name in documentation: + function_parts = func['name'].split("_") + for i in range(len(function_parts), 0, -1): + function_prefix = "_".join(function_parts[:i]) + if function_prefix in documentation[module_name]["functions"]: + print(prefix + "\t\"\"\"") + documentation_lines = documentation[module_name]["functions"][function_prefix].split("\n") + for line in documentation_lines: + print(prefix + "\t" + line) + print(prefix + "\t\"\"\"") + break + + classes = defaultdict(list) if len(sys.argv) < 2: print("Please specify the json file to parse") sys.exit(-1) +documentation = None if len(sys.argv) > 2: for i in range(2,len(sys.argv)): if sys.argv[i] == "--no-union": noUnion = True + else: + with open(sys.argv[i]) as f: + documentation = json.load(f) if not noUnion: print("from typing import Union") @@ -193,12 +213,23 @@ def printFunction(module_name, func, indent): print("") printFunction('', func, 0) + +def document_module(module_name): + if documentation is not None and module_name in documentation: + print("\"\"\"") + documentation_lines = documentation[module_name]["overview"].split("\n") + for line in documentation_lines: + print("" + line) + print("\"\"\"") + + for module_name in classes.keys(): if module_name != "": if module_name in reserved_keywords: print("setattr(sys.modules[__name__], '" + module_name + "', " + module_name.capitalize() + "())") else: print(module_name + " = "+module_name.capitalize()+"()") + document_module(module_name) print("")

1 0

[kamailio/kamailio] usrloc: check on db delete the return value of memchr (PR #3815)
by Rick Barenthin 20 Apr '24

20 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  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. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3815 -- Commit Summary -- * usrloc: check on db delete the return value of memchr -- File Changes -- M src/modules/usrloc/urecord.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3815.patch https://github.com/kamailio/kamailio/pull/3815.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3815 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3815(a)github.com>

3 5

git:master:49276a1f: usrloc: check on db delete the return value of memchr
by Henning Westerholt 20 Apr '24

20 Apr '24

Module: kamailio Branch: master Commit: 49276a1f43b1a3bf4a8d681888df964000360c79 URL: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-20T06:35:51+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. --- Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… Patch: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… --- diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index e027affc8aa..3c394a24a10 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -491,13 +491,17 @@ int db_delete_urecord(urecord_t *_r) vals[0].val.str_val.len = _r->aor.len; if(ul_use_domain) { - dom = memchr(_r->aor.s, '@', _r->aor.len); - vals[0].val.str_val.len = dom - _r->aor.s; - vals[1].type = DB1_STR; vals[1].nul = 0; - vals[1].val.str_val.s = dom + 1; - vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom - 1; + dom = memchr(_r->aor.s, '@', _r->aor.len); + if(dom == 0) { + vals[0].val.str_val.len = 0; + vals[1].val.str_val = _r->aor; + } else { + vals[0].val.str_val.len = dom - _r->aor.s; + vals[1].val.str_val.s = dom + 1; + vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom - 1; + } } if(ul_dbf.use_table(ul_dbh, _r->domain) < 0) {

1 0

[kamailio/kamailio] Core parameters user_agent_header fail to take effect (Issue #3816)
by suiyuemanbu 19 Apr '24

19 Apr '24

I want kamailio use User-Agent header, not Server head My setup is as follows: kamailio.cfg server_signature=no user_agent_header="User-Agent: carrierroute-kam" the result is : SIP/2.0 100 trying -- your call is important to us Via: SIP/2.0/UDP xxx From: xxxxxxtag=N856ZmNXa4S6D To: xxx Call-ID: 5ab0 CSeq: 82194 INVITE Content-Length: 0 **not have User-Agent header** please help me,How to make it appear the User-Agent field? thank you version: kamailio 5.7.0 (x86_64/linux) f1e91d -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3816 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3816(a)github.com>

2 2

git:master:d4c23324: cfgutils: initialize the optional key
by Victor Seva 18 Apr '24

18 Apr '24

Module: kamailio Branch: master Commit: d4c23324a84d9727653e0b67c4455f9cf6be3d0c URL: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-18T16:12:33+02:00 cfgutils: initialize the optional key * bug introduced at 424769743c93dea5a4d2c21f7a0ef8ea8779a5bb --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… Patch: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index f7aea690e88..487f68aaab0 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -691,7 +691,7 @@ static int cfg_lock_helper(str *lkey, str *lkey2, int mode) unsigned int pos; str *key2 = NULL; - if(lkey2 && lkey2->len > 0) { + if(lkey2 && lkey2->s && lkey2->len > 0) { key2 = lkey2; } @@ -770,7 +770,8 @@ static int cfg_trylock_key2(sip_msg_t *msg, str *lkey, str *lkey2) static int w_cfg_lock_wrapper( struct sip_msg *msg, gparam_p key, gparam_p key2, int mode) { - str s1, s2; + str s1; + str s2 = STR_NULL; if(key == NULL) { return -1; }

1 0

git:master:38226473: cfgutils: reformat exported structures
by Victor Seva 18 Apr '24

18 Apr '24

Module: kamailio Branch: master Commit: 382264730393afac09a319df46044c6ac0753ea7 URL: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-18T14:25:45+02:00 cfgutils: reformat exported structures --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6… Patch: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6…

1 0

git:master:175d755c: tcp_main: Match wss protocol
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 175d755c40bc50b78b2cf4f18ad22429289af90d URL: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Match wss protocol --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… Patch: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e3323736cc0..b71e7ad37f2 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5435,7 +5435,7 @@ int wss_send(dest_info_t *dst, const char *buf, unsigned len) if(tcp_connection_match == TCPCONN_MATCH_STRICT) { con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - PROTO_NONE); + dst->proto); } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:d81e5113: core/forward: Match protocol when forwarding
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: d81e5113884b933251499630d112ec5b1150b8a4 URL: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 core/forward: Match protocol when forwarding --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… Patch: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… --- diff --git a/src/core/forward.h b/src/core/forward.h index 46bd3a36171..7b51e1a5559 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -189,7 +189,7 @@ static inline int msg_send_buffer( if(tcp_connection_match == TCPCONN_MATCH_STRICT) { con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - PROTO_NONE); + dst->proto); } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:0a28a93c: tcp_main: Update comment docs
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 0a28a93c6e060081267dc686e342d45ef03358e7 URL: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Update comment docs --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… Patch: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 0ea1b541ea6..e3323736cc0 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1697,8 +1697,8 @@ void tcpconn_rm(struct tcp_connection *c) /* finds a connection, if id=0 uses the ip addr, port, local_ip and local port * (host byte order) and tries to find the connection that matches all of - * them. Wild cards can be used for local_ip and local_port (a 0 filled - * ip address and/or a 0 local port). + * them. Wild cards can be used for local_ip, local_port and proto (a 0 filled + * ip address and/or a 0 local port and/or PROTO_NONE). * WARNING: unprotected (locks) use tcpconn_get unless you really * know what you are doing */ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, @@ -1754,7 +1754,7 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, /** - * find if a tcp connection exits by id or remote+local address/port + * find if a tcp connection exits by id or remote+local address/port and protocol * - return: 1 if found; 0 if not found */ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, @@ -1774,6 +1774,7 @@ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, /* TCP connection find with locks and timeout * - local_addr contains the desired local ip:port. If null any local address * will be used. IN*ADDR_ANY or 0 port are wild cards. + * - proto is the protocol to match (PROTO_NONE for any) * - try_local_port makes the search use it first, instead of port from local_addr * If found, the connection's reference counter will be incremented, you might * want to decrement it after use.

1 0

git:master:6779efd4: tcp_main: Add proto argument to tcpconn_exists function
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 6779efd430178adff0ae438d178e38c003e4e05c URL: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Add proto argument to tcpconn_exists function --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… Patch: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 73e2ef6163d..0ea1b541ea6 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1758,13 +1758,12 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, * - return: 1 if found; 0 if not found */ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, - ip_addr_t *local_ip, int local_port) + ip_addr_t *local_ip, int local_port, sip_protos_t proto) { tcp_connection_t *c; TCPCONN_LOCK; - c = _tcpconn_find( - conn_id, peer_ip, peer_port, local_ip, local_port, PROTO_NONE); + c = _tcpconn_find(conn_id, peer_ip, peer_port, local_ip, local_port, proto); TCPCONN_UNLOCK; if(c) { return 1; @@ -4497,7 +4496,8 @@ static inline int handle_new_connect(struct socket_info *si) if(likely(tcpconn)) { if(tcp_accept_unique) { if(tcpconn_exists(0, &tcpconn->rcv.dst_ip, tcpconn->rcv.dst_port, - &tcpconn->rcv.src_ip, tcpconn->rcv.src_port)) { + &tcpconn->rcv.src_ip, tcpconn->rcv.src_port, + si->proto)) { LM_ERR("duplicated connection by local and remote addresses\n"); _tcpconn_free(tcpconn); tcp_safe_close(new_sock);

1 0

git:master:4a40b16d: tcp_main: Add protocol argument for searching tcp/tls connections
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8 URL: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Add protocol argument for searching tcp/tls connections --- Modified: src/core/forward.h Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… Patch: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e…

1 0

[kamailio/kamailio] tcp/docs: Added tcp_accept_iplimit config sample (PR #3792)
by Arnis Voitkāns 16 Apr '24

16 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description We noticed that configuration option tcp_accept_iplimit was included in newer kamailio versions (most notably 5.7.4), and it was a breaking change for us. Added sample configuration value in /etc/kamailio.cfg file - already tested in our production deployment. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3792 -- Commit Summary -- * tcp/docs: Added tcp_accept_iplimit config sample -- File Changes -- M etc/kamailio.cfg (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3792.patch https://github.com/kamailio/kamailio/pull/3792.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3792 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3792(a)github.com>

3 5

git:master:30a0fe2e: etc/kamailio.cfg: added tcp_accept_iplimit config sample
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 30a0fe2ea4b1b59bb8e552f9abd3a65e1c7226ec URL: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… Author: Arnis Voitkans <a.voitkans(a)dynatech.lv> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T12:40:09Z etc/kamailio.cfg: added tcp_accept_iplimit config sample --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… Patch: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 3f9a5fe793f..cd2ecd0109f 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -211,6 +211,9 @@ tcp_connection_lifetime=3605 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 +/* upper limit for TCP connections for one ip address - default 1024 */ +#tcp_accept_iplimit=1024 + #!ifdef WITH_JSONRPC tcp_accept_no_cl=yes #!endif

1 0

[kamailio/kamailio] rtpengine: fix pkg mem leak in send_rtpp_command() (PR #3813)
by vijaykumar-exotel 16 Apr '24

16 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3777 #### Description  - freed request.s after sending request to websocket in send_rtpp_command method. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3813 -- Commit Summary -- * rtpengine: fix pkg mem leak in send_rtpp_command() -- File Changes -- M src/modules/rtpengine/rtpengine.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3813.patch https://github.com/kamailio/kamailio/pull/3813.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3813 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3813(a)github.com>

2 5

git:master:b4753ae4: rtpengine: fix pkg mem leak in send_rtpp_command()
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: b4753ae4216b0c960ac094f4be8232fb4d0147b0 URL: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… Author: vijay kumar <vijay.kumar(a)exotel.in> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:38:27+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… Patch: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index c51b4742081..6d62b92900d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3672,6 +3672,7 @@ static char *send_rtpp_command( len = _rtpe_lwscb.request(&node->rn_url, (str *)&rtpe_proto, &request, &response, rtpengine_tout_ms * 1000); + pkg_free(request.s); if(len < 0) { LM_ERR("failed to do websocket request\n");

1 0

git:master:f4332447: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: f43324473bfd9b6c5db59c5691e316d32c15be81 URL: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-15T21:31:23+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… Patch: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 666f8844a52..bbe356a17d5 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1150,7 +1150,7 @@ modparam("acc", "cdr_facility", "LOG_DAEMON") Example 1.35. cdr_extra example ... -modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" +modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)") ... 6.36. cdr_extra_nullable (integer)

1 0

git:master:1adc0724: acc: docs - small fix to cdr_extra param example
by Daniel-Constantin Mierla 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 1adc07240c153b40f6bf5cb700145f8789070bcc URL: https://github.com/kamailio/kamailio/commit/1adc07240c153b40f6bf5cb700145f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-15T21:29:54+02:00 acc: docs - small fix to cdr_extra param example --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1adc07240c153b40f6bf5cb700145f8… Patch: https://github.com/kamailio/kamailio/commit/1adc07240c153b40f6bf5cb700145f8… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 69be72fe2e6..37a1365627e 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1156,7 +1156,7 @@ modparam("acc", "cdr_facility", "LOG_DAEMON") <title>cdr_extra example</title> <programlisting format="linespecific"> ... -modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" +modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)") ... </programlisting> </example>

1 0

Maintenance work overnight on kamailio.org server
by Daniel-Constantin Mierla 15 Apr '24

15 Apr '24

Hello, there is some planned work on the data center infrastructure hosting kamailio.org server that is going to affect briefly the web server (web site, wiki) and the mailing lists. The downtime is expected to be 10-15 minutes around 1:00am Western Europe time (CEST / GMT+2), but if it takes longer or repeats, be patient for a while. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 0

[kamailio/kamailio] Option to not add received via param (Issue #3515)
by zusrut 15 Apr '24

15 Apr '24

### Description Hello. Probably I'm doing something wrong but I can't get rid of **received** parameter in the **Via** header in responses from kamailio by websocket transport. According [RFC 7118](https://datatracker.ietf.org/doc/rfc7118/): `` When a SIP WebSocket Server receives a request, it MAY decide not to add a "received" parameter to the top Via header. Therefore, SIP WebSocket Clients MUST accept responses without such a parameter in the top Via header regardless of whether the **Via** "sent-by" field contains a domain name. `` ### Expected behavior For responses to websocket transport have a way to not add **received** parameter in **Via** header #### Actual observed behavior Responses to OPTION or REGISTER methods trough websocket got **received** containing IP we want to not show to the end users. ### Possible Solutions maybe add a param in **tm** module or something ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.1 (x86_64/linux) ``` and ``` kamailio 5.6.1 (x86_64/linux) b36a13 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3515 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3515(a)github.com>

4 7

git:master:70f19ddd: pkg/kamailio: app_lua_sr module relocated to archive [skip ci]
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 70f19ddd16b392f46e32b41536bde6fba8e7e14a URL: https://github.com/kamailio/kamailio/commit/70f19ddd16b392f46e32b41536bde6f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T11:09:40+02:00 pkg/kamailio: app_lua_sr module relocated to archive [skip ci] --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/70f19ddd16b392f46e32b41536bde6f… Patch: https://github.com/kamailio/kamailio/commit/70f19ddd16b392f46e32b41536bde6f… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 0696216564a..a2c1f4ac238 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -157,7 +157,7 @@ _mod_list_presence="presence presence_conference presence_dialoginfo \ rls xcap_client xcap_server" # - modules depending on lua library -_mod_list_lua="app_lua app_lua_sr" +_mod_list_lua="app_lua" # - modules depending on perl library _mod_list_perl="app_perl db_perlvdb" diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6d79bb8ec9f..a9a33082316 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2054,9 +2054,7 @@ fi %files lua %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.app_lua -%doc %{_docdir}/kamailio/modules/README.app_lua_sr %{_libdir}/kamailio/modules/app_lua.so -%{_libdir}/kamailio/modules/app_lua_sr.so %endif

1 0

git:master:0c49d30f: app_lua_sr: module relocated to archive
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 0c49d30f9d5ae1b1c4b5210851e30725dfa7aa8b URL: https://github.com/kamailio/kamailio/commit/0c49d30f9d5ae1b1c4b5210851e3072… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T11:09:02+02:00 app_lua_sr: module relocated to archive --- Modified: src/Makefile.groups Removed: src/modules/app_lua_sr/Makefile Removed: src/modules/app_lua_sr/README Removed: src/modules/app_lua_sr/app_lua_sr_api.c Removed: src/modules/app_lua_sr/app_lua_sr_api.h Removed: src/modules/app_lua_sr/app_lua_sr_exp.c Removed: src/modules/app_lua_sr/app_lua_sr_exp.h Removed: src/modules/app_lua_sr/app_lua_sr_mod.c Removed: src/modules/app_lua_sr/doc/Makefile Removed: src/modules/app_lua_sr/doc/app_lua_sr.xml Removed: src/modules/app_lua_sr/doc/app_lua_sr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0c49d30f9d5ae1b1c4b5210851e3072… Patch: https://github.com/kamailio/kamailio/commit/0c49d30f9d5ae1b1c4b5210851e3072…

1 0

git:master:94b9cd5d: modules: readme files regenerated - cfgutils ... [skip ci]
by Kamailio Dev 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 94b9cd5d5ffafde86fbcbede2d9a018fc616b6b1 URL: https://github.com/kamailio/kamailio/commit/94b9cd5d5ffafde86fbcbede2d9a018… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-15T11:01:29+02:00 modules: readme files regenerated - cfgutils ... [skip ci] --- Modified: src/modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/94b9cd5d5ffafde86fbcbede2d9a018… Patch: https://github.com/kamailio/kamailio/commit/94b9cd5d5ffafde86fbcbede2d9a018… --- diff --git a/src/modules/cfgutils/README b/src/modules/cfgutils/README index b7c8075fad9..cb6251b6719 100644 --- a/src/modules/cfgutils/README +++ b/src/modules/cfgutils/README @@ -65,9 +65,9 @@ Daniel-Constantin Mierla 4.12. set_gflag(flag) 4.13. reset_gflag(flag) 4.14. is_gflag(flag) - 4.15. lock(key) - 4.16. trylock(key) - 4.17. unlock(key) + 4.15. lock(key [, key2]) + 4.16. trylock(key [, key2]) + 4.17. unlock(key [, key2]) 4.18. check_route_exists(route) 4.19. route_if_exists(route) 4.20. core_hash(string1, string2, size) @@ -154,9 +154,9 @@ Chapter 1. Admin Guide 4.12. set_gflag(flag) 4.13. reset_gflag(flag) 4.14. is_gflag(flag) - 4.15. lock(key) - 4.16. trylock(key) - 4.17. unlock(key) + 4.15. lock(key [, key2]) + 4.16. trylock(key [, key2]) + 4.17. unlock(key [, key2]) 4.18. check_route_exists(route) 4.19. route_if_exists(route) 4.20. core_hash(string1, string2, size) @@ -304,9 +304,9 @@ modparam("cfgutils", "lock_set_size", 4) 4.12. set_gflag(flag) 4.13. reset_gflag(flag) 4.14. is_gflag(flag) - 4.15. lock(key) - 4.16. trylock(key) - 4.17. unlock(key) + 4.15. lock(key [, key2]) + 4.16. trylock(key [, key2]) + 4.17. unlock(key [, key2]) 4.18. check_route_exists(route) 4.19. route_if_exists(route) 4.20. core_hash(string1, string2, size) @@ -506,16 +506,18 @@ if(is_gflag("4")) }; ... -4.15. lock(key) +4.15. lock(key [, key2]) Lock the key. Can be used to synchronize operations in config file, a - hash id is computed over the key and appropriate lock is set in the + hash id is computed over the keys and appropriate lock is set in the lock array controlled by parameter "lock_set_size". Do not use lock() after another lock() unless you are sure the keys hit different array entries. ��key�� can be static string or string with PVs. + ��key2�� is optional and can be static string or string with PVs. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. @@ -524,13 +526,15 @@ if(is_gflag("4")) lock("$rU"); ... -4.16. trylock(key) +4.16. trylock(key [, key2]) Try to lock the key. If the lock can not be obtained (possibly already locked), the function returns an error and script execution continues. ��key�� can be static string or string with PVs. + ��key2�� is optional and can be static string or string with PVs. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. @@ -542,12 +546,14 @@ if (trylock("$rU")) { } ... -4.17. unlock(key) +4.17. unlock(key [, key2]) Unlock the key. ��key�� can be static string or string with PVs. + ��key2�� is optional and can be static string or string with PVs. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE.

1 0

[kamailio/kamailio] cfgutils lock (PR #3808)
by Victor Seva 15 Apr '24

15 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) - [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 #### Description expose in config via cfgutils ``core_case_hash`` optional second string key for hashing You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3808 -- Commit Summary -- * cfgutils: expose optional second string key for hashing at locks * cfgutils: document second optional string for hashing on lock functions family [skip ci] * app_lua_sr: support second str for cfgutils lock -- File Changes -- M src/modules/app_lua_sr/app_lua_sr_exp.c (30) M src/modules/cfgutils/api.h (4) M src/modules/cfgutils/cfgutils.c (103) M src/modules/cfgutils/doc/cfgutils_admin.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3808.patch https://github.com/kamailio/kamailio/pull/3808.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3808 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3808(a)github.com>

2 2

git:master:92ac41c1: app_lua_sr: support second str for cfgutils lock
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 92ac41c1e770077d39516fc049358b3c3897d590 URL: https://github.com/kamailio/kamailio/commit/92ac41c1e770077d39516fc049358b3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T10:50:26+02:00 app_lua_sr: support second str for cfgutils lock --- Modified: src/modules/app_lua_sr/app_lua_sr_exp.c --- Diff: https://github.com/kamailio/kamailio/commit/92ac41c1e770077d39516fc049358b3… Patch: https://github.com/kamailio/kamailio/commit/92ac41c1e770077d39516fc049358b3… --- diff --git a/src/modules/app_lua_sr/app_lua_sr_exp.c b/src/modules/app_lua_sr/app_lua_sr_exp.c index 522f0cfb87a..80a4cb69042 100644 --- a/src/modules/app_lua_sr/app_lua_sr_exp.c +++ b/src/modules/app_lua_sr/app_lua_sr_exp.c @@ -2783,20 +2783,29 @@ static const luaL_Reg _sr_sanity_Map[] = { static int lua_sr_cfgutils_lock(lua_State *L) { int ret; - str lkey; + str lkey, lkey2; if(!(_sr_lua_exp_reg_mods & SR_LUA_EXP_MOD_CFGUTILS)) { LM_WARN("weird: cfgutils function executed but module not " "registered\n"); return app_lua_return_error(L); } - if(lua_gettop(L) != 1) { + ret = lua_gettop(L); + if(ret < 1 || ret > 3) { LM_WARN("invalid number of parameters from Lua\n"); return app_lua_return_error(L); } + if(ret > 1) { + lkey2.s = (char *)lua_tostring(L, -1); + lkey2.len = strlen(lkey2.s); + } lkey.s = (char *)lua_tostring(L, -1); lkey.len = strlen(lkey.s); - ret = _lua_cfgutilsb.mlock(&lkey); + if(ret > 1) { + ret = _lua_cfgutilsb.mlock(&lkey, &lkey2); + } else { + ret = _lua_cfgutilsb.mlock(&lkey, NULL); + } return app_lua_return_int(L, ret); } @@ -2808,20 +2817,29 @@ static int lua_sr_cfgutils_lock(lua_State *L) static int lua_sr_cfgutils_unlock(lua_State *L) { int ret; - str lkey; + str lkey, lkey2; if(!(_sr_lua_exp_reg_mods & SR_LUA_EXP_MOD_CFGUTILS)) { LM_WARN("weird: cfgutils function executed but module not " "registered\n"); return app_lua_return_error(L); } - if(lua_gettop(L) != 1) { + ret = lua_gettop(L); + if(ret < 1 || ret > 3) { LM_WARN("invalid number of parameters from Lua\n"); return app_lua_return_error(L); } + if(ret > 1) { + lkey2.s = (char *)lua_tostring(L, -1); + lkey2.len = strlen(lkey2.s); + } lkey.s = (char *)lua_tostring(L, -1); lkey.len = strlen(lkey.s); - ret = _lua_cfgutilsb.munlock(&lkey); + if(ret > 1) { + ret = _lua_cfgutilsb.munlock(&lkey, &lkey2); + } else { + ret = _lua_cfgutilsb.munlock(&lkey, NULL); + } return app_lua_return_int(L, ret); }

1 0

git:master:235591cd: cfgutils: document second optional string for hashing on lock functions family [skip ci]
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 235591cd704529589bbde700b6232ac55281d071 URL: https://github.com/kamailio/kamailio/commit/235591cd704529589bbde700b6232ac… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T10:50:26+02:00 cfgutils: document second optional string for hashing on lock functions family [skip ci] --- Modified: src/modules/cfgutils/doc/cfgutils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/235591cd704529589bbde700b6232ac… Patch: https://github.com/kamailio/kamailio/commit/235591cd704529589bbde700b6232ac… --- diff --git a/src/modules/cfgutils/doc/cfgutils_admin.xml b/src/modules/cfgutils/doc/cfgutils_admin.xml index 1cab1284fd5..35721e31c6d 100644 --- a/src/modules/cfgutils/doc/cfgutils_admin.xml +++ b/src/modules/cfgutils/doc/cfgutils_admin.xml @@ -485,10 +485,10 @@ if(is_gflag("4")) </example> </section> <section id="cfgutils.f.lock"> - <title><function moreinfo="none">lock(key)</function></title> + <title><function moreinfo="none">lock(key [, key2])</function></title> <para> Lock the key. Can be used to synchronize operations in config file, - a hash id is computed over the key and appropriate lock is set in the + a hash id is computed over the keys and appropriate lock is set in the lock array controlled by parameter "lock_set_size". Do not use lock() after another lock() unless you are sure the keys hit different array entries. @@ -497,6 +497,9 @@ if(is_gflag("4")) <quote>key</quote> can be static string or string with PVs. </para> <para> + <quote>key2</quote> is optional and can be static string or string with PVs. + </para> + <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. </para> @@ -510,7 +513,7 @@ lock("$rU"); </example> </section> <section id="cfgutils.f.trylock"> - <title><function moreinfo="none">trylock(key)</function></title> + <title><function moreinfo="none">trylock(key [, key2])</function></title> <para> Try to lock the key. If the lock can not be obtained (possibly already locked), the function returns an error and script execution continues. @@ -519,6 +522,9 @@ lock("$rU"); <quote>key</quote> can be static string or string with PVs. </para> <para> + <quote>key2</quote> is optional and can be static string or string with PVs. + </para> + <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. </para> @@ -535,7 +541,7 @@ if (trylock("$rU")) { </example> </section> <section id="cfgutils.f.unlock"> - <title><function moreinfo="none">unlock(key)</function></title> + <title><function moreinfo="none">unlock(key [, key2])</function></title> <para> Unlock the key. </para> @@ -543,6 +549,9 @@ if (trylock("$rU")) { <quote>key</quote> can be static string or string with PVs. </para> <para> + <quote>key2</quote> is optional and can be static string or string with PVs. + </para> + <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. </para> @@ -854,4 +863,3 @@ if (rand_event()) { </section> </section> </chapter> -

1 0

git:master:42476974: cfgutils: expose optional second string key for hashing at locks
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 424769743c93dea5a4d2c21f7a0ef8ea8779a5bb URL: https://github.com/kamailio/kamailio/commit/424769743c93dea5a4d2c21f7a0ef8e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T10:50:26+02:00 cfgutils: expose optional second string key for hashing at locks --- Modified: src/modules/cfgutils/api.h Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/424769743c93dea5a4d2c21f7a0ef8e… Patch: https://github.com/kamailio/kamailio/commit/424769743c93dea5a4d2c21f7a0ef8e…

1 0

git:master:0fae1026: pkg/kamailio/deb: version 5.9.0~dev1 [skip ci]
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 0fae1026d49aa765b4451d2534972b57a2c09998 URL: https://github.com/kamailio/kamailio/commit/0fae1026d49aa765b4451d2534972b5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T08:59:53+02:00 pkg/kamailio/deb: version 5.9.0~dev1 [skip ci] reset debian/changelog for 5.9.x series --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0fae1026d49aa765b4451d2534972b5… Patch: https://github.com/kamailio/kamailio/commit/0fae1026d49aa765b4451d2534972b5…

1 0

git:master:39ca2874: Makefile.defs: version set to 5.9.0-dev1
by Daniel-Constantin Mierla 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 39ca28748162e940bd91bf4e0cb0b1223b5f9138 URL: https://github.com/kamailio/kamailio/commit/39ca28748162e940bd91bf4e0cb0b12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-15T07:19:31+02:00 Makefile.defs: version set to 5.9.0-dev1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/39ca28748162e940bd91bf4e0cb0b12… Patch: https://github.com/kamailio/kamailio/commit/39ca28748162e940bd91bf4e0cb0b12… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 4165ca084fb..9feece65535 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 9 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:7bc702b7: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 14 Apr '24

14 Apr '24

Module: kamailio Branch: master Commit: 7bc702b79bb07901c0925c9842b75ad3d818b4e1 URL: https://github.com/kamailio/kamailio/commit/7bc702b79bb07901c0925c9842b75ad… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-14T15:46:26+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/7bc702b79bb07901c0925c9842b75ad… Patch: https://github.com/kamailio/kamailio/commit/7bc702b79bb07901c0925c9842b75ad… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 4520bce8333..75f47f5f445 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -851,6 +851,7 @@ sht_rm_value_re("ha=>.*"); The op parameter can be: * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. + * ew - match the val parameter as 'ends with'. All parameters can be static strings or contain variables. @@ -869,6 +870,7 @@ sht_rm_name("ha", "re", ".*"); The op parameter can be: * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. + * ew - match the val parameter as 'ends with'. All parameters can be static strings or contain variables.

1 0

git:master:bb093505: htable: docs for sw operator for functions removing items
by Daniel-Constantin Mierla 14 Apr '24

14 Apr '24

Module: kamailio Branch: master Commit: bb093505c5c5f625339f85961518f9db3fd6725d URL: https://github.com/kamailio/kamailio/commit/bb093505c5c5f625339f85961518f9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-14T15:41:31+02:00 htable: docs for sw operator for functions removing items --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bb093505c5c5f625339f85961518f9d… Patch: https://github.com/kamailio/kamailio/commit/bb093505c5c5f625339f85961518f9d… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 69ad5e64581..c5cc20e22ed 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -910,6 +910,12 @@ sht_rm_value_re("ha=>.*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>ew</emphasis> - match the val parameter as 'ends + with'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables. @@ -950,6 +956,12 @@ sht_rm_name("ha", "re", ".*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>ew</emphasis> - match the val parameter as 'ends + with'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables.

1 0

git:master:29a890ff: htable: add ew (end-with) operator for delete items functions
by Daniel-Constantin Mierla 14 Apr '24

14 Apr '24

Module: kamailio Branch: master Commit: 29a890ffdcd394d26d53bd0951c7ca58262c7696 URL: https://github.com/kamailio/kamailio/commit/29a890ffdcd394d26d53bd0951c7ca5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-14T15:29:57+02:00 htable: add ew (end-with) operator for delete items functions --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/29a890ffdcd394d26d53bd0951c7ca5… Patch: https://github.com/kamailio/kamailio/commit/29a890ffdcd394d26d53bd0951c7ca5… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 2391cb5c5d0..afda3dc6c54 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1033,7 +1033,7 @@ int ht_table_spec(char *spec) coldelim = tok.s[0]; LM_DBG("htable [%.*s] - coldelim [%c]\n", name.len, name.s, - coldelim); + coldelim); } else if(pit->name.len == 7 && strncmp(pit->name.s, "colnull", 7) == 0) { if(tok.len > 1) @@ -1045,8 +1045,7 @@ int ht_table_spec(char *spec) colnull = tok.s[0]; } - LM_DBG("htable [%.*s] - colnull [%c]\n", name.len, name.s, - colnull); + LM_DBG("htable [%.*s] - colnull [%c]\n", name.len, name.s, colnull); } else { goto error; } @@ -1383,7 +1382,15 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) && strncmp(it->name.s, sre->s, sre->len) == 0) { match = 1; } + } else if(op == HT_RM_OP_EW) { + if(sre->len <= it->name.len + && strncmp(it->name.s + it->name.len - sre->len, + sre->s, sre->len) + == 0) { + match = 1; + } } + } else { if(op == HT_RM_OP_SW) { if(it->flags & AVP_VAL_STR) { @@ -1393,6 +1400,16 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) match = 1; } } + } else if(op == HT_RM_OP_EW) { + if(it->flags & AVP_VAL_STR) { + if(sre->len <= it->value.s.len + && strncmp(it->value.s.s + it->value.s.len + - sre->len, + sre->s, sre->len) + == 0) { + match = 1; + } + } } } if(match == 1) { diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index e24a93b1f17..7c7642ef5df 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -124,6 +124,7 @@ int ht_reset_content(ht_t *ht); #define HT_RM_OP_EQ 1 #define HT_RM_OP_NE 2 #define HT_RM_OP_SW 3 +#define HT_RM_OP_EW 3 #define HT_RM_OP_RE 4 int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op); int ht_match_cell_op_str(str *sre, ht_t *ht, int mode, int op); diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index bc5f18830be..7577e445a76 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -39,7 +39,8 @@ typedef enum HT_DMQ_SET_CELL_EXPIRE, HT_DMQ_DEL_CELL, HT_DMQ_RM_CELL_RE, - HT_DMQ_RM_CELL_SW + HT_DMQ_RM_CELL_SW, + HT_DMQ_RM_CELL_EW } ht_dmq_action_t; int ht_dmq_initialize(); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 0fcd280de9c..6f775bb33ce 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -515,6 +515,18 @@ static int ht_rm_items(sip_msg_t *msg, str *hname, str *op, str *val, int mkey) return -1; } return 1; + } else if(strncmp(op->s, "ew", 2) == 0) { + isval.s = *val; + if((ht->dmqreplicate > 0) + && ht_dmq_replicate_action(HT_DMQ_RM_CELL_EW, &ht->name, + NULL, AVP_VAL_STR, &isval, mkey) + != 0) { + LM_ERR("dmq replication failed (op %d)\n", mkey); + } + if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_EW) < 0) { + return -1; + } + return 1; } LM_WARN("unsupported match operator: %.*s\n", op->len, op->s); break;

1 0

git:master:671b874a: nghttp2: clear response headers on event route
by Daniel-Constantin Mierla 13 Apr '24

13 Apr '24

Module: kamailio Branch: master Commit: 671b874a31fb10c6c9e9a246358928f202fc669d URL: https://github.com/kamailio/kamailio/commit/671b874a31fb10c6c9e9a246358928f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-13T21:24:54+02:00 nghttp2: clear response headers on event route --- Modified: src/modules/nghttp2/nghttp2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/671b874a31fb10c6c9e9a246358928f… Patch: https://github.com/kamailio/kamailio/commit/671b874a31fb10c6c9e9a246358928f…

1 0

git:master:a368140d: nghttp2: fix typo in filed type
by Daniel-Constantin Mierla 13 Apr '24

13 Apr '24

Module: kamailio Branch: master Commit: a368140d8d32a68ccc21845aad95e43c98a802d7 URL: https://github.com/kamailio/kamailio/commit/a368140d8d32a68ccc21845aad95e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-13T08:58:20+02:00 nghttp2: fix typo in filed type --- Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/a368140d8d32a68ccc21845aad95e43… Patch: https://github.com/kamailio/kamailio/commit/a368140d8d32a68ccc21845aad95e43… --- diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index 8b343fd11ce..ac69a147313 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -79,7 +79,7 @@ typedef struct http2_stream_data char *request_path; char *request_pathfull; char *request_method; - ttp2_msghdr_t *hdrlist; + http2_msghdr_t *hdrlist; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:702e9cdb: nghttp2: structure to hold headers in stream data
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: 702e9cdbe8c6ca5856c25f9737d77e3223bbf9ce URL: https://github.com/kamailio/kamailio/commit/702e9cdbe8c6ca5856c25f9737d77e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: structure to hold headers in stream data --- Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/702e9cdbe8c6ca5856c25f9737d77e3… Patch: https://github.com/kamailio/kamailio/commit/702e9cdbe8c6ca5856c25f9737d77e3… --- diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index cad3772d9ef..8b343fd11ce 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -66,12 +66,20 @@ struct app_context; typedef struct app_context app_context; +typedef struct http2_msghdr +{ + str name; + str value; + struct http2_msghdr *next; +} http2_msghdr_t; + typedef struct http2_stream_data { struct http2_stream_data *prev, *next; char *request_path; char *request_pathfull; char *request_method; + ttp2_msghdr_t *hdrlist; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:a8481f58: nghttp2: debug message instead of error on peer disconnect
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: a8481f588d5461285e512a0b68803ffc0f41d7b3 URL: https://github.com/kamailio/kamailio/commit/a8481f588d5461285e512a0b68803ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: debug message instead of error on peer disconnect --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/a8481f588d5461285e512a0b68803ff… Patch: https://github.com/kamailio/kamailio/commit/a8481f588d5461285e512a0b68803ff… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index d5153bef0c6..d8c23220a13 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -221,7 +221,7 @@ static void delete_http2_session_data(http2_session_data *session_data) { http2_stream_data *stream_data; SSL *ssl = bufferevent_openssl_get_ssl(session_data->bev); - LM_ERR("%s disconnected\n", session_data->client_addr); + LM_DBG("remote peer %s disconnected\n", session_data->client_addr); if(ssl) { SSL_shutdown(ssl); }

1 0

git:master:11c5ed67: nghttp2: debug with data content
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: 11c5ed679193c4cc94957c0a5948e07bfbfcfee9 URL: https://github.com/kamailio/kamailio/commit/11c5ed679193c4cc94957c0a5948e07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: debug with data content --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/11c5ed679193c4cc94957c0a5948e07… Patch: https://github.com/kamailio/kamailio/commit/11c5ed679193c4cc94957c0a5948e07… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 8c17f847f87..d5153bef0c6 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -560,6 +560,27 @@ static int on_frame_recv_callback( return 0; } +/* + * The implementation of nghttp2_on_data_chunk_recv_callback type. + * - function to get the received body. + */ +static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags, + int32_t stream_id, const uint8_t *data, size_t len, void *user_data) +{ + struct Request *req; + (void)flags; + (void)user_data; + + req = nghttp2_session_get_stream_user_data(session, stream_id); + if(req) { + LM_DBG("---------------------------- (DATA chunk) [%lu bytes]\n", + (unsigned long int)len); + LM_DBG("[[%.*s]]", (int)len, (char *)data); + LM_DBG("----------------------------\n"); + } + return 0; +} + static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id, uint32_t error_code, void *user_data) { @@ -587,6 +608,9 @@ static void initialize_nghttp2_session(http2_session_data *session_data) nghttp2_session_callbacks_set_on_frame_recv_callback( callbacks, on_frame_recv_callback); + nghttp2_session_callbacks_set_on_data_chunk_recv_callback( + callbacks, on_data_chunk_recv_callback); + nghttp2_session_callbacks_set_on_stream_close_callback( callbacks, on_stream_close_callback);

1 0

git:master:2b8d5877: nghttp2: added $nghttp2(pathfull) - full http path with all params
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: 2b8d587713d96fbee31534b9b16f2c2b432e2e68 URL: https://github.com/kamailio/kamailio/commit/2b8d587713d96fbee31534b9b16f2c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: added $nghttp2(pathfull) - full http path with all params --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/2b8d587713d96fbee31534b9b16f2c2… Patch: https://github.com/kamailio/kamailio/commit/2b8d587713d96fbee31534b9b16f2c2… --- diff --git a/src/modules/nghttp2/nghttp2_mod.c b/src/modules/nghttp2/nghttp2_mod.c index 95918b1e6c8..c3e05e50b05 100644 --- a/src/modules/nghttp2/nghttp2_mod.c +++ b/src/modules/nghttp2/nghttp2_mod.c @@ -218,6 +218,14 @@ int pv_parse_nghttp2_name(pv_spec_p sp, str *in) goto error; } break; + case 8: + if(strncasecmp(in->s, "pathfull", 8) == 0) { + sp->pvp.pvn.u.isname.name.n = 6; + } else { + goto error; + } + break; + default: if(in->len > 2 && in->s[1] == ':' && (in->s[0] == 'h' || in->s[0] == 'H')) { @@ -275,6 +283,9 @@ int pv_get_nghttp2(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.srcip); } return pv_get_null(msg, param, res); + case 6: /* pathfull */ + return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.pathfull); + default: return pv_get_null(msg, param, res); } diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index dec339d7a15..8c17f847f87 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -179,7 +179,12 @@ static void delete_http2_stream_data(http2_stream_data *stream_data) close(stream_data->fd); } free(stream_data->request_path); - free(stream_data->request_method); + if(stream_data->request_pathfull) { + free(stream_data->request_pathfull); + } + if(stream_data->request_method) { + free(stream_data->request_method); + } free(stream_data); } @@ -460,6 +465,7 @@ static int on_header_callback(nghttp2_session *session, for(j = 0; j < valuelen && value[j] != '?'; ++j) ; stream_data->request_path = percent_decode(value, j); + stream_data->request_pathfull = percent_decode(value, valuelen); } else if(namelen == sizeof(METHOD) - 1 && memcmp(METHOD, name, namelen) == 0) { if(stream_data->request_method) { diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index 34e6155abfc..cad3772d9ef 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -70,6 +70,7 @@ typedef struct http2_stream_data { struct http2_stream_data *prev, *next; char *request_path; + char *request_pathfull; char *request_method; int32_t stream_id; int fd; @@ -100,6 +101,7 @@ typedef struct ksr_nghttp2_ctx int rplhdrs_n; str method; str path; + str pathfull; str httpversion; str data; char srcipbuf[IP_ADDR_MAX_STR_SIZE];

1 0

[kamailio/kamailio] corex.list_sockets broken output (Issue #3799)
by sergey-safarov 11 Apr '24

11 Apr '24

### Description I found `corex.list_sockets` does not show the address family (`af`) properly But `core.sockets_list` properly shows the address family (`af`). ### Troubleshooting #### Reproduction Required to create a config file with content like ``` loadmodule "pv.so" loadmodule "ctl.so" loadmodule "corex.so" listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 request_route { drop; } ``` Start kamailio and then execute ```sh kamcmd corex.list_sockets ``` The output will be like ``` { af: unknown proto: udp name: 127.0.0.1 addrlist: { addr: 127.0.0.1 } port: 5060 sockstr: udp:127.0.0.1:5060 mcast: no mhomed: no virtual: no sockname: - advertise: - } { af: unknown proto: udp name: ::1 addrlist: { addr: ::1 } port: 5060 sockstr: udp:[::1]:5060 mcast: no mhomed: no virtual: no sockname: - advertise: - } ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.9.0-dev0 (aarch64/linux) 206399 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT-NOSMP, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 206399 compiled on 12:57:52 Mar 30 2024 with gcc 8.5.0 ``` * **Operating System**: ``` NAME="CentOS Stream" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Stream 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux 8" REDHAT_SUPPORT_PRODUCT_VERSION="CentOS Stream" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3799 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3799(a)github.com>

2 3

git:master:8bc64a9e: corex: Fix unknown af in list_sockets
by Xenofon Karamanos 11 Apr '24

11 Apr '24

Module: kamailio Branch: master Commit: 8bc64a9e6820243336387d9cd9acf81f24d89993 URL: https://github.com/kamailio/kamailio/commit/8bc64a9e6820243336387d9cd9acf81… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-11T14:11:03+03:00 corex: Fix unknown af in list_sockets --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/8bc64a9e6820243336387d9cd9acf81… Patch: https://github.com/kamailio/kamailio/commit/8bc64a9e6820243336387d9cd9acf81… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index fa553fbf911..90f2e124125 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -61,8 +61,8 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) return; } - if(rpc->struct_add(th, "sss{", "af", get_af_name(proto), "proto", - get_valid_proto_name(proto), "name", si->name.s, + if(rpc->struct_add(th, "sss{", "af", get_af_name(si->address.af), + "proto", get_valid_proto_name(proto), "name", si->name.s, "addrlist", &ih) < 0) { rpc->fault(ctx, 500, "Internal error address list structure");

1 0

[kamailio/kamailio] corex: Fix unknown af in list_sockets rpc call (PR #3811)
by Xenofon Karamanos 11 Apr '24

11 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3799 #### Description  This PR fixes the unknown address family when calling `corex.list_sockets` rpc call by providing the correct argument (address.af) to `get_af_name()` instead of proto. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3811 -- Commit Summary -- * corex: Fix unknown af in list_sockets -- File Changes -- M src/modules/corex/corex_rpc.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3811.patch https://github.com/kamailio/kamailio/pull/3811.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3811 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3811(a)github.com>

1 1

git:master:9a43631e: nghttp2: store method in stream data
by Daniel-Constantin Mierla 10 Apr '24

10 Apr '24

Module: kamailio Branch: master Commit: 9a43631e1707490c0781f9d2d10055663ebcde44 URL: https://github.com/kamailio/kamailio/commit/9a43631e1707490c0781f9d2d100556… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-10T08:07:30+02:00 nghttp2: store method in stream data --- Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/9a43631e1707490c0781f9d2d100556… Patch: https://github.com/kamailio/kamailio/commit/9a43631e1707490c0781f9d2d100556… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 38ae3673d46..dec339d7a15 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -179,6 +179,7 @@ static void delete_http2_stream_data(http2_stream_data *stream_data) close(stream_data->fd); } free(stream_data->request_path); + free(stream_data->request_method); free(stream_data); } @@ -436,6 +437,7 @@ static int on_header_callback(nghttp2_session *session, { http2_stream_data *stream_data; const char PATH[] = ":path"; + const char METHOD[] = ":method"; (void)flags; (void)user_data; @@ -446,15 +448,25 @@ static int on_header_callback(nghttp2_session *session, } stream_data = nghttp2_session_get_stream_user_data( session, frame->hd.stream_id); - if(!stream_data || stream_data->request_path) { + if(!stream_data) { break; } if(namelen == sizeof(PATH) - 1 && memcmp(PATH, name, namelen) == 0) { size_t j; + if(stream_data->request_path) { + break; + } for(j = 0; j < valuelen && value[j] != '?'; ++j) ; stream_data->request_path = percent_decode(value, j); + } else if(namelen == sizeof(METHOD) - 1 + && memcmp(METHOD, name, namelen) == 0) { + if(stream_data->request_method) { + break; + } + stream_data->request_method = + strndup((const char *)value, valuelen); } break; } @@ -497,8 +509,15 @@ static int on_request_recv(nghttp2_session *session, _ksr_nghttp2_ctx.path.s = stream_data->request_path; _ksr_nghttp2_ctx.path.len = strlen(_ksr_nghttp2_ctx.path.s); - _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; - _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); + if(stream_data->request_method) { + _ksr_nghttp2_ctx.method.s = stream_data->request_method; + _ksr_nghttp2_ctx.method.len = strlen(_ksr_nghttp2_ctx.method.s); + } + + if(session_data->client_addr) { + _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; + _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); + } ksr_event_route(); diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index bb5e446631c..34e6155abfc 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -70,6 +70,7 @@ typedef struct http2_stream_data { struct http2_stream_data *prev, *next; char *request_path; + char *request_method; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:7fb51562: nghttp2: $nghttp2(url) replaced with $nghttp2(path)
by Daniel-Constantin Mierla 10 Apr '24

10 Apr '24

Module: kamailio Branch: master Commit: 7fb51562233c8b94a4bb38e4bcb8c7529937ed9e URL: https://github.com/kamailio/kamailio/commit/7fb51562233c8b94a4bb38e4bcb8c75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-10T07:31:18+02:00 nghttp2: $nghttp2(url) replaced with $nghttp2(path) - match corresponding http2 header name --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/7fb51562233c8b94a4bb38e4bcb8c75… Patch: https://github.com/kamailio/kamailio/commit/7fb51562233c8b94a4bb38e4bcb8c75… --- diff --git a/src/modules/nghttp2/nghttp2_mod.c b/src/modules/nghttp2/nghttp2_mod.c index de7a13485bf..95918b1e6c8 100644 --- a/src/modules/nghttp2/nghttp2_mod.c +++ b/src/modules/nghttp2/nghttp2_mod.c @@ -186,15 +186,10 @@ int pv_parse_nghttp2_name(pv_spec_p sp, str *in) if(sp == NULL || in == NULL || in->len <= 0) return -1; switch(in->len) { - case 3: - if(strncasecmp(in->s, "url", 3) == 0) { - sp->pvp.pvn.u.isname.name.n = 0; - } else { - goto error; - } - break; case 4: - if(strncasecmp(in->s, "data", 4) == 0) { + if(strncasecmp(in->s, "path", 4) == 0) { + sp->pvp.pvn.u.isname.name.n = 0; + } else if(strncasecmp(in->s, "data", 4) == 0) { sp->pvp.pvn.u.isname.name.n = 1; } else if(strncasecmp(in->s, "size", 4) == 0) { sp->pvp.pvn.u.isname.name.n = 2; @@ -264,8 +259,8 @@ int pv_get_nghttp2(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } switch(param->pvn.u.isname.name.n) { - case 0: /* url */ - return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.url); + case 0: /* path */ + return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.path); case 1: /* data */ return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.data); case 2: /* size */ diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 46b4e003462..38ae3673d46 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -494,8 +494,8 @@ static int on_request_recv(nghttp2_session *session, _ksr_nghttp2_ctx.session_data = session_data; _ksr_nghttp2_ctx.stream_data = stream_data; - _ksr_nghttp2_ctx.url.s = stream_data->request_path; - _ksr_nghttp2_ctx.url.len = strlen(_ksr_nghttp2_ctx.url.s); + _ksr_nghttp2_ctx.path.s = stream_data->request_path; + _ksr_nghttp2_ctx.path.len = strlen(_ksr_nghttp2_ctx.path.s); _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index dc1f5f148c6..bb5e446631c 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -98,7 +98,7 @@ typedef struct ksr_nghttp2_ctx nghttp2_nv rplhdrs_v[KSR_NGHTTP2_RPLHDRS_SIZE]; int rplhdrs_n; str method; - str url; + str path; str httpversion; str data; char srcipbuf[IP_ADDR_MAX_STR_SIZE];

1 0

[kamailio/kamailio] User id conflict between kamctl et. al. and Linux OS installations (Issue #3752)
by Mark Warren 10 Apr '24

10 Apr '24

### Description After installing kamailio on Ubuntu (20.04 and 22.04) using normal kamailio.org instructions, things work fine. However, a developer is working on a large project as root, and occasionally restarts kamailio with the command "kamctl <start|stop|restart>", rather than the OS command "systemctl <stop|start|restart> kamailio". After that, any attempt to restart or check status using systmectl fails, and rebooting the server occasionally fails to restart kamailio. ### Troubleshooting #### Reproduction Install ubuntu 22.04 or 20.04. When up and running, try this: `systemctl status kamailio` (everything looks good) `ps -C kamailio -o comm,uid,euid,pid,ppid` (all happy, Kamailio running as user kamailio) `kamctl restart` `ps -C kamailio -o comm,uid,euid,pid,ppid` (Yes it's running, but as root, not kamailio) `systemctl status kamailio` (FAILS, 20.04 reports "Failed to start", 22.04 reports "kamailio.service: Deactivated successfully") `systemctl restart kamailio` (FAILS - same reports as preceding "status" command) #### Debugging Data  #### Log Messages  After command systemctl restart kamailio: ``` Feb 9 18:30:02 usdc2-lab-drproxy02 kamailio: INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Feb 9 18:30:02 usdc2-lab-drproxy02 kamailio: INFO: <core> [core/tcp_main.c:5042]: init_tcp(): using epoll_lt as the io watch method (auto detected) Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: rr [rr_mod.c:177]: mod_init(): outbound module not available Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: auth [auth_mod.c:345]: mod_init(): qop set, but nonce-count (nc_enabled) support disabled Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [main.c:2779]: main(): processes (at least): 32 - shm size: 67108864 - pkg size: 8388608 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: ERROR: <core> [core/tcp_main.c:3162]: tcp_init(): bind(c, 0x7f49b0475c74, 16) on 127.0.0.1:5060 : Address already in use Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions Modify kamctl et. al. to call systemctl for start, stop, restart commands. Alternatively have kamctl call setuid() before start, restart, stop commands. ### Additional Information * **Kamailio Version** - output of `kamailio -v` On ubuntu 20.04: ``` version: kamailio 5.3.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 9.2.1 ``` For ubuntu 22.04: ``` version: kamailio 5.6.5 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 11.4.0 ``` * **Operating System**: For ubuntu 22.04: ``` root@my_22.04_ubuntu:~# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 22.04.3 LTS Release: 22.04 Codename: jammy root@my_22.04_ubuntu:~# uname -a Linux my_22.04_ubuntu 5.15.0-94-generic #104-Ubuntu SMP Tue Jan 9 15:25:40 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux root@my_22.04_ubuntu:~# ``` For ubuntu 20.04 ``` root@my_20.04_ubuntu:~# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.6 LTS Release: 20.04 Codename: focal root@my_20.04_ubuntu:~# uname -a Linux my_20.04_ubuntu 5.4.0-171-generic #189-Ubuntu SMP Fri Jan 5 14:23:02 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux root@my_20.04_ubuntu:~# ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3752 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3752(a)github.com>

3 3

git:master:2da9ed93: Makefile.groups: added group for nghttp2 module
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 2da9ed9395ef04f889f4594753fc5f4cf7a75b29 URL: https://github.com/kamailio/kamailio/commit/2da9ed9395ef04f889f4594753fc5f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T19:28:25+02:00 Makefile.groups: added group for nghttp2 module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/2da9ed9395ef04f889f4594753fc5f4… Patch: https://github.com/kamailio/kamailio/commit/2da9ed9395ef04f889f4594753fc5f4… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index fec21d47bdd..ee514014be2 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -235,6 +235,9 @@ mod_list_ruxc=ruxc # - modules depending on microhttpd library mod_list_microhttpd=microhttpd +# - modules depending on nghttp2 library +mod_list_nghttp2=nghttp2 + # - modules depending on libgcrypt library mod_list_gcrypt=gcrypt @@ -288,6 +291,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_tlsa) \ $(mod_list_tls_wolfssl) \ $(mod_list_microhttpd) \ + $(mod_list_nghttp2) \ $(mod_list_gcrypt) \ $(mod_list_rtp_media_server) @@ -542,6 +546,9 @@ module_group_kruxc=$(mod_list_ruxc) # K microhttpd module module_group_kmicrohttpd=$(mod_list_microhttpd) +# K nghttp2 module +module_group_knghttp2=$(mod_list_nghttp2) + # K gcrypt module module_group_kgcrypt=$(mod_list_gcrypt)

1 0

git:master:5655ded5: modules: readme files regenerated - nghttp2 ... [skip ci]
by Kamailio Dev 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 5655ded56eed50f743d2a60cb4c27c2c5b8dbd4b URL: https://github.com/kamailio/kamailio/commit/5655ded56eed50f743d2a60cb4c27c2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-09T19:31:21+02:00 modules: readme files regenerated - nghttp2 ... [skip ci] --- Modified: src/modules/nghttp2/README --- Diff: https://github.com/kamailio/kamailio/commit/5655ded56eed50f743d2a60cb4c27c2… Patch: https://github.com/kamailio/kamailio/commit/5655ded56eed50f743d2a60cb4c27c2… --- diff --git a/src/modules/nghttp2/README b/src/modules/nghttp2/README index 21c296ca0a3..f880b2e5a13 100644 --- a/src/modules/nghttp2/README +++ b/src/modules/nghttp2/README @@ -31,7 +31,8 @@ Daniel-Constantin Mierla 4. Functions - 4.1. nghttp2_reply(code, reason, ctype, body) + 4.1. nghttp2_reply(code, body) + 4.2. nghttp2_reply_header(name, value) 5. Event Routes @@ -43,6 +44,7 @@ Daniel-Constantin Mierla 1.2. Set listen_port parameter 1.3. Set event_callback parameter 1.4. nghttp2_reply usage + 1.5. nghttp2_reply usage Chapter 1. Admin Guide @@ -62,7 +64,8 @@ Chapter 1. Admin Guide 4. Functions - 4.1. nghttp2_reply(code, reason, ctype, body) + 4.1. nghttp2_reply(code, body) + 4.2. nghttp2_reply_header(name, value) 5. Event Routes @@ -87,7 +90,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libnghttp2 - libnghttpd library (v1.61.0+) + * libnghttp2 - libnghttpd library (v1.43.0+) 3. Parameters @@ -142,16 +145,32 @@ end 4. Functions - 4.1. nghttp2_reply(code, reason, ctype, body) + 4.1. nghttp2_reply(code, body) + 4.2. nghttp2_reply_header(name, value) -4.1. nghttp2_reply(code, reason, ctype, body) +4.1. nghttp2_reply(code, body) - Send back a reply with content-type and body. + Send back a reply with body. The body can be empty string. Both + parameters can contain variables. Example 1.4. nghttp2_reply usage ... event_route[nghttp2:request] { - nghttp2_reply("200", "OK", "text/html", + nghttp2_reply("200", + "<html><body>OK</body></html>"); +} +... + +4.2. nghttp2_reply_header(name, value) + + Set a header to be added to reply. There can be up to 15 headers. + + Example 1.5. nghttp2_reply usage +... +event_route[nghttp2:request] { + nghttp2_reply_header("Content-Type", "text/html"); + nghttp2_reply_header("My-Header", "xyz"); + nghttp2_reply("200", "<html><body>OK</body></html>"); } ...

1 0

git:master:3439eb44: nghttp2: docs for nghttp2_reply_header(...) function
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 3439eb44087b044cb9caaaf8af8df155d6a42bba URL: https://github.com/kamailio/kamailio/commit/3439eb44087b044cb9caaaf8af8df15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T19:15:32+02:00 nghttp2: docs for nghttp2_reply_header(...) function --- Modified: src/modules/nghttp2/doc/nghttp2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3439eb44087b044cb9caaaf8af8df15… Patch: https://github.com/kamailio/kamailio/commit/3439eb44087b044cb9caaaf8af8df15… --- diff --git a/src/modules/nghttp2/doc/nghttp2_admin.xml b/src/modules/nghttp2/doc/nghttp2_admin.xml index 4589bc145fe..54cde446de6 100644 --- a/src/modules/nghttp2/doc/nghttp2_admin.xml +++ b/src/modules/nghttp2/doc/nghttp2_admin.xml @@ -129,17 +129,39 @@ end <title>Functions</title> <section id="nghttp2.f.nghttp2_reply"> <title> - <function moreinfo="none">nghttp2_reply(code, reason, ctype, body)</function> + <function moreinfo="none">nghttp2_reply(code, body)</function> </title> <para> - Send back a reply with content-type and body. + Send back a reply with body. The body can be empty string. Both parameters + can contain variables. </para> <example> <title><function>nghttp2_reply</function> usage</title> <programlisting format="linespecific"> ... event_route[nghttp2:request] { - nghttp2_reply("200", "OK", "text/html", + nghttp2_reply("200", + "<html><body>OK</body></html>"); +} +... +</programlisting> + </example> + </section> + <section id="nghttp2.f.nghttp2_reply_header"> + <title> + <function moreinfo="none">nghttp2_reply_header(name, value)</function> + </title> + <para> + Set a header to be added to reply. There can be up to 15 headers. + </para> + <example> + <title><function>nghttp2_reply</function> usage</title> + <programlisting format="linespecific"> +... +event_route[nghttp2:request] { + nghttp2_reply_header("Content-Type", "text/html"); + nghttp2_reply_header("My-Header", "xyz"); + nghttp2_reply("200", "<html><body>OK</body></html>"); } ...

1 0

git:master:ec847027: nghttp2: separate function for setting response headers
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: ec847027effacb0f7003a3b12ff33017e10dc0c1 URL: https://github.com/kamailio/kamailio/commit/ec847027effacb0f7003a3b12ff3301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T19:10:57+02:00 nghttp2: separate function for setting response headers --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/ec847027effacb0f7003a3b12ff3301… Patch: https://github.com/kamailio/kamailio/commit/ec847027effacb0f7003a3b12ff3301…

1 0

git:master:f3a5fb51: nghttp2: convert to debug messages
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: f3a5fb519d1e6a6670e44175332dc7889f8fb99e URL: https://github.com/kamailio/kamailio/commit/f3a5fb519d1e6a6670e44175332dc78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:21:40+02:00 nghttp2: convert to debug messages --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f3a5fb519d1e6a6670e44175332dc78… Patch: https://github.com/kamailio/kamailio/commit/f3a5fb519d1e6a6670e44175332dc78… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 075ff6e0b23..bdbec4a8c58 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -240,7 +240,7 @@ static void delete_http2_session_data(http2_session_data *session_data) { http2_stream_data *stream_data; SSL *ssl = bufferevent_openssl_get_ssl(session_data->bev); - fprintf(stderr, "%s disconnected\n", session_data->client_addr); + LM_ERR("%s disconnected\n", session_data->client_addr); if(ssl) { SSL_shutdown(ssl); } @@ -517,8 +517,7 @@ static int on_request_recv(nghttp2_session *session, } return 0; } - fprintf(stderr, "%s GET %s\n", session_data->client_addr, - stream_data->request_path); + LM_DBG("%s GET %s\n", session_data->client_addr, stream_data->request_path); if(!check_path(stream_data->request_path)) { if(error_reply(session, stream_data) != 0) { return NGHTTP2_ERR_CALLBACK_FAILURE; @@ -676,7 +675,7 @@ static void eventcb(struct bufferevent *bev, short events, void *ptr) SSL *ssl; (void)bev; - fprintf(stderr, "%s connected\n", session_data->client_addr); + LM_DBG("%s connected\n", session_data->client_addr); ssl = bufferevent_openssl_get_ssl(session_data->bev); @@ -690,8 +689,7 @@ static void eventcb(struct bufferevent *bev, short events, void *ptr) #endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */ if(alpn == NULL || alpnlen != 2 || memcmp("h2", alpn, 2) != 0) { - fprintf(stderr, "%s h2 is not negotiated\n", - session_data->client_addr); + LM_DBG("%s h2 is not negotiated\n", session_data->client_addr); delete_http2_session_data(session_data); return; } @@ -707,11 +705,11 @@ static void eventcb(struct bufferevent *bev, short events, void *ptr) return; } if(events & BEV_EVENT_EOF) { - fprintf(stderr, "%s EOF\n", session_data->client_addr); + LM_DBG("%s EOF\n", session_data->client_addr); } else if(events & BEV_EVENT_ERROR) { - fprintf(stderr, "%s network error\n", session_data->client_addr); + LM_DBG("%s network error\n", session_data->client_addr); } else if(events & BEV_EVENT_TIMEOUT) { - fprintf(stderr, "%s timeout\n", session_data->client_addr); + LM_DBG("%s timeout\n", session_data->client_addr); } delete_http2_session_data(session_data); }

1 0

git:master:20fd1c44: nghttpd2: docs - update required libnghttp2 version
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 20fd1c44916f45b7dec6253f6f105aa606839281 URL: https://github.com/kamailio/kamailio/commit/20fd1c44916f45b7dec6253f6f105aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:18:05+02:00 nghttpd2: docs - update required libnghttp2 version --- Modified: src/modules/nghttp2/doc/nghttp2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20fd1c44916f45b7dec6253f6f105aa… Patch: https://github.com/kamailio/kamailio/commit/20fd1c44916f45b7dec6253f6f105aa… --- diff --git a/src/modules/nghttp2/doc/nghttp2_admin.xml b/src/modules/nghttp2/doc/nghttp2_admin.xml index 80465a7a49c..4589bc145fe 100644 --- a/src/modules/nghttp2/doc/nghttp2_admin.xml +++ b/src/modules/nghttp2/doc/nghttp2_admin.xml @@ -43,7 +43,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libnghttp2</emphasis> - libnghttpd library (v1.61.0+) + <emphasis>libnghttp2</emphasis> - libnghttpd library (v1.43.0+) </para> </listitem> </itemizedlist>

1 0

git:master:6333db8f: nghttp2: compatibility with older libnghttp2 versions
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 6333db8fb19bd8684476914b3fe4d3ebda36940a URL: https://github.com/kamailio/kamailio/commit/6333db8fb19bd8684476914b3fe4d3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:10:47+02:00 nghttp2: compatibility with older libnghttp2 versions --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/6333db8fb19bd8684476914b3fe4d3e… Patch: https://github.com/kamailio/kamailio/commit/6333db8fb19bd8684476914b3fe4d3e…

1 0

git:master:740b73e6: nghttp2: Makefile - link with additional libraries
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 740b73e6dd174f2946e29cfc00c2a72063fd6645 URL: https://github.com/kamailio/kamailio/commit/740b73e6dd174f2946e29cfc00c2a72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:10:47+02:00 nghttp2: Makefile - link with additional libraries --- Modified: src/modules/nghttp2/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/740b73e6dd174f2946e29cfc00c2a72… Patch: https://github.com/kamailio/kamailio/commit/740b73e6dd174f2946e29cfc00c2a72… --- diff --git a/src/modules/nghttp2/Makefile b/src/modules/nghttp2/Makefile index d6b2dd84674..f71ba0c3556 100644 --- a/src/modules/nghttp2/Makefile +++ b/src/modules/nghttp2/Makefile @@ -38,7 +38,55 @@ else LEVENTLIBS = $(shell $(LEVENT_BUILDER) --libs) endif -DEFS+=$(LNGHTTP2DEFS) $(LEVENTDEFS) -LIBS=$(LNGHTTP2LIBS) $(LEVENTLIBS) + +ifeq ($(CROSS_COMPILE),) +LEVENTSSL_BUILDER = $(shell \ + if pkg-config --exists libevent_openssl; then \ + echo 'pkg-config libevent_openssl'; \ + fi) +endif + +ifeq ($(LEVENTSSL_BUILDER),) + LEVENTSSLDEFS=-I$(LOCALBASE)/include -I$(SYSBASE)/include + LEVENTSSLLIBS=-L$(LOCALBASE)/lib -levent_openssl +else + LEVENTSSLDEFS = $(shell $(LEVENTSSL_BUILDER) --cflags) + LEVENTSSLLIBS = $(shell $(LEVENTSSL_BUILDER) --libs) +endif + + +ifeq ($(CROSS_COMPILE),) +LSSL_BUILDER=$(shell \ + if pkg-config --exists libssl; then \ + echo 'pkg-config libssl'; \ + fi) +LCRYPTO_BUILDER=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'pkg-config libcrypto'; \ + fi) +endif + +ifneq ($(LSSL_BUILDER),) + LSSLDEFS = $(shell $(LSSL_BUILDER) --cflags) + LSSLLIBS = $(shell $(LSSL_BUILDER) --libs) + +ifneq ($(CRYPTO_BUILDER),) + LCRYPTODEFS = $(shell $(LCRYPTO_BUILDER) --cflags) + LCRYPTOLIBS = $(shell $(LCRYPTO_BUILDER) --libs) +endif + +else + LSSLDEFS = -I$(LOCALBASE)/ssl/include + LSSLLIBS = -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ + -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ + -lssl -lcrypto + LCRYPTODEFS = + LCRYPTOLIBS = +endif + + + +DEFS+=$(LNGHTTP2DEFS) $(LEVENTDEFS) $(LEVENTSSLDEFS) $(LSSLDEFS) $(LCRYPTODEFS) +LIBS=$(LNGHTTP2LIBS) $(LEVENTLIBS) $(LEVENTSSLLIBS) $(LSSLLIBS) $(LCRYPTOLIBS) include ../../Makefile.modules

1 0

git:master:9d3759c5: modules: readme files regenerated - ipops ... [skip ci]
by Kamailio Dev 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 9d3759c5fcf38c842285dc2f6a700f7bb4cea740 URL: https://github.com/kamailio/kamailio/commit/9d3759c5fcf38c842285dc2f6a700f7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-09T12:46:25+02:00 modules: readme files regenerated - ipops ... [skip ci] --- Modified: src/modules/ipops/README --- Diff: https://github.com/kamailio/kamailio/commit/9d3759c5fcf38c842285dc2f6a700f7… Patch: https://github.com/kamailio/kamailio/commit/9d3759c5fcf38c842285dc2f6a700f7…

1 0

[kamailio/kamailio] Add PRT query support to ipops module (PR #3802)
by Xenofon Karamanos 09 Apr '24

09 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) - [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  This PR aims to add support for PRT queries in ipops module. Some functions were modified to accommodate and reuse the structures already defined for DNS. Any feedback is appreciated! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3802 -- Commit Summary -- * ipops: Move structures to header * ipops: Add PTR query support -- File Changes -- M src/modules/ipops/ipops_mod.c (30) M src/modules/ipops/ipops_pv.c (162) M src/modules/ipops/ipops_pv.h (33) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3802.patch https://github.com/kamailio/kamailio/pull/3802.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3802 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3802(a)github.com>

4 30

git:master:5a5b96c8: ipops: Add KEMI wrapper for ptr_query function
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 5a5b96c8a1906b45873e50243f5946b8db5a068b URL: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add KEMI wrapper for ptr_query function --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… Patch: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 60fd514d4fb..ea82beb0867 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1333,6 +1333,14 @@ static int w_ptr_query(sip_msg_t *msg, char *ip, char *pv_name) return ptr_update_pv(&ip_address, &name); } +/** + * \brief KEMI wrapper for `ptr_query` function. + */ +static int ki_ptr_query(sip_msg_t *msg, str *ip, str *pvid) +{ + return ptr_update_pv(ip, pvid); +} + /** * */ @@ -1513,6 +1521,11 @@ static sr_kemi_t sr_kemi_ipops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("ipops"), str_init("ptr_query"), + SR_KEMIP_INT, ki_ptr_query, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("ipops"), str_init("srv_query"), SR_KEMIP_INT, ki_srv_query, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:812ad6eb: ipops: Add brief comment for ptr_query
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 812ad6eb4e49426197e2860b89b255fffb018b5a URL: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add brief comment for ptr_query --- Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… Patch: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index ea2669d2a19..60fd514d4fb 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1298,7 +1298,18 @@ static int ki_dns_query(sip_msg_t *msg, str *naptrname, str *pvid) } /** + *! \brief Return 1 (true) if the given `ip` IP address (string or pv) + * could successfully be resolved to a domain and saved into `pv_name` pv. + * Otherwise, return negative values depending on the error. * + * \param[in] msg SIP message structure. + * \param[in] ip IP address (string or pv) to resolve. + * \param[in] pv_name PV name to save the resolved domain. + * \returns 1 on success. + * \returns negative values depending on the error: + * \retval 1 success. + * \retval res -1 to -5 for bad input. + * \retval -6 for error in resolving the domain. */ static int w_ptr_query(sip_msg_t *msg, char *ip, char *pv_name) { diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 10447e84bcd..034ec696594 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -413,8 +413,16 @@ int dns_update_pv(str *hostname, str *name) return 1; } -/* -* +/** + * \brief Updates the pointer (PTR) record for a given IP address and saves it into pv. + * + * \details This function updates the PTR record for a specified IP address, and saves it + * into `name` AVP encapsulated in $ptrquery pv. + * It performs a reverse DNS lookup to obtain the hostname corresponding to the IP address. + * + * @param ip_address The IP address to update the PTR record for. + * @param name The name of AVP to hold the information in $ptrquery pv. + * @return 1 on success, or a negative value on failure. */ int ptr_update_pv(str *ip_address, str *name) {

1 0

git:master:a824e939: ipops: Add ptr_query docs
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: a824e939b589ae595fc735de1337a8bf4470de20 URL: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add ptr_query docs --- Modified: src/modules/ipops/doc/ipops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… Patch: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… --- diff --git a/src/modules/ipops/doc/ipops_admin.xml b/src/modules/ipops/doc/ipops_admin.xml index 14dad9f5df6..912d953c9fe 100644 --- a/src/modules/ipops/doc/ipops_admin.xml +++ b/src/modules/ipops/doc/ipops_admin.xml @@ -883,6 +883,93 @@ if(dns_query("test.com", "xyz")) </section> + <section id="ipops.f.ptr_query"> + <title> + <function moreinfo="none">ptr_query(ip, pvid)</function> + </title> + + <para> + Store the hostname that correspond to an IP address (IPv4 or IPv6) + in a pseudo-variable variable $ptrquery(pvid=>hostname). + </para> + + <para> + <emphasis>Note: Results will be in in $ptrquery(pvid=>key).</emphasis> + key can be: + <itemizedlist> + <listitem> + <para> + <emphasis>addr</emphasis> - IP address + </para> + </listitem> + <listitem> + <para> + <emphasis>type</emphasis> - type of IP address + </para> + </listitem> + <listitem> + <para> + <emphasis>ipv4</emphasis> - 1 if IPv4 address + </para> + </listitem> + <listitem> + <para> + <emphasis>ipv6</emphasis> - 1 if IPv6 address + </para> + </listitem> + <listitem> + <para> + <emphasis>count</emphasis> - number of hostnames found + </para> + </listitem> + <listitem> + <para> + <emphasis>hostname</emphasis> - hostname + </para> + </listitem> + </itemizedlist> + </para> + + <para>Parameters:</para> + + <itemizedlist> + <listitem> + <para> + <emphasis>ip</emphasis> - string or pseudo-variable containing the ip. + </para> + </listitem> + <listitem> + <para> + <emphasis>pvid</emphasis> - AVP id for script variable. + </para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title> + <function>ptr_query</function> usage + </title> + <programlisting format="linespecific"> +... +if(ptr_query("8.8.8.8","ip4")) +{ + xlog(" number of names: $ptrquery(ip4=>count)\n"); + $var(j) = 0; + while($var(j)<$ptrquery(ip4=>count)) { + xlog(" #[$var(j)] name [ $ptrquery(ip4=>hostname) ]\n"); + $var(j) = $var(j) + 1; + } +} +... + </programlisting> + </example> + + </section> + <section id="ipops.f.srv_query"> <title> <function moreinfo="none">srv_query(srvcname, pvid)</function>

1 0

git:master:4c775edd: ipops: Add PTR query support
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 4c775eddaf76cbaf376bfb2d0e5efc78d0d60dc4 URL: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add PTR query support --- Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7… Patch: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7…

1 0

git:master:9181ee56: ipops: Move structures to header
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 9181ee56e8e90845982a5d994b96917c1e03d059 URL: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Move structures to header --- Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… Patch: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index c6374b6ab7c..6769d1863c7 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -35,38 +35,8 @@ #include "../../core/resolve.h" #include "../../core/pvar.h" +#include "ipops_pv.h" -#define PV_DNS_ADDR 64 -#define PV_DNS_RECS 32 - -typedef struct _sr_dns_record -{ - int type; - char addr[PV_DNS_ADDR]; -} sr_dns_record_t; - -typedef struct _sr_dns_item -{ - str name; - unsigned int hashid; - char hostname[256]; - int count; - int ipv4; - int ipv6; - sr_dns_record_t r[PV_DNS_RECS]; - struct _sr_dns_item *next; -} sr_dns_item_t; - -#define SR_DNS_PVIDX 1 - -typedef struct _dns_pv -{ - sr_dns_item_t *item; - int type; - int flags; - pv_spec_t *pidx; - int nidx; -} dns_pv_t; static sr_dns_item_t *_sr_dns_list = NULL; diff --git a/src/modules/ipops/ipops_pv.h b/src/modules/ipops/ipops_pv.h index 8b6642ce3a8..f62e4e52e5e 100644 --- a/src/modules/ipops/ipops_pv.h +++ b/src/modules/ipops/ipops_pv.h @@ -24,6 +24,35 @@ #define _IPOPS_PV_H_ #include "../../core/pvar.h" +#define PV_DNS_ADDR 64 +#define PV_DNS_RECS 32 +#define SR_DNS_PVIDX 1 + +typedef struct _sr_dns_record +{ + int type; + char addr[PV_DNS_ADDR]; +} sr_dns_record_t; +typedef struct _sr_dns_item +{ + str name; + unsigned int hashid; + char hostname[256]; + int count; + int ipv4; + int ipv6; + sr_dns_record_t r[PV_DNS_RECS]; + struct _sr_dns_item *next; +} sr_dns_item_t; + +typedef struct _dns_pv +{ + sr_dns_item_t *item; + int type; + int flags; + pv_spec_t *pidx; + int nidx; +} dns_pv_t; int pv_parse_dns_name(pv_spec_t *sp, str *in); int pv_get_dns(sip_msg_t *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:a7e02a40: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: a7e02a406a0ecec5434fc634149dfc8f61043b2f URL: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-08T21:31:24+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… Patch: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 844a6cf3107..57ae0972735 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -78,6 +78,7 @@ Hugh Waite 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 5. Pseudo-Variables @@ -141,6 +142,7 @@ Hugh Waite 1.29. http_client_request() usage 1.30. http_client_request_v2pk() usage 1.31. http_client_response_headers_set() usage + 1.32. http_client_response_headers_clear() usage Chapter 1. Admin Guide @@ -188,6 +190,7 @@ Chapter 1. Admin Guide 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 5. Pseudo-Variables @@ -732,6 +735,7 @@ modparam("http_client", "response_headers", 1) 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 4.1. http_connect(connection, url, [content_type, data,] result) @@ -951,6 +955,20 @@ ram})&f_uri=$(fu{s.escape.param})", xinfo("response header: $httprhdr(X-Header)\n"); ... +4.9. http_client_response_headers_clear() + + Clear stored response headers, if not explicitely done, it happens when + the next HTTP request is performed. + + Example 1.32. http_client_response_headers_clear() usage +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.pa +ram})&f_uri=$(fu{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); +http_client_response_headers_clear(); +... + 5. Pseudo-Variables 5.1. $curlerror(error)

1 0

git:master:5ba76f65: nghttp2: new module for supporting direct http2 connections
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: 5ba76f65f5c2ea522a2e6629bd845918258a80cf URL: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T21:25:11+02:00 nghttp2: new module for supporting direct http2 connections - initial import version --- Added: src/modules/nghttp2/Makefile Added: src/modules/nghttp2/README Added: src/modules/nghttp2/doc/Makefile Added: src/modules/nghttp2/doc/nghttp2.xml Added: src/modules/nghttp2/doc/nghttp2_admin.xml Added: src/modules/nghttp2/nghttp2_mod.c Added: src/modules/nghttp2/nghttp2_server.c Added: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591… Patch: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591…

1 0

git:master:d55cd7e6: http_client: docs for http_client_response_headers_clear()
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: d55cd7e613c787ce0dd91abad036d4ecd7556023 URL: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T17:03:19+02:00 http_client: docs for http_client_response_headers_clear() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… Patch: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 0a8f147eb0e..e81d912c11e 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -1047,6 +1047,26 @@ http_client_response_headers_set("1"); http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", "", "X-Token: abc", "$var(result)"); xinfo("response header: $httprhdr(X-Header)\n"); +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_response_headers_clear"> + <title> + <function moreinfo="none">http_client_response_headers_clear()</function> + </title> + <para> + Clear stored response headers, if not explicitely done, it happens + when the next HTTP request is performed. + </para> + <example> + <title><function>http_client_response_headers_clear()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); +http_client_response_headers_clear(); ... </programlisting> </example>

1 0

git:master:cdf0633b: http_client: added http_client_response_headers_clear()
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: cdf0633b6b51bbfb7eb785715358c88aeb4c6a40 URL: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T14:14:58+02:00 http_client: added http_client_response_headers_clear() - clear response headers - if not explicitely done, it happens when next http request is performed --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… Patch: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index c8af2f64901..27310829d0e 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -160,6 +160,8 @@ static int w_http_query_request_v2pk(struct sip_msg *_m, char *_met, char *_url, char *_body, char *_hdrs, char *_result); static int w_http_client_response_headers_set( sip_msg_t *_m, char *_pval, char *_p2); +static int w_http_client_response_headers_clear( + sip_msg_t *_m, char *_p1, char *_p2); /* forward function */ static int curl_con_param(modparam_t type, void *val); @@ -205,6 +207,9 @@ static cmd_export_t cmds[] = { {"http_client_response_headers_set", (cmd_function)w_http_client_response_headers_set, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"http_client_response_headers_clear", + (cmd_function)w_http_client_response_headers_clear, 1, 0, + 0, ANY_ROUTE}, {"bind_http_client", (cmd_function)bind_httpc_api, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -1184,6 +1189,16 @@ static int w_http_client_response_headers_set( return ki_http_client_response_headers_set(_m, ival); } +/*! + * + */ +static int w_http_client_response_headers_clear( + sip_msg_t *_m, char *_pval, char *_p2) +{ + http_client_response_headers_reset(); + return 1; +} + /*! * Parse arguments to pv $curlerror */

1 0

git:5.8:215af598: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: 5.8 Commit: 215af59832efc6e485563b55e3af9d209121d0c5 URL: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T12:47:20+03:00 pdb server: allow carrier id 0 (cherry-picked from commit 60ded00a3b574a08457a696334d11d668595cc0b) --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… Patch: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 2146109a29d..a014e7d97e4 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -36,7 +36,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:5.7:46cf3559: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: 5.7 Commit: 46cf3559f4847b00790c043de41699b6c16f4920 URL: https://github.com/kamailio/kamailio/commit/46cf3559f4847b00790c043de41699b… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T12:46:54+03:00 pdb server: allow carrier id 0 (cherry-picked from commit 60ded00a3b574a08457a696334d11d668595cc0b) --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/46cf3559f4847b00790c043de41699b… Patch: https://github.com/kamailio/kamailio/commit/46cf3559f4847b00790c043de41699b… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 7d121430f1b..e10e2d11658 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -32,7 +32,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:5.6:2a6f18aa: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: 5.6 Commit: 2a6f18aaf08d87c71c530a14ebae17d211ae8a25 URL: https://github.com/kamailio/kamailio/commit/2a6f18aaf08d87c71c530a14ebae17d… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T12:46:21+03:00 pdb server: allow carrier id 0 (cherry-picked from commit 60ded00a3b574a08457a696334d11d668595cc0b) --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/2a6f18aaf08d87c71c530a14ebae17d… Patch: https://github.com/kamailio/kamailio/commit/2a6f18aaf08d87c71c530a14ebae17d… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 7d121430f1b..e10e2d11658 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -32,7 +32,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:master:60ded00a: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: 60ded00a3b574a08457a696334d11d668595cc0b URL: https://github.com/kamailio/kamailio/commit/60ded00a3b574a08457a696334d11d6… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T11:35:38+03:00 pdb server: allow carrier id 0 --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/60ded00a3b574a08457a696334d11d6… Patch: https://github.com/kamailio/kamailio/commit/60ded00a3b574a08457a696334d11d6… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 2146109a29d..a014e7d97e4 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -36,7 +36,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:master:1b01ecfe: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 1b01ecfe0b4e9bbba62afae0f3a3bb1612cdffcd URL: https://github.com/kamailio/kamailio/commit/1b01ecfe0b4e9bbba62afae0f3a3bb1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-07T16:01:35+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/1b01ecfe0b4e9bbba62afae0f3a3bb1… Patch: https://github.com/kamailio/kamailio/commit/1b01ecfe0b4e9bbba62afae0f3a3bb1…

1 0

git:master:b3562c6b: http_client: docs for http_client_response_headers_set()
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: b3562c6b10accec829a15c25fd56e53c8c89a87e URL: https://github.com/kamailio/kamailio/commit/b3562c6b10accec829a15c25fd56e53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T15:50:33+02:00 http_client: docs for http_client_response_headers_set() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b3562c6b10accec829a15c25fd56e53… Patch: https://github.com/kamailio/kamailio/commit/b3562c6b10accec829a15c25fd56e53… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 6424582074c..0a8f147eb0e 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -1026,6 +1026,27 @@ http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.pa switch ($rc) { ... } +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_response_headers_set"> + <title> + <function moreinfo="none">http_client_response_headers_set(mode)</function> + </title> + <para> + Set if the HTTP response header should be stored (when mode is 1) + or not (when mode is 0). If mode is 0, then it also clears previously + stored response headers. + </para> + <example> + <title><function>http_client_response_headers_set()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_response_headers_set("1"); +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); ... </programlisting> </example>

1 0

git:master:00198b8d: http_client: added http_client_response_headers_set(mode)
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 00198b8d863a94ea593b7473c88c35e6cad67014 URL: https://github.com/kamailio/kamailio/commit/00198b8d863a94ea593b7473c88c35e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T10:41:22+02:00 http_client: added http_client_response_headers_set(mode) - control if http response header should be set or not --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/00198b8d863a94ea593b7473c88c35e… Patch: https://github.com/kamailio/kamailio/commit/00198b8d863a94ea593b7473c88c35e… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 4bea581d50f..c8af2f64901 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -158,6 +158,8 @@ static int w_http_query_request(struct sip_msg *_m, char *_met, char *_url, char *_body, char *_hdrs, char *_result); static int w_http_query_request_v2pk(struct sip_msg *_m, char *_met, char *_url, char *_body, char *_hdrs, char *_result); +static int w_http_client_response_headers_set( + sip_msg_t *_m, char *_pval, char *_p2); /* forward function */ static int curl_con_param(modparam_t type, void *val); @@ -200,6 +202,9 @@ static cmd_export_t cmds[] = { {"http_get_redirect", (cmd_function)w_curl_get_redirect, 2, fixup_curl_get_redirect, fixup_free_curl_get_redirect, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + {"http_client_response_headers_set", + (cmd_function)w_http_client_response_headers_set, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, {"bind_http_client", (cmd_function)bind_httpc_api, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -1149,6 +1154,36 @@ static int w_http_query_request(sip_msg_t *_m, char *_met, char *_url, return ki_http_request_helper(_m, &met, &url, &body, &hdrs, 0, dst); } +/*! + * + */ +static int ki_http_client_response_headers_set(sip_msg_t *_m, int ival) +{ + if(ival == 0) { + http_client_response_headers_reset(); + http_client_response_headers_param = 0; + } else { + http_client_response_headers_param = 1; + } + + return 1; +} + +/*! + * + */ +static int w_http_client_response_headers_set( + sip_msg_t *_m, char *_pval, char *_p2) +{ + int ival = 0; + + if(fixup_get_ivalue(_m, (gparam_t *)_pval, &ival) < 0) { + LM_ERR("failed to get parameter value\n"); + return -1; + } + return ki_http_client_response_headers_set(_m, ival); +} + /*! * Parse arguments to pv $curlerror */

1 0

git:master:fdb9c938: http_client: docs for $httprhdr(name)
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: fdb9c938639b3fea29b8c1ba6e6e412a5da8a7f3 URL: https://github.com/kamailio/kamailio/commit/fdb9c938639b3fea29b8c1ba6e6e412… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T10:27:11+02:00 http_client: docs for $httprhdr(name) --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fdb9c938639b3fea29b8c1ba6e6e412… Patch: https://github.com/kamailio/kamailio/commit/fdb9c938639b3fea29b8c1ba6e6e412… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index f5eb42f7b91..6424582074c 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -716,7 +716,8 @@ modparam("http_client", "netinterface", "eth0") <section id="http_client.p.response_headers"> <title><varname>response_headers</varname> (int)</title> <para> - Set to 1 in order to store HTTP response headers. + Set to 1 in order to store HTTP response headers. A header value + can be retrieved with $httprhdr(name). </para> <para> <emphasis> @@ -1031,7 +1032,7 @@ switch ($rc) { </section> </section> <section> - <title>Pseudovariables</title> + <title>Pseudo-Variables</title> <section > <title> <function moreinfo="none">$curlerror(error)</function> @@ -1044,6 +1045,15 @@ switch ($rc) { http://curl.haxx.se/libcurl/c/libcurl-errors.html </para> </section> + <section > + <title> + <function moreinfo="none">$httprhdr(name)</function> + </title> + <para> + Return response header value. It requires response_headers parameter + to be set to 1. + </para> + </section> </section> <section> <title>RPC Commands</title>

1 0

git:master:90d78b7b: http_clinet: added variable $httprhdr(name) - get response header value
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 90d78b7b2bfc1899c1b64c2db8a353d43df68218 URL: https://github.com/kamailio/kamailio/commit/90d78b7b2bfc1899c1b64c2db8a353d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T10:15:41+02:00 http_clinet: added variable $httprhdr(name) - get response header value --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/90d78b7b2bfc1899c1b64c2db8a353d… Patch: https://github.com/kamailio/kamailio/commit/90d78b7b2bfc1899c1b64c2db8a353d… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index e910b514bbf..0004eb3ddc1 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -39,6 +39,7 @@ #include "../../core/pvar.h" #include "../../core/route_struct.h" #include "../../core/ut.h" +#include "../../core/trim.h" #include "../../core/mem/mem.h" #include "../../core/parser/msg_parser.h" @@ -127,6 +128,46 @@ void http_client_response_headers_reset(void) _http_client_response_headers = NULL; } +/** + * + */ +int http_client_response_headers_get(str *hname, str *hbody) +{ + httpc_hdr_t *it; + char *p; + + if(_http_client_response_headers == NULL) { + return -1; + } + if(hname == NULL || hname->len <= 0 || hbody == NULL) { + return -1; + } + for(it = _http_client_response_headers; it != NULL; it = it->next) { + if(it->name.len == 0 && it->hbuf.s[0] != ' ' && it->hbuf.s[0] != '\t' + && it->hbuf.s[0] != '\r' && it->hbuf.s[0] != '\n') { + /* parsing */ + p = strchr(it->hbuf.s, ':'); + if(p == NULL) { + continue; + } + it->name.s = it->hbuf.s; + it->name.len = p - it->name.s; + trim(&it->name); + p++; + it->body.s = p; + it->body.len = it->hbuf.s + it->hbuf.len - it->body.s; + trim(&it->body); + } + if(it->name.len == hname->len + && strncasecmp(it->name.s, hname->s, hname->len) == 0) { + hbody->s = it->body.s; + hbody->len = it->body.len; + return 0; + } + } + return -1; +} + /* * curl write function that saves received data as zero terminated * to stream. Returns the amount of data taken care of. diff --git a/src/modules/http_client/functions.h b/src/modules/http_client/functions.h index d0c66c64e66..30c326bd0f8 100644 --- a/src/modules/http_client/functions.h +++ b/src/modules/http_client/functions.h @@ -78,4 +78,7 @@ int http_client_request_c(sip_msg_t *_m, char *_url, str *_dst, char *_body, char *http_get_content_type(const str *connection); +int http_client_response_headers_get(str *hname, str *hbody); +void http_client_response_headers_reset(void); + #endif /* CURL_FUNCTIONS_H */ diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index d640d772ad3..4bea581d50f 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -164,6 +164,8 @@ static int curl_con_param(modparam_t type, void *val); static int pv_parse_curlerror(pv_spec_p sp, str *in); static int pv_get_curlerror( struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_httprhdr(pv_spec_p sp, str *in); +static int pv_get_httprhdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); /* clang-format off */ /* Exported functions */ @@ -237,6 +239,8 @@ static param_export_t params[] = { static pv_export_t mod_pvs[] = { {{"curlerror", (sizeof("curlerror")-1)}, /* Curl error codes */ PVT_OTHER, pv_get_curlerror, 0, pv_parse_curlerror, 0, 0, 0}, + {{"httprhdr", (sizeof("httprhdr")-1)}, /* HTTP response header */ + PVT_OTHER, pv_get_httprhdr, 0, pv_parse_httprhdr, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -1193,6 +1197,35 @@ static int pv_get_curlerror( return pv_get_strval(msg, param, res, &curlerr); } +/** + * + */ +static int pv_parse_httprhdr(pv_spec_p sp, str *in) +{ + if(sp == NULL || in == NULL || in->len <= 0) + return -1; + + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_VAL_STR; + sp->pvp.pvn.u.isname.name.s = *in; + + return 0; +} + +/** + * + */ +static int pv_get_httprhdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str hbody = STR_NULL; + + if(http_client_response_headers_get(&param->pvn.u.isname.name.s, &hbody) + < 0) { + return pv_get_null(msg, param, res); + } + + return pv_get_strval(msg, param, res, &hbody); +} /* * Fix curl_get_redirect params: connection(string/pvar) url (string that may contain pvars) and

1 0

git:master:f7e0a189: http_client: docs for modparam response_headers
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: f7e0a189362cc9f5ab8962868496c4b49b72a76c URL: https://github.com/kamailio/kamailio/commit/f7e0a189362cc9f5ab8962868496c4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T09:33:04+02:00 http_client: docs for modparam response_headers --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f7e0a189362cc9f5ab8962868496c4b… Patch: https://github.com/kamailio/kamailio/commit/f7e0a189362cc9f5ab8962868496c4b… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 2fb918d5997..f5eb42f7b91 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -709,6 +709,25 @@ http_follow_redirect = no <programlisting format="linespecific"> ... modparam("http_client", "netinterface", "eth0") +... + </programlisting> + </example> + </section> + <section id="http_client.p.response_headers"> + <title><varname>response_headers</varname> (int)</title> + <para> + Set to 1 in order to store HTTP response headers. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>response_headers</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_client", "response_headers", 1) ... </programlisting> </example>

1 0

git:master:8f364976: http_client: option to store http response headers
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 8f364976a81358de39cb5d675b3703f3f65a0d59 URL: https://github.com/kamailio/kamailio/commit/8f364976a81358de39cb5d675b3703f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T09:20:33+02:00 http_client: option to store http response headers - new modparam response_headers has to be set to 1 --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/8f364976a81358de39cb5d675b3703f… Patch: https://github.com/kamailio/kamailio/commit/8f364976a81358de39cb5d675b3703f… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index df6b8233b51..e910b514bbf 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -75,6 +75,58 @@ typedef struct } curl_query_t; +/** + * + */ +typedef struct httpc_hdr +{ + str hbuf; + str name; + str body; + struct httpc_hdr *next; +} httpc_hdr_t; + +/** + * + */ +httpc_hdr_t *_http_client_response_headers = NULL; + +/** + * + */ +httpc_hdr_t *httpc_hdr_block_add(httpc_hdr_t **head, char *s, int len) +{ + httpc_hdr_t *nv; + nv = pkg_mallocxz(sizeof(httpc_hdr_t) + (len + 1) * sizeof(char)); + if(!nv) { + PKG_MEM_ERROR; + return 0; + } + nv->hbuf.s = (char *)nv + sizeof(httpc_hdr_t); + memcpy(nv->hbuf.s, s, len); + nv->hbuf.len = len; + nv->next = *head; + *head = nv; + + return nv; +} + +/** + * + */ +void http_client_response_headers_reset(void) +{ + httpc_hdr_t *it0; + httpc_hdr_t *it1; + it0 = _http_client_response_headers; + while(it0 != NULL) { + it1 = it0->next; + pkg_free(it0); + it0 = it1; + } + _http_client_response_headers = NULL; +} + /* * curl write function that saves received data as zero terminated * to stream. Returns the amount of data taken care of. @@ -112,6 +164,20 @@ size_t write_function(void *ptr, size_t size, size_t nmemb, void *stream_ptr) } +size_t http_client_response_header_cb( + char *b, size_t size, size_t nitems, void *userdata) +{ + size_t numbytes; + + numbytes = size * nitems; + LM_DBG("http response header [%.*s]\n", (int)numbytes, b); + + httpc_hdr_block_add(&_http_client_response_headers, b, (int)numbytes); + + return numbytes; + ; +} + /*! Send query to server, optionally post data. */ static int curL_request_url(struct sip_msg *_m, const char *_met, @@ -288,6 +354,12 @@ static int curL_request_url(struct sip_msg *_m, const char *_met, res |= curl_easy_setopt(curl, CURLOPT_INTERFACE, params->netinterface); } + if(http_client_response_headers_param != 0) { + http_client_response_headers_reset(); + res |= curl_easy_setopt( + curl, CURLOPT_HEADERFUNCTION, http_client_response_header_cb); + } + res |= curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function); res |= curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)(&stream)); diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 91573425990..d640d772ad3 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -117,6 +117,8 @@ unsigned int default_query_result = 1; /*!< Default download size for result of query function. 0=disabled (no limit) */ unsigned int default_query_maxdatasize = 0; +int http_client_response_headers_param = 0; + str http_client_config_file = STR_NULL; static curl_version_info_data *curl_info; @@ -224,6 +226,7 @@ static param_export_t params[] = { {"query_result", PARAM_INT, &default_query_result }, {"query_maxdatasize", PARAM_INT, &default_query_maxdatasize }, {"netinterface", PARAM_STRING, &default_netinterface }, + {"response_headers", PARAM_INT, &http_client_response_headers_param }, {0, 0, 0} }; diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index c56f411df1f..42ee1e914f8 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -75,6 +75,8 @@ extern counter_handle_t connfail; /* Failed Connection attempts */ extern char *default_netinterface; +extern int http_client_response_headers_param; /* store http response headers */ + /* Curl stream object */ typedef struct {

1 0

[kamailio/kamailio] Kamailio segfaults when KEMI functions are invoked from app_python script (Issue #3746)
by David Minh Phan 07 Apr '24

07 Apr '24

### Description Kamailio segfaults when KEMI functions are invoked from app_python script ### Troubleshooting The same code was running ok with the 5.6 branch. It seems that the function sr_apy_kemi_exec_func_ex has been re-written in 5.7 with the following main changes : - The long IF/ELSE statement was replace by a FOR loop - The call to PyArg_ParseTuple function was replaced by the call to PyList_GetItem ==> **This seems to be the cause. The value returned by this function is alway NULL** #### Reproduction Any call to KSR.pv.seti function from a PYTHON 2 script would cause this error. #### Log Messages ``` sbin/kamailio[18449]: ERROR: app_python [apy_kemi.c:280]: sr_apy_kemi_exec_func_ex(): null parameter - func: seti idx: 0 argc: 2 Feb 6 11:34:16 .../sbin/kamailio[18509]: CRITICAL: <core> [core/pass_fd.c:281]: receive_fd(): EOF on 37 Feb 6 11:34:16 .../sbin/kamailio[18380]: ALERT: <core> [main.c:793]: handle_sigs(): child process 18449 exited by a signal 11 Feb 6 11:34:16 .../sbin/kamailio[18380]: ALERT: <core> [main.c:796]: handle_sigs(): core was not generated Feb 6 11:34:16 .../sbin/kamailio[18380]: INFO: <core> [main.c:818]: handle_sigs(): terminating due to SIGCHLD Feb 6 11:34:16 .../sbin/kamailio[18509]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18502]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18495]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18482]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3746 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3746(a)github.com>

3 3

git:master:b4537720: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 06 Apr '24

06 Apr '24

Module: kamailio Branch: master Commit: b4537720ff8158d59856cc0601ff4bf84216be99 URL: https://github.com/kamailio/kamailio/commit/b4537720ff8158d59856cc0601ff4bf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-06T08:46:21+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/b4537720ff8158d59856cc0601ff4bf… Patch: https://github.com/kamailio/kamailio/commit/b4537720ff8158d59856cc0601ff4bf…

1 0

git:master:9b3b8ec9: corex: docs for dns_file parameter
by Daniel-Constantin Mierla 06 Apr '24

06 Apr '24

Module: kamailio Branch: master Commit: 9b3b8ec968c6f7bda0d10a0d4fe593a92560ee7d URL: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-06T08:35:19+02:00 corex: docs for dns_file parameter --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… Patch: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index d5cfe1db477..3cdad0aa2a5 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -162,6 +162,41 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") modparam("corex", "dns_cache", "type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0") modparam("corex", "dns_cache", "type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0") ... +</programlisting> + </example> + </section> + <section id="corex.p.dns_file"> + <title><varname>dns_file</varname> (string)</title> + <para> + Path to the file from where to load dns_cache records. It can be set + many times to add more than one file. + </para> + <para> + Inside the file, the dns_cache record has to be in a single line, with + the format of the dns_cache module parameter (see above). Empty lines + or lines with whitespaces only are ignored. Comment lines have to start + with '#'. Comments are not accepted after dns_cache records, only on + separate lines. + </para> + <para> + <emphasis> + Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>dns_file</varname> parameter</title> + <programlisting format="linespecific"> +... +# content of /etc/kamailio/kamailio-cache.dns + +# IPv4 record +type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0 +# IPv6 record +type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0 +... +... +modparam("corex", "dns_file", "/etc/kamailio/kamailio-cache.dns") +... </programlisting> </example> </section> @@ -1291,4 +1326,3 @@ sub do_uncompress() { </example> </section> </chapter> -

1 0

git:master:c8cf642c: corex: added dns_file modparam
by Daniel-Constantin Mierla 06 Apr '24

06 Apr '24

Module: kamailio Branch: master Commit: c8cf642c21169bcaee82347db858d8f3bcb6a42c URL: https://github.com/kamailio/kamailio/commit/c8cf642c21169bcaee82347db858d8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-06T08:19:19+02:00 corex: added dns_file modparam - can be set to the path of a file containing dns_cache records - each line has to contain a dns_cache-param-formatted record - empty lines are allowed - comment line has to start with #, comments can be only on separate line, not supported after dns_cache record --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c8cf642c21169bcaee82347db858d8f… Patch: https://github.com/kamailio/kamailio/commit/c8cf642c21169bcaee82347db858d8f… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 4152fbf5df4..6739e4cee16 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -32,6 +32,7 @@ #include "../../core/fmsg.h" #include "../../core/kemi.h" #include "../../core/str_list.h" +#include "../../core/trim.h" #include "../../core/events.h" #include "../../core/onsend.h" #include "../../core/forward.h" @@ -82,12 +83,15 @@ static int corex_evrt_reply_out_no = -1; int corex_alias_subdomains_param(modparam_t type, void *val); int corex_dns_cache_param(modparam_t type, void *val); +int corex_dns_file_param(modparam_t type, void *val); +int corex_dns_file_load(void); static int mod_init(void); static int child_init(int); static void mod_destroy(void); static str_list_t *corex_dns_cache_list = NULL; +static str_list_t *corex_dns_file_list = NULL; static int corex_dns_cache_param_add(str *pval); @@ -176,6 +180,8 @@ static param_export_t params[] = { (void *)corex_alias_subdomains_param}, {"dns_cache", PARAM_STR | USE_FUNC_PARAM, (void *)corex_dns_cache_param}, + {"dns_file", PARAM_STR | USE_FUNC_PARAM, + (void *)corex_dns_file_param}, {"nio_intercept", INT_PARAM, &nio_intercept}, {"nio_min_msg_len", INT_PARAM, &nio_min_msg_len}, {"nio_msg_avp", PARAM_STR, &nio_msg_avp_param}, @@ -226,6 +232,9 @@ static int mod_init(void) return -1; } } + if(corex_dns_file_load() < 0) { + return -1; + } if((nio_intercept > 0) && (nio_intercept_init() < 0)) { LM_ERR("failed to register network io intercept callback\n"); @@ -385,6 +394,67 @@ int corex_dns_cache_param(modparam_t type, void *val) return 0; } +int corex_dns_file_param(modparam_t type, void *val) +{ + str_list_t *sit; + + if(val == NULL || ((str *)val)->s == NULL || ((str *)val)->len == 0) { + LM_ERR("invalid parameter\n"); + return -1; + } + + sit = (str_list_t *)pkg_mallocxz(sizeof(str_list_t)); + if(sit == NULL) { + PKG_MEM_ERROR; + return -1; + } + sit->s = *((str *)val); + if(corex_dns_file_list != NULL) { + sit->next = corex_dns_file_list; + } + corex_dns_file_list = sit; + + return 0; +} + +int corex_dns_file_load(void) +{ + str_list_t *sit; + str sline; + char lbuf[512]; + FILE *FP; + + for(sit = corex_dns_file_list; sit != NULL; sit = sit->next) { + FP = fopen(sit->s.s, "r"); + if(FP == NULL) { + LM_ERR("failed to open file '%.*s'\n", sit->s.len, sit->s.s); + return -1; + } + while(fgets(lbuf, 512, FP)) { + sline.s = lbuf; + sline.len = strlen(sline.s); + trim(&sline); + if(sline.len <= 0) { + /* empty line */ + continue; + } + if(sline.s[0] == '#') { + /* comment */ + continue; + } + if(corex_dns_cache_param_add(&sline) < 0) { + LM_ERR("failed to add record: '%.*s' (%.*s)\n", sline.len, + sline.s, sit->s.len, sit->s.s); + fclose(FP); + return -1; + } + } + fclose(FP); + } + + return 0; +} + static int corex_dns_cache_param_add(str *pval) { str sval;

1 0

git:master:92d3573b: ims_ipsec_pcscf: log error message made info
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 92d3573b500374d100639484e5a84cb640dc6b1d URL: https://github.com/kamailio/kamailio/commit/92d3573b500374d100639484e5a84cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T21:42:12+02:00 ims_ipsec_pcscf: log error message made info --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/92d3573b500374d100639484e5a84cb… Patch: https://github.com/kamailio/kamailio/commit/92d3573b500374d100639484e5a84cb… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 4f7301b56c1..b5a598b44ba 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1126,7 +1126,8 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", ci.via_host.len, ci.via_host.s, dst_port); - } else if((_cflags & IPSEC_SETDSTURI_FULL) && (dst_proto == PROTO_TLS)) { + } else if((_cflags & IPSEC_SETDSTURI_FULL) + && (dst_proto == PROTO_TLS)) { buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tls", ci.via_host.len, ci.via_host.s, dst_port); @@ -1143,7 +1144,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) memcpy(m->dst_uri.s, buf, buf_len); m->dst_uri.len = buf_len; m->dst_uri.s[m->dst_uri.len] = '\0'; - LM_ERR("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); + LM_INFO("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); } // Set send socket

1 0

git:master:5b689721: modules: readme files regenerated - xhttp_prom ... [skip ci]
by Kamailio Dev 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 5b689721332a311dd2fb93d154e09c775701dab4 URL: https://github.com/kamailio/kamailio/commit/5b689721332a311dd2fb93d154e09c7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-05T20:31:21+02:00 modules: readme files regenerated - xhttp_prom ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/5b689721332a311dd2fb93d154e09c7… Patch: https://github.com/kamailio/kamailio/commit/5b689721332a311dd2fb93d154e09c7…

1 0

git:master:bae35e49: xhttp_prom: update documentation for uptime statistic
by Ovidiu Sas 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: bae35e49fa364de6a4c003c4484358d5592677de URL: https://github.com/kamailio/kamailio/commit/bae35e49fa364de6a4c003c4484358d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-05T18:28:32Z xhttp_prom: update documentation for uptime statistic --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bae35e49fa364de6a4c003c4484358d… Patch: https://github.com/kamailio/kamailio/commit/bae35e49fa364de6a4c003c4484358d… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index 83cede92633..d3b5961a218 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -182,8 +182,9 @@ modparam("xhttp_prom", "xhttp_prom_stats", "") </programlisting> </example> </section> + <section id="xhttp_prom.p.xhttp_prom_pkg_stats"> - <title><varname>xhttp_prom_pkg_stats</varname> (str)</title> + <title><varname>xhttp_prom_pkg_stats</varname> (integer)</title> <para> Enable or disable internal &kamailio; pkg memory statistics. </para> @@ -201,6 +202,29 @@ modparam("xhttp_prom", "xhttp_prom_stats", "") ... # enable pkg stats modparam("xhttp_prom", "xhttp_prom_pkg_stats", 1) +... + </programlisting> + </example> + </section> + <section id="xhttp_prom.p.xhttp_prom_uptime_stat"> + <title><varname>xhttp_prom_uptime_stat</varname> (integer)</title> + <para> + Enable or disable &kamailio; uptime statistic. + </para> + <para> + <emphasis>If not 0</emphasis>, uptime statistic will be displayed. + </para> + <para> + <emphasis> + Default value is 0 (no uptime statistic). + </emphasis> + </para> + <example> + <title>Set <varname>xhttp_prom_uptime_stat</varname> parameter</title> + <programlisting format="linespecific"> +... +# enable uptime statistic +modparam("xhttp_prom", "xhttp_prom_uptime_stat", 1) ... </programlisting> </example>

1 0

git:master:6af0ae46: xhttp_prom: new uptime statistic
by Ovidiu Sas 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 6af0ae461486554481cbace41d50b8639b2ade8a URL: https://github.com/kamailio/kamailio/commit/6af0ae461486554481cbace41d50b86… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-05T18:21:29Z xhttp_prom: new uptime statistic --- Modified: src/modules/xhttp_prom/prom.c Modified: src/modules/xhttp_prom/xhttp_prom.c Modified: src/modules/xhttp_prom/xhttp_prom.h --- Diff: https://github.com/kamailio/kamailio/commit/6af0ae461486554481cbace41d50b86… Patch: https://github.com/kamailio/kamailio/commit/6af0ae461486554481cbace41d50b86… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index 786a2c3e40a..efe111b752a 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -33,6 +33,7 @@ #include <inttypes.h> #include <stdarg.h> +#include "../../core/globals.h" #include "../../core/counters.h" #include "../../core/ut.h" #include "../../core/pt.h" @@ -204,6 +205,36 @@ static int metric_generate( return 0; } +/** + * @brief Generate a string suitable for Prometheus pkgmem metric. + * + * @return 0 on success. + */ +static int prom_metric_uptime_print(prom_ctx_t *ctx) +{ + int uptime; + time_t now; + uint64_t ts; + + if(get_timestamp(&ts)) { + LM_ERR("Fail to get timestamp\n"); + goto error; + } + + time(&now); + uptime = (int)(now - up_since); + if(prom_body_printf(ctx, "%.*suptime %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, uptime, ts) + == -1) { + LM_ERR("Fail to print\n"); + goto error; + } + return 0; + +error: + return -1; +} + /** * @brief Generate a string suitable for Prometheus pkgmem metric. * @@ -322,6 +353,13 @@ int prom_stats_get(prom_ctx_t *ctx, str *stat) } } + if(uptime_stat_enabled) { + if(prom_metric_uptime_print(ctx)) { + LM_ERR("Fail to print uptime metric\n"); + return -1; + } + } + LM_DBG("Statistics for: %.*s\n", stat->len, stat->s); int len = stat->len; diff --git a/src/modules/xhttp_prom/xhttp_prom.c b/src/modules/xhttp_prom/xhttp_prom.c index 6eaffb640a3..f54cfb19f17 100644 --- a/src/modules/xhttp_prom/xhttp_prom.c +++ b/src/modules/xhttp_prom/xhttp_prom.c @@ -153,6 +153,8 @@ int buf_size = 0; /**< size of buffer that contains the reply. */ int timeout_minutes = 60; /**< timeout in minutes to delete old metrics. */ +int uptime_stat_enabled = 0; /**< enable or disable uptime statistic. */ + int pkgmem_stats_enabled = 0; /**< enable or disable pkgmem statistics. */ char error_buf[ERROR_REASON_BUF_LEN]; @@ -213,6 +215,7 @@ static param_export_t params[] = {{"xhttp_prom_buf_size", INT_PARAM, &buf_size}, {"prom_histogram", PARAM_STRING | USE_FUNC_PARAM, (void *)prom_histogram_param}, {"xhttp_prom_timeout", INT_PARAM, &timeout_minutes}, + {"xhttp_prom_uptime_stat", INT_PARAM, &uptime_stat_enabled}, {"xhttp_prom_pkg_stats", INT_PARAM, &pkgmem_stats_enabled}, {0, 0, 0}}; struct module_exports exports = { diff --git a/src/modules/xhttp_prom/xhttp_prom.h b/src/modules/xhttp_prom/xhttp_prom.h index 12851368df4..fa1aa611ae2 100644 --- a/src/modules/xhttp_prom/xhttp_prom.h +++ b/src/modules/xhttp_prom/xhttp_prom.h @@ -84,6 +84,11 @@ extern str xhttp_prom_beginning; */ extern int timeout_minutes; +/** + * @brief enable or disable uptime statistic. + */ +extern int uptime_stat_enabled; + /** * @brief enable or disable pkgmem statistics. */

1 0

git:master:d1118064: siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: d1118064d04bb77c818540e68edf1766db1d560a URL: https://github.com/kamailio/kamailio/commit/d1118064d04bb77c818540e68edf176… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T16:19:42+02:00 siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri --- Modified: src/modules/siputils/checks.c --- Diff: https://github.com/kamailio/kamailio/commit/d1118064d04bb77c818540e68edf176… Patch: https://github.com/kamailio/kamailio/commit/d1118064d04bb77c818540e68edf176… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 2ba80b5be94..6cc977197fb 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -780,7 +780,7 @@ int tel2sip2(struct sip_msg *_msg, char *_uri, char *_hostpart, char *_res) return 1; /* reserve memory for clean tel uri */ - tel_uri.s = pkg_malloc(uri.len + 1); + tel_uri.s = pkg_mallocxz(uri.len + 1); if(tel_uri.s == 0) { LM_ERR("no more pkg memory\n"); return -1; @@ -839,7 +839,7 @@ int tel2sip2(struct sip_msg *_msg, char *_uri, char *_hostpart, char *_res) /* reserve memory for resulting sip uri */ sip_uri.len = 4 + tel_uri.len - 4 + 1 + hostpart.len + 1 + 10; - sip_uri.s = pkg_malloc(sip_uri.len + 1); + sip_uri.s = pkg_mallocxz(sip_uri.len + 1); if(sip_uri.s == 0) { LM_ERR("no more pkg memory\n"); pkg_free(tel_uri.s); @@ -873,6 +873,8 @@ int tel2sip2(struct sip_msg *_msg, char *_uri, char *_hostpart, char *_res) /* tel_uri is not needed anymore */ pkg_free(tel_uri.s); + sip_uri.len = strlen(sip_uri.s); + /* set result pv value and write sip uri to result pv */ res_val.rs = sip_uri; res_val.flags = PV_VAL_STR;

1 0

git:master:8523eb21: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 8523eb2180ec878278863c5315ca4067586824bb URL: https://github.com/kamailio/kamailio/commit/8523eb2180ec878278863c5315ca406… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-05T13:01:11+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/8523eb2180ec878278863c5315ca406… Patch: https://github.com/kamailio/kamailio/commit/8523eb2180ec878278863c5315ca406…

1 0

git:master:3208dd82: textopsx: docs for msg_changed_route(...)
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 3208dd822f94cff7b28d9682b083f3d144d7368e URL: https://github.com/kamailio/kamailio/commit/3208dd822f94cff7b28d9682b083f3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 textopsx: docs for msg_changed_route(...) --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/3208dd822f94cff7b28d9682b083f3d… Patch: https://github.com/kamailio/kamailio/commit/3208dd822f94cff7b28d9682b083f3d… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index b6b50916051..92666736c86 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -50,6 +50,33 @@ if(msg_apply_changes()) </example> </section> + <section id="textopsx.f.msg_changed_route"> + <title> + <function moreinfo="none">msg_changed_route(rname)</function> + </title> + <para> + Execute a route block specified by rname, using a new SIP message + structure build using the current SIP message with applied changes. + The current SIP message does not get the changes applied. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>msg_changed_route()</function> usage</title> + <programlisting format="linespecific"> +... +append_hf("My-Header: yes\r\n"); +msg_changed_route("UPDATEDMSG"); +... +route[UPDATEDMSG] { + xinfo("My-Header-Value: $hdr(My-Header)\n"); +} +... +</programlisting> + </example> + </section> + <section id="textopsx.f.msg_set_buffer"> <title> <function moreinfo="none">msg_set_buffer(data)</function>

1 0

git:master:ac22a5c1: textopsx: added msg_changed_route(rname)
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: ac22a5c174d4652ae09b779a5384182211700f20 URL: https://github.com/kamailio/kamailio/commit/ac22a5c174d4652ae09b779a5384182… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 textopsx: added msg_changed_route(rname) - execute a route block using the changed message, without efectivelly changing the current message structure (it stays without changes applied) --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/ac22a5c174d4652ae09b779a5384182… Patch: https://github.com/kamailio/kamailio/commit/ac22a5c174d4652ae09b779a5384182… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 5710cfeb864..8982924296a 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -46,6 +46,7 @@ MODULE_VERSION static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2); +static int msg_changed_route_f(sip_msg_t *msg, char *str1, char *str2); static int msg_set_buffer_f(sip_msg_t *msg, char *p1data, char *p2); static int change_reply_status_f(sip_msg_t *, char *, char *); @@ -122,6 +123,8 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"msg_apply_changes", (cmd_function)msg_apply_changes_f, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"msg_changed_route", (cmd_function)msg_changed_route_f, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {"msg_set_buffer", (cmd_function)msg_set_buffer_f, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | ONREPLY_ROUTE}, {"change_reply_status", change_reply_status_f, 2, @@ -276,6 +279,92 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2) return sip_msg_apply_changes(msg); } +/** + * + */ +static int ki_msg_changed_route(sip_msg_t *msg, str *rname) +{ + str obuf = STR_NULL; + int ridx = -1; + sip_msg_t lmsg; + sr_kemi_eng_t *keng = NULL; + run_act_ctx_t ctx; + str evname = str_init("textopsx:msg-changed-route"); + + keng = sr_kemi_eng_get(); + if(keng == NULL) { + ridx = route_lookup(&main_rt, rname->s); + if(ridx < 0) { + LM_ERR("route block [%.*s] not found\n", rname->len, rname->s); + return -1; + } + } + + if(sip_msg_eval_changes(msg, &obuf) < 0 || obuf.s == NULL) { + LM_ERR("failed to evaluate msg changes\n"); + return -1; + } + + memset(&lmsg, 0, sizeof(sip_msg_t)); + lmsg.buf = obuf.s; + lmsg.len = obuf.len; + lmsg.id = msg->id; + lmsg.pid = msg->pid; + lmsg.rcv = msg->rcv; + lmsg.set_global_address = msg->set_global_address; + lmsg.set_global_port = msg->set_global_port; + lmsg.flags = msg->flags; + lmsg.msg_flags = msg->msg_flags; + memcpy(lmsg.xflags, msg->xflags, KSR_XFLAGS_SIZE * sizeof(flag_t)); + lmsg.hash_index = msg->hash_index; + lmsg.force_send_socket = msg->force_send_socket; + + /* parse the local message */ + LM_DBG("SIP message content updated - parsing\n"); + if(parse_msg(lmsg.buf, lmsg.len, &lmsg) != 0) { + LM_ERR("parsing new sip message failed [[%.*s]]\n", lmsg.len, lmsg.buf); + return -1; + } + if(parse_headers(&lmsg, HDR_FROM_F | HDR_TO_F | HDR_CALLID_F | HDR_CSEQ_F, 0) + < 0) { + LM_ERR("parsing main headers of new sip message failed [[%.*s]]\n", + lmsg.len, lmsg.buf); + return -1; + } + init_run_actions_ctx(&ctx); + + if(keng == NULL) { + run_top_route(main_rt.rlist[ridx], &lmsg, &ctx); + } else { + if(sr_kemi_ctx_route(keng, &ctx, &lmsg, get_route_type(), + rname, &evname) + < 0) { + LM_ERR("error running route kemi callback\n"); + } + } + + free_sip_msg(&lmsg); + + pkg_free(obuf.s); + + return 1; +} + +/** + * + */ +static int msg_changed_route_f(sip_msg_t *msg, char *prname, char *str2) +{ + str rname = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)prname, &rname) < 0) { + LM_ERR("could not get route name param value\n"); + return -1; + } + + return ki_msg_changed_route(msg, &rname); +} + /** * */

1 0

git:master:756f01ee: pv: use core helper to evaluate changes for pv updated message buffer
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 756f01eecec754726c09a7067e11db9781e35ac1 URL: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 pv: use core helper to evaluate changes for pv updated message buffer --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… Patch: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1f998bfc1d3..40557ba4628 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -522,8 +522,6 @@ static str _ksr_pv_msg_buf_updated = STR_NULL; int pv_get_msg_buf_updated( struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - dest_info_t send_info; - if(msg == NULL) return -1; @@ -533,17 +531,7 @@ int pv_get_msg_buf_updated( _ksr_pv_msg_buf_updated.len = 0; } - init_dest_info(&send_info); - send_info.proto = PROTO_UDP; - if(msg->first_line.type == SIP_REPLY) { - _ksr_pv_msg_buf_updated.s = generate_res_buf_from_sip_res(msg, - (unsigned int *)&_ksr_pv_msg_buf_updated.len, - BUILD_NO_VIA1_UPDATE); - } else if(msg->first_line.type == SIP_REQUEST) { - _ksr_pv_msg_buf_updated.s = build_req_buf_from_sip_req(msg, - (unsigned int *)&_ksr_pv_msg_buf_updated.len, &send_info, - BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); - } else { + if(sip_msg_eval_changes(msg, &_ksr_pv_msg_buf_updated) < 0) { return pv_get_null(msg, param, res); }

1 0

git:master:cad94eb7: core: msg translator - helper function to evaluate changes
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: cad94eb73c1223ddcf69aa0d073deb3118b46e3f URL: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 core: msg translator - helper function to evaluate changes --- Modified: src/core/msg_translator.c Modified: src/core/msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… Patch: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index acd5911867a..ab02fb7c47c 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3485,6 +3485,33 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) return 1; } +/** + * evaluate changes and set the output buffer + * - obuf->s has to be pkg freed + * - return: 1 on success, -1 on failure + */ +int sip_msg_eval_changes(sip_msg_t *msg, str *obuf) +{ + dest_info_t dst; + + init_dest_info(&dst); + dst.proto = PROTO_UDP; + if(msg->first_line.type == SIP_REPLY) { + obuf->s = generate_res_buf_from_sip_res( + msg, (unsigned int *)&obuf->len, BUILD_NO_VIA1_UPDATE); + } else { + obuf->s = build_req_buf_from_sip_req(msg, (unsigned int *)&obuf->len, + &dst, + BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); + } + if(obuf->s == NULL) { + LM_ERR("couldn't update msg buffer content\n"); + return -1; + } + + return 1; +} + /** * */ diff --git a/src/core/msg_translator.h b/src/core/msg_translator.h index eac64186d56..9d41b472767 100644 --- a/src/core/msg_translator.h +++ b/src/core/msg_translator.h @@ -173,6 +173,11 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, */ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf); +/** + * evaluate changes and set the output buffer + */ +int sip_msg_eval_changes(sip_msg_t *msg, str *obuf); + /** * apply changes to sip msg buffer and reparse */

1 0

git:master:95f7af6f: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 95f7af6f3aea7ff01fdc06a72703441c4ef320ca URL: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-05T11:31:18+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441… Patch: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441…

1 0

[kamailio/kamailio] DBURL can't read env params (Issue #3800)
by gao114882 05 Apr '24

05 Apr '24

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` I want to read params from environment, so define #!defenv MYSQL_IP #!trydef DBURL "mysql://kamailio:kamailio@MYSQL_IP/kamailio" but It can't read this ”MYSQL_IP“。 root@d2e1fcc3f89e:/# env |grep MYSQL* MYSQL_URL=172.16.4.111 MYSQL_IP=172.16.4.111 ``` #### Log Messages  ``` 0(34) ERROR: db_mysql [km_my_con.c:166]: db_mysql_new_connection(): driver error: Unknown server host 'MYSQL_IP' (-2) 0(34) ERROR: <core> [db.c:324]: db_do_init2(): could not add connection to the pool 0(34) ERROR: dispatcher [dispatch.c:955]: ds_connect_db(): cannot initialize db connection 0(34) ERROR: dispatcher [dispatch.c:989]: ds_init_db(): unable to connect to the database 0(34) ERROR: dispatcher [dispatcher.c:439]: mod_init(): could not initiate a connect to the database 0(34) ERROR: <core> [core/sr_module.c:1030]: init_mod(): Error while initializing module dispatcher (/usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 12.2.0 ``` * **Operating System**:  ``` cat /proc/version Linux version 3.10.0-1160.105.1.el7.x86_64 (mockbuild(a)kbuilder.bsys.centos.org) (gcc version 4.8.5 20150623 (Red Hat 4.8.5-44) (GCC) ) #1 SMP Thu Dec 7 15:39:45 UTC 2023 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3800 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3800(a)github.com>

3 3

[kamailio/kamailio] Topos breaks early dialog transactions on multi-homed kamailio instances using enable_double_rr and versions >= 5.6.5 (Issue #3757)
by George Diamantopoulos 05 Apr '24

05 Apr '24

### Description All kamailio versions on the 5.7.x train and additionally point release 5.6.5 break early dialog transactions, at least when the following conditions are (cumulatively) met: * topos-redis is enabled (haven't tested other storage backends yet, let me know if needed) * kamailio is multihomed * enable_double_rr is enabled (the default) ### Troubleshooting #### SIP Traffic Here's an exchange demonstrating the problem: ``` kamailio instance ──────────┬──────────────────┬───────── internal external peer 172.30.154.1:5060 185.73.43.241:5060 195.167.21.66:5060 ──────────┬──────────────────┬───────── ──────────┬───────── │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ INVITE (SDP) │ │ │ ──────────────────────────> │ │ │ 100 Trying │ │ │ <────────────────────────── │ │ │ 183 Session Progress (SDP) │ │ │ <────────────────────────── │ │ │ PRACK │ │ │ ──────────────────────────> │ │ │ 200 OK │ │ │ <────────────────────────── │ │ │ UPDATE (SDP) │ UPDATE (SDP) │ │ <─────────────────────────── │ │ ``` Whereas the expected behaviour should be: ``` │ │ UPDATE (SDP) │ | <────────────────────────── │ UPDATE (SDP)│ │ │ <───────── │ │ │ ``` This is also exemplified by examining the Via headers as rewritten by kamailio. Not working (>= 5.6.5, 5.7.x): * Inbound Via: `Via: SIP/2.0/UDP 195.167.21.66:5060;branch=z9hG4bKtjlwcpvfh03epe0thhtjhq3qg;Role=3;Hpt=8e58_16` * Oubound Via: `Via: SIP/2.0/UDP 185.73.43.241;branch=z9hG4bK66c4.3453dd9a219858819d528b9da671e39e.0` Working (5.6.4): * Inbound Via: `Via: SIP/2.0/UDP 195.167.21.66:5060;branch=z9hG4bK8lj1ahz6npz65khd8jkzl1ohh;Role=3;Hpt=8e68_16` * Oubound Via: `Via: SIP/2.0/UDP 172.30.154.1;branch=z9hG4bK4dce.4f5448efd64465fa5dbaf5eef0dc35b7.0` ### Possible Solutions Only solution I have found so far is to downgrade to kamailio 5.6.4  ### Additional Information ``` version: kamailio 5.7.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` But I have also tested all 5.7.x versions, which are all affected, as well 5.6.5. * **Operating System**:  ``` Linux host 5.10.0-27-amd64 #1 SMP Debian 5.10.205-2 (2023-12-31) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3757 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3757(a)github.com>

3 8

git:master:8330158b: rtpengine: docs for write_sdp_pv_mode parameter
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 8330158b88815f28326fc5293831c83cebc2e41c URL: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T11:06:53+02:00 rtpengine: docs for write_sdp_pv_mode parameter --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… Patch: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 6d79abfaeff..f898aa32979 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -478,6 +478,32 @@ route { </example> </section> + <section id="rtpengine.p.write_sdp_pv_mode"> + <title><varname>write_sdp_pv_mode</varname> (int)</title> + <para> + If this parameter is set to 1, the returned SDP is written to pv + and also set to message body. + </para> + <para> + Default value: 0 (write SDP only to pv). + </para> + <example> + <title>Set <varname>write_sdp_pv_mode</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "write_sdp_pv", "$avp(sdp)") +modparam("rtpengine", "write_sdp_pv_mode", 1) +... +route { + ... + rtpengine_manage(); + xinfo("new sdp: $avp(sdp)\n"); +} +</programlisting> + </example> + </section> + + <section id="rtpengine.p.rtp_inst_pvar"> <title><varname>rtp_inst_pvar</varname> (string)</title> <para>

1 0

git:master:664190b3: rtpengine: added param write_sdp_pv_mode
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 664190b31303b52728f957113d97bd77a7ab4f8d URL: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T10:55:09+02:00 rtpengine: added param write_sdp_pv_mode - if set to 1, write the returned sdp in pv and set the body - default 0, write only in pv (existing behaviour so far) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… Patch: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 8a2f9f82d89..c51b4742081 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -322,6 +322,7 @@ static int_str setid_avp; static str write_sdp_pvar_str = {NULL, 0}; static pv_spec_t *write_sdp_pvar = NULL; +static int write_sdp_pvar_mode = 0; static str read_sdp_pvar_str = {NULL, 0}; static pv_spec_t *read_sdp_pvar = NULL; @@ -504,6 +505,7 @@ static param_export_t params[] = { {"force_send_interface", PARAM_STRING, &force_send_ip_str}, {"rtp_inst_pvar", PARAM_STR, &rtp_inst_pv_param}, {"write_sdp_pv", PARAM_STR, &write_sdp_pvar_str}, + {"write_sdp_pv_mode", PARAM_INT, &write_sdp_pvar_mode}, {"read_sdp_pv", PARAM_STR, &read_sdp_pvar_str}, {"hash_table_tout", INT_PARAM, &hash_table_tout}, {"hash_table_size", INT_PARAM, &hash_table_size}, @@ -4708,9 +4710,11 @@ static int rtpengine_offer_answer( goto error_free; } - pkg_free(newbody.s); - - } else { + if(write_sdp_pvar_mode == 0) { + pkg_free(newbody.s); + } + } + if(write_sdp_pvar == NULL || write_sdp_pvar_mode != 0) { if(cl_field.len) { anchor = del_lump(msg, cl_field.s - msg->buf, cl_field.len, 0); cl_repl.s = pkg_malloc(10);

1 0

[kamailio/kamailio] app_python module still needs Python 2 (Issue #3805)
by waarmond 05 Apr '24

05 Apr '24

I'm trying to build current git sources on ArchLinux. `modules/app_python/Makefile` still asks for python2: ``` which: no python2 in ($PATH) which: no python2.7 in ($PATH) File "<string>", line 1 import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR') ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SyntaxError: Missing parentheses in call to 'print'. Did you mean print(...)? ``` Is this intended? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3805 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3805(a)github.com>

2 2

git:master:30f620ae: sdpops: use find_sdp_line_start() to find start of attribute line
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 30f620ae2254888c0d8d7edc375cb312e33de124 URL: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T08:23:29+02:00 sdpops: use find_sdp_line_start() to find start of attribute line --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… Patch: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 30de5dfc543..f40062420a7 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2059,6 +2059,9 @@ int bind_sdpops(struct sdpops_binds *sob) return 0; } +/** + * + */ int sdpops_attr_val(str *payload, str *attr, str *val) { char *sline; @@ -2066,16 +2069,9 @@ int sdpops_attr_val(str *payload, str *attr, str *val) val->s = NULL; val->len = 0; - sline = find_sdp_line(payload->s, payload->s + payload->len, attr->s[0]); + sline = find_sdp_line_start( + payload->s, payload->s + payload->len, attr->s[0], 0); while(sline != NULL) { - /* check start of line */ - if(sline > payload->s) { - if(eline[-1] != '\n' && eline[-1] != '\r') { - sline = find_next_sdp_line( - sline, payload->s + payload->len, attr->s[0], NULL); - continue; - } - } /* find EoL or EoData */ eline = sline; while(eline < payload->s + payload->len) {

1 0

git:master:368661cc: core: parser/sdp - function to find sdp line with start EoL check option
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 368661cc15251af4cbf295d1f5fad5a42d1b647b URL: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T08:10:11+02:00 core: parser/sdp - function to find sdp line with start EoL check option --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/parser/sdp/sdp_helpr_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… Patch: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index d5cb359b40f..a5dffd9c398 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -733,9 +733,10 @@ int extract_sess_version(str *oline, str *sess_version) /* * Auxiliary for some functions. + * - smode: if 1, pstart is pointing inside msg body * Returns pointer to first character of found line, or NULL if no such line. */ -char *find_sdp_line(char *pstart, char *plimit, char linechar) +char *find_sdp_line_start(char *pstart, char *plimit, char linechar, int smode) { static char linehead[3] = "x="; char *cp, *cp1; @@ -749,11 +750,14 @@ char *find_sdp_line(char *pstart, char *plimit, char linechar) if(cp1 == NULL) return NULL; /* - * As it is body, we assume it has previous line and we can - * lookup previous character. + * smode==1 means it is msg body, thus it has previous line and it can + * lookup previous character even when cp1==pstart. */ - if(cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; + if(cp1 > pstart || smode == 1) { + if(cp1[-1] == '\n' || cp1[-1] == '\r') { + return cp1; + } + } /* * Having such data, but not at line beginning. * Skip them and reiterate. ser_memmem() will find next @@ -765,6 +769,14 @@ char *find_sdp_line(char *pstart, char *plimit, char linechar) } } +/* + * Auxiliary for some functions - expect pstart to point inside SIP message body. + * Returns pointer to first character of found line, or NULL if no such line. + */ +char *find_sdp_line(char *pstart, char *plimit, char linechar) +{ + return find_sdp_line_start(pstart, plimit, linechar, 1); +} /* This function assumes pstart points to a line of requested type. */ char *find_next_sdp_line( diff --git a/src/core/parser/sdp/sdp_helpr_funcs.h b/src/core/parser/sdp/sdp_helpr_funcs.h index e8ce6f7e60a..20d3ebd882d 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.h +++ b/src/core/parser/sdp/sdp_helpr_funcs.h @@ -65,6 +65,7 @@ int extract_accept_wrapped_types(str *body, str *accept_wrapped_types); int extract_max_size(str *body, str *max_size); int extract_path(str *body, str *path); +char *find_sdp_line_start(char *pstart, char *plimit, char linechar, int smode); char *find_sdp_line(char *p, char *plimit, char linechar); char *find_next_sdp_line(char *p, char *plimit, char linechar, char *defptr);

1 0

git:master:b03ec735: core: parser/sdp - rename parameter to suggest better its role
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: b03ec73589c12e566b11ce2c653401daa915c805 URL: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T07:54:12+02:00 core: parser/sdp - rename parameter to suggest better its role --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… Patch: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index b15ddeaa4bd..d5cb359b40f 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -735,14 +735,13 @@ int extract_sess_version(str *oline, str *sess_version) * Auxiliary for some functions. * Returns pointer to first character of found line, or NULL if no such line. */ - -char *find_sdp_line(char *p, char *plimit, char linechar) +char *find_sdp_line(char *pstart, char *plimit, char linechar) { static char linehead[3] = "x="; char *cp, *cp1; linehead[0] = linechar; /* Iterate through body */ - cp = p; + cp = pstart; for(;;) { if(cp >= plimit) return NULL; @@ -767,13 +766,14 @@ char *find_sdp_line(char *p, char *plimit, char linechar) } -/* This function assumes p points to a line of requested type. */ -char *find_next_sdp_line(char *p, char *plimit, char linechar, char *defptr) +/* This function assumes pstart points to a line of requested type. */ +char *find_next_sdp_line( + char *pstart, char *plimit, char linechar, char *defptr) { char *t; - if(p >= plimit || plimit - p < 3) + if(pstart >= plimit || plimit - pstart < 3) return defptr; - t = find_sdp_line(p + 2, plimit, linechar); + t = find_sdp_line(pstart + 2, plimit, linechar); return t ? t : defptr; }

1 0

git:master:57dd65c2: xhttp_prom: use proper prefix for pkg stats
by Ovidiu Sas 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 57dd65c2c6abd520c0db876aca6bd2238229e187 URL: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-04T16:22:39Z xhttp_prom: use proper prefix for pkg stats --- Modified: src/modules/xhttp_prom/prom.c --- Diff: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… Patch: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index 1ea7edb1c5e..786a2c3e40a 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -221,8 +221,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) for(; i < pkg_proc_stats_no; i++) { if(prom_body_printf(ctx, - "kamailio_pkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " + "%.*spkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " "%d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].used, ts) == -1) { @@ -230,8 +231,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_available{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_available{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].available, ts) == -1) { @@ -239,8 +241,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_real_used{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_real_used{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].real_used, ts) == -1) { @@ -248,8 +251,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_total_frags{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_total_frags{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_frags, ts) == -1) { @@ -257,8 +261,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_total_size{pid=\"%u\", rank=\"%d\" " + "%.*spkgmem_total_size{pid=\"%u\", rank=\"%d\" " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_size, ts) == -1) {

1 0

git:master:c4b81393: sdpops: function to parse path for sdp content
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: c4b81393fed9a333af9349850e70ee377f3f3491 URL: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T16:29:05+02:00 sdpops: function to parse path for sdp content --- Added: src/modules/sdpops/sdpops_path.c Added: src/modules/sdpops/sdpops_path.h --- Diff: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3… Patch: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3…

1 0

git:master:359a442e: sdpops: reformat the codecs map
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 359a442e14a156b0bcf60dc5b2580cbc57924e34 URL: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T16:29:05+02:00 sdpops: reformat the codecs map --- Modified: src/modules/sdpops/sdpops_data.c --- Diff: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… Patch: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… --- diff --git a/src/modules/sdpops/sdpops_data.c b/src/modules/sdpops/sdpops_data.c index 25d7de178ed..c158511b60e 100644 --- a/src/modules/sdpops/sdpops_data.c +++ b/src/modules/sdpops/sdpops_data.c @@ -91,19 +91,29 @@ Registration Procedures: Standards Action Process or expert approval */ -typedef struct _codecsmap -{ +/* clang-format off */ +typedef struct _codecsmap { str name; str ids; } codecsmap_t; -codecsmap_t sdpops_codecsmap_table[] = {{{"PCMU", 4}, {"0", 1}}, - {{"GSM", 3}, {"3", 1}}, {{"G723", 4}, {"4", 1}}, - {{"DVI4", 4}, {"5,6,16,17", 9}}, {{"LPC", 3}, {"7", 1}}, - {{"PCMA", 4}, {"8", 1}}, {{"G722", 4}, {"9", 1}}, - {{"L16", 3}, {"10,11", 5}}, {{"QCELP", 5}, {"12", 2}}, - {{"CN", 2}, {"13", 5}}, {{"MPA", 3}, {"14", 2}}, - {{"G728", 4}, {"15", 2}}, {{"G729", 4}, {"18", 2}}, {{0, 0}, {0, 0}}}; +codecsmap_t sdpops_codecsmap_table[] = { + {{"PCMU", 4}, {"0", 1}}, + {{"GSM", 3}, {"3", 1}}, + {{"G723", 4}, {"4", 1}}, + {{"DVI4", 4}, {"5,6,16,17", 9}}, + {{"LPC", 3}, {"7", 1}}, + {{"PCMA", 4}, {"8", 1}}, + {{"G722", 4}, {"9", 1}}, + {{"L16", 3}, {"10,11", 5}}, + {{"QCELP", 5}, {"12", 2}}, + {{"CN", 2}, {"13", 5}}, + {{"MPA", 3}, {"14", 2}}, + {{"G728", 4}, {"15", 2}}, + {{"G729", 4}, {"18", 2}}, + {{0, 0}, {0, 0}} +}; +/* clang-format on */ /** * set the string with the IDs mapped to codec name

1 0

git:master:d0d4f589: modules: readme files regenerated - xhttp_prom ... [skip ci]
by Kamailio Dev 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: d0d4f58920669f280d80c6cd66578a4b68db9e43 URL: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-04T16:16:11+02:00 modules: readme files regenerated - xhttp_prom ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4… Patch: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4…

1 0

git:master:a55967c0: xhttp_prom: update documentation
by Ovidiu Sas 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: a55967c0e8cee184f1cc8cc0c5df4635041b88d1 URL: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-04T10:10:15-04:00 xhttp_prom: update documentation --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… Patch: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index e1f2709dd21..83cede92633 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -178,6 +178,29 @@ modparam("xhttp_prom", "xhttp_prom_stats", "200_replies") # Do not display internal &kamailio; statistics. This is the default option. modparam("xhttp_prom", "xhttp_prom_stats", "") +... + </programlisting> + </example> + </section> + <section id="xhttp_prom.p.xhttp_prom_pkg_stats"> + <title><varname>xhttp_prom_pkg_stats</varname> (str)</title> + <para> + Enable or disable internal &kamailio; pkg memory statistics. + </para> + <para> + <emphasis>If not 0</emphasis>, pkg memory statistics will be displayed. + </para> + <para> + <emphasis> + Default value is 0 (no pkg memory statistics). + </emphasis> + </para> + <example> + <title>Set <varname>xhttp_prom_pkg_stats</varname> parameter</title> + <programlisting format="linespecific"> +... +# enable pkg stats +modparam("xhttp_prom", "xhttp_prom_pkg_stats", 1) ... </programlisting> </example>

1 0

[kamailio/kamailio] core: dprint - include time in stderr json log (PR #3795)
by Alexander Bakker 04 Apr '24

04 Apr '24

#### 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 This patch introduces a new "time" field for JSON logging to stderr. The CEE format already includes this field, but the Kamailio-specific format doesn't. If you need timestamps in your structured logs, but don't want to use the CEE format due to its limitations, this patch'd give you the best of both worlds. I know this comes a little out of the blue, so any feedback is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3795 -- Commit Summary -- * core: dprint - include time in stderr json log -- File Changes -- M src/core/dprint.c (44) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3795.patch https://github.com/kamailio/kamailio/pull/3795.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3795 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3795(a)github.com>

2 2

git:master:c3e8860f: core: dprint - include time in stderr json log
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: c3e8860f00ca1d4618b8d2ce986b5d5c3eb9a9d3 URL: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T13:21:54+02:00 core: dprint - include time in stderr json log This patch introduces a new "time" field for JSON logging to stderr. The CEE format already includes this field, but the Kamailio-specific format doesn't. If you need timestamps in your structured logs, but don't want to use the CEE format due to its limitations, this patch'd give you the best of both worlds. --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… Patch: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 724d3445370..83d1e30f3ca 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -573,31 +573,31 @@ static int _ksr_slog_json_flags = 0; ".callid\": \"%.*s\"%s%s%.*s%s," \ " \"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_FMT \ - "{ \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ - " \"module\": \"%s\", \"file\": \"%s\"," \ - " \"line\": %d, \"function\": \"%s\"%.*s%s%s%.*s%s, \"%smessage\": " \ +#define KSR_SLOG_STDERR_JSON_FMT \ + "{ \"time\": \"%s.%09luZ\", \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ + " \"module\": \"%s\", \"file\": \"%s\"," \ + " \"line\": %d, \"function\": \"%s\"%.*s%s%s%.*s%s, \"%smessage\": " \ "%s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_CFMT \ - "{ \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ - " \"module\": \"%s\", \"file\": \"%s\"," \ - " \"line\": %d, \"function\": \"%s\", \"callid\": \"%.*s\"%s%s%.*s%s, " \ +#define KSR_SLOG_STDERR_JSON_CFMT \ + "{ \"time\": \"%s.%09luZ\", \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ + " \"module\": \"%s\", \"file\": \"%s\"," \ + " \"line\": %d, \"function\": \"%s\", \"callid\": \"%.*s\"%s%s%.*s%s, " \ "\"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_PFMT \ - "{ \"" NAME ".idx\": %d, \"" NAME ".pid\": %d, \"" NAME \ - ".level\": \"%s\"," \ - " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ - " \"" NAME ".line\": %d, \"" NAME \ +#define KSR_SLOG_STDERR_JSON_PFMT \ + "{ \"" NAME ".time\": \"%s.%09luZ\", \"" NAME ".idx\": %d, \"" NAME \ + ".pid\": %d, \"" NAME ".level\": \"%s\"," \ + " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ + " \"" NAME ".line\": %d, \"" NAME \ ".function\": \"%s\"%.*s\"%s%s%.*s%s, \"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_CPFMT \ - "{ \"" NAME ".idx\": %d, \"" NAME ".pid\": %d, \"" NAME \ - ".level\": \"%s\"," \ - " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ - " \"" NAME ".line\": %d, \"" NAME ".function\": \"%s\", \"" NAME \ - ".callid\": \"%.*s\"%s%s%.*s%s," \ +#define KSR_SLOG_STDERR_JSON_CPFMT \ + "{ \"" NAME ".time\": \"%s.%09luZ\", \"" NAME ".idx\": %d, \"" NAME \ + ".pid\": %d, \"" NAME ".level\": \"%s\"," \ + " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ + " \"" NAME ".line\": %d, \"" NAME ".function\": \"%s\", \"" NAME \ + ".callid\": \"%.*s\"%s%s%.*s%s," \ " \"%smessage\": %s%.*s%s }%s" #ifdef HAVE_PTHREAD @@ -735,9 +735,9 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) } else { if(unlikely(log_color)) dprint_color(kld->v_level); - fprintf(stderr, efmt, process_no, my_pid(), kld->v_lname, - kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, - LOGV_CALLID_LEN, LOGV_CALLID_STR, prname, pmb, + fprintf(stderr, efmt, iso8601buf, _tp.tv_nsec, process_no, my_pid(), + kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, + kld->v_func, LOGV_CALLID_LEN, LOGV_CALLID_STR, prname, pmb, LOGV_PREFIX_LEN, LOGV_PREFIX_STR, pme, prefmsg, smb, s_out.len, s_out.s, sme, (_ksr_slog_json_flags & KSR_SLOGJSON_FL_NOLOGNL) ? ""

1 0

git:master:3c16c13a: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 3c16c13acdf95924636c4d938abe13dcb3707b73 URL: https://github.com/kamailio/kamailio/commit/3c16c13acdf95924636c4d938abe13d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-04T13:01:21+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/3c16c13acdf95924636c4d938abe13d… Patch: https://github.com/kamailio/kamailio/commit/3c16c13acdf95924636c4d938abe13d… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index d2baa50e72d..4cfdcaa5b4f 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -39,7 +39,7 @@ Joel Centelles Martin 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -75,7 +75,7 @@ Chapter 1. Admin Guide 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -203,7 +203,7 @@ allid,time_hires&cid:callid 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 4.1. schema_path (string) @@ -247,6 +247,12 @@ modparam("db_redis", "verbosity", 0) Controls TLS usage while connecting to a remote DB. If set to 1, TLS is used to connect to the DB. + If TLS is enabled, the module will validate the Redis server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the Redis server must therefore be turned + off. + Default value: 0. Example 1.4. Enabling TLS connection @@ -265,9 +271,10 @@ modparam("db_redis", "opt_tls", 1) modparam("db_redis", "db_pass", "r3d1sPass") ... -4.6. ac_path (string) +4.6. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the Redis server + certificate are stored. Default value: "" (empty). diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 1cdfc842db3..90071f5e3f0 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -55,7 +55,7 @@ Joel Centelles Martin 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -103,7 +103,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -149,7 +149,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 3.1. server (str) @@ -168,6 +168,12 @@ Chapter 1. Admin Guide many REDIS servers, just give different attributes and use the specific server name when querying the REDIS instance. + If tls is enabled, the module will validate the REDIS server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the REDIS server must therefore be turned + off. + Default value is NULL. Example 1.1. Set server parameter @@ -346,9 +352,10 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "debug", 1) ... -3.11. ac_path (string) +3.11. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the REDIS server + certificate are stored. Default value: "" (empty).

1 0

[kamailio/kamailio] xhttp_prom: export pkg mem statistics (PR #3793)
by Ovidiu Sas 04 Apr '24

04 Apr '24

#### 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 Enhance xhttp_prom module to export pkgmem stats. The new stats can be enabled via a new module parameter: `xhttp_prom_pkgmem_stats_enabled`. Default value for the new module parameter: 0 (no pkg mem stats are generated). Any value different then 0 will export the pkg mem statistics. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3793 -- Commit Summary -- * kex: expose access to pkg mem stats * xhttp_prom: export pkg mem stats -- File Changes -- A src/modules/kex/api.c (54) A src/modules/kex/api.h (69) M src/modules/kex/kex_mod.c (2) M src/modules/kex/pkg_stats.c (24) M src/modules/kex/pkg_stats.h (17) M src/modules/xhttp_prom/prom.c (66) M src/modules/xhttp_prom/xhttp_prom.c (44) M src/modules/xhttp_prom/xhttp_prom.h (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3793.patch https://github.com/kamailio/kamailio/pull/3793.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3793 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3793(a)github.com>

3 10

git:master:24d77c23: xhttp_prom: export pkg stats
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 24d77c23e1c0a528289d611c16916caeb9992008 URL: https://github.com/kamailio/kamailio/commit/24d77c23e1c0a528289d611c16916ca… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T13:00:14+02:00 xhttp_prom: export pkg stats --- Modified: src/modules/xhttp_prom/prom.c Modified: src/modules/xhttp_prom/xhttp_prom.c Modified: src/modules/xhttp_prom/xhttp_prom.h --- Diff: https://github.com/kamailio/kamailio/commit/24d77c23e1c0a528289d611c16916ca… Patch: https://github.com/kamailio/kamailio/commit/24d77c23e1c0a528289d611c16916ca…

1 0

git:master:b0d16caf: kex: expose access to pkg stats
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: b0d16cafcfee44a8564e251c7a725324b25a1ff4 URL: https://github.com/kamailio/kamailio/commit/b0d16cafcfee44a8564e251c7a72532… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T13:00:14+02:00 kex: expose access to pkg stats --- Added: src/modules/kex/api.c Added: src/modules/kex/api.h Modified: src/modules/kex/kex_mod.c Modified: src/modules/kex/pkg_stats.c Modified: src/modules/kex/pkg_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/b0d16cafcfee44a8564e251c7a72532… Patch: https://github.com/kamailio/kamailio/commit/b0d16cafcfee44a8564e251c7a72532…

1 0

[kamailio/kamailio] ndb_redis: docs - refine docs regarding client certificates (PR #3804)
by Jannik 04 Apr '24

04 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The created ssl context in the `db_redis` and `ndb_redis` modules does not use client certificates [1], [2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. Without setting this configuration in Redis, no TLS connection to the Redis server can be established, since Redis will not accept unsigned/not-validated client certificates. There is also a small typo in "ac_path" in both docs which was fixed to "ca_path", added with some more specification to _which_ certificate is validated. [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3804 -- Commit Summary -- * db_redis: docs - refine docs regarding client certificates [skip ci] * ndb_redis: docs - refine docs regarding client certificates [skip ci] -- File Changes -- M src/modules/db_redis/doc/db_redis_admin.xml (10) M src/modules/ndb_redis/doc/ndb_redis_admin.xml (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3804.patch https://github.com/kamailio/kamailio/pull/3804.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3804 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3804(a)github.com>

2 2

git:master:6faa1806: ndb_redis: docs - refine docs regarding client certificates [skip ci]
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 6faa180661e799187eff3a498f8b13e96719fa92 URL: https://github.com/kamailio/kamailio/commit/6faa180661e799187eff3a498f8b13e… Author: Jannik Volkland <volkland(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T12:55:38+02:00 ndb_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6faa180661e799187eff3a498f8b13e… Patch: https://github.com/kamailio/kamailio/commit/6faa180661e799187eff3a498f8b13e… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index 74d35c75cc9..024b01315ac 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -75,6 +75,12 @@ many REDIS servers, just give different attributes and use the specific server name when querying the REDIS instance. </para> + <para> + If tls is enabled, the module will validate the REDIS server certificate against the + ca_path. There is currently no way to connect with a specified client certificate, the + <ulink url="https://redis.io/docs/management/security/encryption/#client-certificate-au…">corresponding configuration</ulink> + to check client certificates in the REDIS server must therefore be turned off. + </para> <para> <emphasis> Default value is NULL. @@ -330,9 +336,9 @@ modparam("ndb_redis", "debug", 1) </example> </section> <section id="ndb_redis.p.ca_path"> - <title><varname>ac_path</varname> (string)</title> + <title><varname>ca_path</varname> (string)</title> <para> - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the REDIS server certificate are stored. </para> <para> Default value: "" (empty).

1 0

git:master:40a50243: db_redis: docs - refine docs regarding client certificates [skip ci]
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 40a50243f0bae782b7acd97cf0a9b1138185068b URL: https://github.com/kamailio/kamailio/commit/40a50243f0bae782b7acd97cf0a9b11… Author: Jannik Volkland <volkland(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T12:55:38+02:00 db_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40a50243f0bae782b7acd97cf0a9b11… Patch: https://github.com/kamailio/kamailio/commit/40a50243f0bae782b7acd97cf0a9b11… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index a7e7c3bb3a9..15ed0ca61e2 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -224,6 +224,12 @@ modparam("db_redis", "verbosity", 0) Controls TLS usage while connecting to a remote DB. If set to 1, TLS is used to connect to the DB. </para> + <para> + If TLS is enabled, the module will validate the Redis server certificate against the + ca_path. There is currently no way to connect with a specified client certificate, the + <ulink url="https://redis.io/docs/management/security/encryption/#client-certificate-au…">corresponding configuration</ulink> + to check client certificates in the Redis server must therefore be turned off. + </para> <para> Default value: 0. </para> @@ -256,9 +262,9 @@ modparam("db_redis", "db_pass", "r3d1sPass") </section> <section id="db_redis.p.ca_path"> - <title><varname>ac_path</varname> (string)</title> + <title><varname>ca_path</varname> (string)</title> <para> - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the Redis server certificate are stored. </para> <para> Default value: "" (empty).

1 0

git:master:eb8027f9: sdpops: added $sdp(m0:b:AS), $sdp(m0:b:RR) and $sdp(m0:b:RS)
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: eb8027f9292d46d70583168b76589fa55ccccb07 URL: https://github.com/kamailio/kamailio/commit/eb8027f9292d46d70583168b76589fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T12:16:24+02:00 sdpops: added $sdp(m0:b:AS), $sdp(m0:b:RR) and $sdp(m0:b:RS) - return string values for b=AS:.., b=RR:.., b=RS:.. --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eb8027f9292d46d70583168b76589fa… Patch: https://github.com/kamailio/kamailio/commit/eb8027f9292d46d70583168b76589fa…

1 0

git:master:8047c958: sdpops: aliased $sdp(raw) to $sdp(body)
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 8047c958b42ea5af2e8f9ede0152f892ac0eea3a URL: https://github.com/kamailio/kamailio/commit/8047c958b42ea5af2e8f9ede0152f89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T20:16:21+02:00 sdpops: aliased $sdp(raw) to $sdp(body) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8047c958b42ea5af2e8f9ede0152f89… Patch: https://github.com/kamailio/kamailio/commit/8047c958b42ea5af2e8f9ede0152f89… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index b443d1f84ac..96d0bd202b8 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2259,6 +2259,12 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) return -1; switch(in->len) { + case 3: + if(strncmp(in->s, "raw", 3) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else + goto error; + break; case 4: if(strncmp(in->s, "body", 4) == 0) sp->pvp.pvn.u.isname.name.n = 0;

1 0

git:master:3e73dbc6: sdpops: added $sdp(m0:raw) - get all lines of the first m= stream
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 3e73dbc6b69c8e26f276690bb6aa1e6db380510e URL: https://github.com/kamailio/kamailio/commit/3e73dbc6b69c8e26f276690bb6aa1e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T19:19:27+02:00 sdpops: added $sdp(m0:raw) - get all lines of the first m= stream --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3e73dbc6b69c8e26f276690bb6aa1e6… Patch: https://github.com/kamailio/kamailio/commit/3e73dbc6b69c8e26f276690bb6aa1e6… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index b7ee2482616..b443d1f84ac 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2201,6 +2201,21 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } } + case 7: + /* m0:raw - all (raw) lines for m0 stream */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams->raw_stream.s != NULL + && sdp->sessions->streams->raw_stream.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->streams->raw_stream); + } + return pv_get_null(msg, param, res); + break; default: return pv_get_null(msg, param, res); @@ -2256,6 +2271,12 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) else goto error; break; + case 6: + if(strncmp(in->s, "m0:raw", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 7; + else + goto error; + break; case 11: if(strncmp(in->s, "m0:rtp:port", 11) == 0) sp->pvp.pvn.u.isname.name.n = 4;

1 0

git:master:ed60be16: pv: transformation to escape/unescape cr lf
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: ed60be162918fc1791ee6425f664eb2f76b9475e URL: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T18:52:58+02:00 pv: transformation to escape/unescape cr lf - {s.escape.crlf}, {s.unescape.crlf} --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… Patch: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 0cc6f8f2e2c..a3ce0f0ace3 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -566,6 +566,32 @@ int tr_eval_string( val->rs.s = _tr_buffer; val->rs.len = i; break; + case TR_S_ESCAPECRLF: + if(!(val->flags & PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len > TR_BUFFER_SIZE / 2 - 1) + return -1; + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if(escape_crlf(&val->rs, &st)) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; + case TR_S_UNESCAPECRLF: + if(!(val->flags & PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len > TR_BUFFER_SIZE - 1) + return -1; + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if(unescape_crlf(&val->rs, &st)) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; case TR_S_ESCAPEUSER: if(!(val->flags & PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -2768,6 +2794,12 @@ char *tr_parse_string(str *in, trans_t *t) && strncasecmp(name.s, "unescape.common", 15) == 0) { t->subtype = TR_S_UNESCAPECOMMON; goto done; + } else if(name.len == 11 && strncasecmp(name.s, "escape.crlf", 11) == 0) { + t->subtype = TR_S_ESCAPECRLF; + goto done; + } else if(name.len == 13 && strncasecmp(name.s, "unescape.crlf", 13) == 0) { + t->subtype = TR_S_UNESCAPECRLF; + goto done; } else if(name.len == 11 && strncasecmp(name.s, "escape.user", 11) == 0) { t->subtype = TR_S_ESCAPEUSER; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 827f74feb49..662d5a2b578 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -60,6 +60,8 @@ enum _tr_s_subtype TR_S_DECODEBASE64, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, + TR_S_ESCAPECRLF, + TR_S_UNESCAPECRLF, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM,

1 0

git:master:6992c9ee: core: helper functions to escape/unescape cr lf
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 6992c9eedeabd931fc255e5c1e992b0cfb01dbca URL: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T18:48:29+02:00 core: helper functions to escape/unescape cr lf --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… Patch: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index 73e713cb451..475150dc0f7 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -109,6 +109,68 @@ int unescape_common(char *dst, char *src, int src_len) return j; } +/*! \brief + * add backslashes for CR LF + */ +int escape_crlf(str *sin, str *sout) +{ + int i, j; + + if(sout == 0 || sin == 0 || sin->len <= 0) + return -1; + j = 0; + for(i = 0; i < sin->len; i++) { + switch(sin->s[i]) { + case '\n': + sout->s[j++] = '\\'; + sout->s[j++] = 'n'; + break; + case '\r': + sout->s[j++] = '\\'; + sout->s[j++] = 'r'; + break; + default: + sout->s[j++] = sin->s[i]; + } + } + sout->len = j; + return 0; +} + +/*! \brief + * remove backslashes for CR LF + */ +int unescape_crlf(str *sin, str *sout) +{ + int i, j; + + if(sout == 0 || sin == 0 || sin->len <= 0) + return -1; + j = 0; + i = 0; + while(i < sin->len) { + if(sin->s[i] == '\\' && i + 1 < sin->len) { + switch(sin->s[i + 1]) { + case 'n': + sout->s[j++] = '\n'; + i++; + break; + case 'r': + sout->s[j++] = '\r'; + i++; + break; + default: + sout->s[j++] = sin->s[i]; + } + } else { + sout->s[j++] = sin->s[i]; + } + i++; + } + sout->len = j; + return 0; +} + /*! \brief Unscape all printable ASCII characters */ int unescape_user(str *sin, str *sout) { diff --git a/src/core/strutils.h b/src/core/strutils.h index b32e610512c..5781943dacb 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -56,6 +56,8 @@ int escape_common(char *dst, char *src, int src_len); /* remove backslashes to special characters */ int unescape_common(char *dst, char *src, int src_len); +int escape_crlf(str *sin, str *sout); +int unescape_crlf(str *sin, str *sout); int escape_user(str *sin, str *sout); int unescape_user(str *sin, str *sout); int escape_param(str *sin, str *sout);

1 0

git:master:ec7f3a21: sdops: typo fixed for $sdp(m0:rtcp:port)
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: ec7f3a2173c1de220afd5b4776d92c98bb901630 URL: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T17:02:14+02:00 sdops: typo fixed for $sdp(m0:rtcp:port) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… Patch: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 644ded5b064..b7ee2482616 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2265,7 +2265,7 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) case 12: if(strncmp(in->s, "sess_version", 12) == 0) sp->pvp.pvn.u.isname.name.n = 1; - else if(strncmp(in->s, "m0:rctp:port", 12) == 0) + else if(strncmp(in->s, "m0:rtcp:port", 12) == 0) sp->pvp.pvn.u.isname.name.n = 5; else goto error;

1 0

Kamailio v5.8.1 Released
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Hello, Kamailio SIP Server v5.8.1 stable release is out. This is a maintenance release of the latest stable branch, 5.8, that includes fixes since the release of v5.8.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.8.x. Deployments running previous v5.8.x versions are strongly recommended to be upgraded to v5.8.1. For more details about version 5.8.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2024/04/kamailio-v5-8-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 0

git:5.8:384843ce: ChangeLog: content updated for v5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 384843ceb6705996c0c6da6359868bd6e370a0b7 URL: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:26:52+02:00 ChangeLog: content updated for v5.8.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd… Patch: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd…

1 0

git:5.8:e8aa9871: Makefile.defs: version set to 5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: e8aa98718d91d0e5af7d757176a180e0f2940417 URL: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:23:42+02:00 Makefile.defs: version set to 5.8.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… Patch: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index f5e8b0da653..0f960b4478e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 8 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:5.8:69f667fe: core: msg translator - duplicate reply via xavp params and handle errors
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 69f667fe9b95d09a642cb7edd7f16ce09bbac3f1 URL: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:21:37+02:00 core: msg translator - duplicate reply via xavp params and handle errors (cherry picked from commit 5f83d4f9c447f5a7e3de8336dc0e076b10e43833) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… Patch: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index b54eded3f89..acd5911867a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2362,6 +2362,7 @@ char *generate_res_buf_from_sip_res( char *buf; unsigned int len; str xparams; + str sdup; sr_lump_t *anchor; buf = msg->buf; @@ -2393,11 +2394,18 @@ char *generate_res_buf_from_sip_res( anchor = anchor_lump(msg, msg->via2->params.s + msg->via2->params.len - msg->buf, 0, 0); - if(anchor != NULL) { - if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) - == 0) { - LM_ERR("unable to add via reply xavp params\n"); - } + if(anchor == NULL) { + LM_ERR("unable to get the anchor\n"); + goto error; + } + if(pkg_str_dup(&sdup, &xparams) < 0) { + PKG_MEM_ERROR; + goto error; + } + if(insert_new_lump_after(anchor, sdup.s, sdup.len, 0) == 0) { + LM_ERR("unable to add via reply xavp params\n"); + pkg_free(sdup.s); + goto error; } } }

1 0

git:5.8:1caec71a: core: xavp - added missing closing parenthesis in log messages
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 1caec71aeddb7f65afb93bf05cb9e0aae2a2c0cd URL: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:21:26+02:00 core: xavp - added missing closing parenthesis in log messages (cherry picked from commit 3b09fd343575c56d9658a61efebd4851662de338) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… Patch: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 128ea631013..21a8197080b 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1151,7 +1151,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long)avp->val.v.l, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long int value (%d/%d\n", + LM_ERR("failed to serialize long int value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1162,7 +1162,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long long)avp->val.v.ll, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long long value (%d/%d\n", + LM_ERR("failed to serialize long long value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1178,7 +1178,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) qs, avp->val.v.s.len, avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, + LM_ERR("failed to serialize str value (%d/%d)\n", ostr.len, olen - rlen); return -1; }

1 0

git:master:5f83d4f9: core: msg translator - duplicate reply via xavp params and handle errors
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 5f83d4f9c447f5a7e3de8336dc0e076b10e43833 URL: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:18:47+02:00 core: msg translator - duplicate reply via xavp params and handle errors --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… Patch: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index b54eded3f89..acd5911867a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2362,6 +2362,7 @@ char *generate_res_buf_from_sip_res( char *buf; unsigned int len; str xparams; + str sdup; sr_lump_t *anchor; buf = msg->buf; @@ -2393,11 +2394,18 @@ char *generate_res_buf_from_sip_res( anchor = anchor_lump(msg, msg->via2->params.s + msg->via2->params.len - msg->buf, 0, 0); - if(anchor != NULL) { - if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) - == 0) { - LM_ERR("unable to add via reply xavp params\n"); - } + if(anchor == NULL) { + LM_ERR("unable to get the anchor\n"); + goto error; + } + if(pkg_str_dup(&sdup, &xparams) < 0) { + PKG_MEM_ERROR; + goto error; + } + if(insert_new_lump_after(anchor, sdup.s, sdup.len, 0) == 0) { + LM_ERR("unable to add via reply xavp params\n"); + pkg_free(sdup.s); + goto error; } } }

1 0

git:master:3b09fd34: core: xavp - added missing closing parenthesis in log messages
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 3b09fd343575c56d9658a61efebd4851662de338 URL: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:16:18+02:00 core: xavp - added missing closing parenthesis in log messages --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… Patch: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 128ea631013..21a8197080b 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1151,7 +1151,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long)avp->val.v.l, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long int value (%d/%d\n", + LM_ERR("failed to serialize long int value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1162,7 +1162,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long long)avp->val.v.ll, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long long value (%d/%d\n", + LM_ERR("failed to serialize long long value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1178,7 +1178,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) qs, avp->val.v.s.len, avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, + LM_ERR("failed to serialize str value (%d/%d)\n", ostr.len, olen - rlen); return -1; }

1 0

git:5.8:4708758f: pkg: deb specs updated for v5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 4708758f1c428cc94d1abdf9bb706c7c509efebe URL: https://github.com/kamailio/kamailio/commit/4708758f1c428cc94d1abdf9bb706c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T08:22:44+02:00 pkg: deb specs updated for v5.8.1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/4708758f1c428cc94d1abdf9bb706c7… Patch: https://github.com/kamailio/kamailio/commit/4708758f1c428cc94d1abdf9bb706c7…

1 0

git:5.8:3b00630c: pkg/kamailio: version set 5.8.1 for rpms and alpine
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 3b00630c8a20cc0f2b2f458742d885ea7e28e05f URL: https://github.com/kamailio/kamailio/commit/3b00630c8a20cc0f2b2f458742d885e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T08:20:49+02:00 pkg/kamailio: version set 5.8.1 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3b00630c8a20cc0f2b2f458742d885e… Patch: https://github.com/kamailio/kamailio/commit/3b00630c8a20cc0f2b2f458742d885e… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index eaa70ccd5ff..4b56df12b49 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.8.0 +pkgver=5.8.1 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d8811a2d1f9..ee339c02d99 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.8.0 +%define ver 5.8.1 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:master:e7b207e9: pv: $K(IP4) and $K(IP6) - support SDP style for address family
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: e7b207e933d0f4284009059753d5b6a80ebfa9f7 URL: https://github.com/kamailio/kamailio/commit/e7b207e933d0f4284009059753d5b6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T08:11:07+02:00 pv: $K(IP4) and $K(IP6) - support SDP style for address family --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/e7b207e933d0f4284009059753d5b6a… Patch: https://github.com/kamailio/kamailio/commit/e7b207e933d0f4284009059753d5b6a… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 129247f2688..1f998bfc1d3 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3894,6 +3894,10 @@ int pv_parse_K_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else if(strncmp(in->s, "WSS", 3) == 0) sp->pvp.pvn.u.isname.name.n = 7; + else if(strncmp(in->s, "IP4", 3) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "IP6", 3) == 0) + sp->pvp.pvn.u.isname.name.n = 1; else goto error; break;

1 0

git:master:42c76096: sdpops: added $sdp(c:af) - address family of first media connection
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 42c7609631235aae4a2d9d98c108b0af7cce1357 URL: https://github.com/kamailio/kamailio/commit/42c7609631235aae4a2d9d98c108b0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T08:07:15+02:00 sdpops: added $sdp(c:af) - address family of first media connection - can be compared with $K(IPv4) or $K(IPv6) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42c7609631235aae4a2d9d98c108b0a… Patch: https://github.com/kamailio/kamailio/commit/42c7609631235aae4a2d9d98c108b0a… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 507e7dbe81b..644ded5b064 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2174,6 +2174,33 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, &s); } return pv_get_null(msg, param, res); + case 6: + /* c:af - connection address family */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams == NULL) { + if(sdp->sessions->ip_addr.s != NULL + && sdp->sessions->ip_addr.len > 0) { + return pv_get_sintval(msg, param, res, sdp->sessions->pf); + } else { + return pv_get_null(msg, param, res); + } + } else { + if(sdp->sessions->streams->ip_addr.s != NULL + && sdp->sessions->streams->ip_addr.len > 0) { + return pv_get_sintval( + msg, param, res, sdp->sessions->streams->pf); + } else { + if(sdp->sessions->ip_addr.s != NULL + && sdp->sessions->ip_addr.len > 0) { + return pv_get_sintval( + msg, param, res, sdp->sessions->pf); + } else { + return pv_get_null(msg, param, res); + } + } + } default: return pv_get_null(msg, param, res); @@ -2222,6 +2249,8 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "c:ip", 4) == 0) sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "c:af", 4) == 0) + sp->pvp.pvn.u.isname.name.n = 6; else if(strncmp(in->s, "o:ip", 4) == 0) sp->pvp.pvn.u.isname.name.n = 3; else

1 0

Releasing v5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Hello, with many countries having public holidays around Catholic Easter, I am considering to release Kamailio v5.8.1 (out of branch 5.8) on Wednesday, April 3, 2024. If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 1

git:master:cbe13bed: sdpops: added $sdp(m0:rtcp:port) - rtcp port of first media stream
by Daniel-Constantin Mierla 02 Apr '24

02 Apr '24

Module: kamailio Branch: master Commit: cbe13bedc13278235ec66cde5938cd92e45e454b URL: https://github.com/kamailio/kamailio/commit/cbe13bedc13278235ec66cde5938cd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-02T21:22:39+02:00 sdpops: added $sdp(m0:rtcp:port) - rtcp port of first media stream --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cbe13bedc13278235ec66cde5938cd9… Patch: https://github.com/kamailio/kamailio/commit/cbe13bedc13278235ec66cde5938cd9… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 3675d48718e..507e7dbe81b 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2067,6 +2067,9 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) sdp_info_t *sdp = NULL; str sess_version = STR_NULL; long sess_version_num = 0; + unsigned int uport = 0; + static char uport_buf[INT2STR_MAX_LEN]; + str s = STR_NULL; if(msg == NULL || param == NULL) return -1; @@ -2150,6 +2153,27 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) msg, param, res, &sdp->sessions->streams->port); } return pv_get_null(msg, param, res); + case 5: + /* m0:rtcp:port */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams->rtcp_port.s != NULL + && sdp->sessions->streams->rtcp_port.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->streams->rtcp_port); + } + if(sdp->sessions->streams->port.s != NULL + && sdp->sessions->streams->port.len > 0) { + str2int(&sdp->sessions->streams->port, &uport); + uport++; + s.s = int2strbuf(uport, uport_buf, INT2STR_MAX_LEN, &s.len); + return pv_get_strval(msg, param, res, &s); + } + return pv_get_null(msg, param, res); default: return pv_get_null(msg, param, res); @@ -2212,6 +2236,8 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) case 12: if(strncmp(in->s, "sess_version", 12) == 0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "m0:rctp:port", 12) == 0) + sp->pvp.pvn.u.isname.name.n = 5; else goto error; break;

1 0

git:master:238219f1: sdpops: implemented $sdp(o:ip) - origin ip
by Daniel-Constantin Mierla 02 Apr '24

02 Apr '24

Module: kamailio Branch: master Commit: 238219f126e3a155d109fab415d58f8903ee618d URL: https://github.com/kamailio/kamailio/commit/238219f126e3a155d109fab415d58f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-02T17:06:58+02:00 sdpops: implemented $sdp(o:ip) - origin ip --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/238219f126e3a155d109fab415d58f8… Patch: https://github.com/kamailio/kamailio/commit/238219f126e3a155d109fab415d58f8… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 63243c3c3f6..3675d48718e 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2098,7 +2098,7 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } return pv_get_null(msg, param, res); case 2: - /* connection ip */ + /* c:ip - connection ip */ if(sdp->sessions == NULL) { return pv_get_null(msg, param, res); } @@ -2125,6 +2125,17 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } } + case 3: + /* o:ip - origin ip */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->o_ip_addr.s != NULL + && sdp->sessions->o_ip_addr.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->o_ip_addr); + } + return pv_get_null(msg, param, res); case 4: /* m0:rtp:port */ if(sdp->sessions == NULL) {

1 0

git:master:f2f3c57c: spdops: added $sdp(m0:rtp:port) - port of first media stream
by Daniel-Constantin Mierla 02 Apr '24

02 Apr '24

Module: kamailio Branch: master Commit: f2f3c57c2a9bc4bcdc829aaab743427cb349b7ab URL: https://github.com/kamailio/kamailio/commit/f2f3c57c2a9bc4bcdc829aaab743427… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-02T17:06:58+02:00 spdops: added $sdp(m0:rtp:port) - port of first media stream --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f2f3c57c2a9bc4bcdc829aaab743427… Patch: https://github.com/kamailio/kamailio/commit/f2f3c57c2a9bc4bcdc829aaab743427… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 980c275068b..63243c3c3f6 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2125,6 +2125,20 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } } + case 4: + /* m0:rtp:port */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams->port.s != NULL + && sdp->sessions->streams->port.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->streams->port); + } + return pv_get_null(msg, param, res); default: return pv_get_null(msg, param, res); @@ -2178,6 +2192,12 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) else goto error; break; + case 11: + if(strncmp(in->s, "m0:rtp:port", 11) == 0) + sp->pvp.pvn.u.isname.name.n = 4; + else + goto error; + break; case 12: if(strncmp(in->s, "sess_version", 12) == 0) sp->pvp.pvn.u.isname.name.n = 1;

1 0

[kamailio/kamailio] branch_failure route in case 503 and dns failover (PR #3138)
by vlitvinov 02 Apr '24

02 Apr '24

#### Pre-Submission Checklist    - [ ] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When we use DNS failover in case of timeout kamailio executes the branch_failure route. In the case of the 503 - on_reply route. This commit is to equate behavior in both cases. So if there are more candidates we will always execute branch_failure route and on_reply route only if this is the last candidate. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3138 -- Commit Summary -- * branch_failure route in case 503 and dns failover -- File Changes -- M src/modules/tm/t_reply.c (52) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3138.patch https://github.com/kamailio/kamailio/pull/3138.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3138 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3138(a)github.com>

4 16

[kamailio/kamailio] github: [skip ci]: bump tj-actions/changed-files from 43 to 44 (PR #3801)
by dependabot[bot] 02 Apr '24

02 Apr '24

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 43 to 44. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/releases">tj… releases</a>.</em></p> <blockquote> <h2>v44</h2> <h1>Changes in v44.0.0</h1> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <h3>Overview</h3> <p>We've made a significant update to how pull requests (PRs) from forked repositories are processed. This improvement not only streamlines the handling of such PRs but also fixes a previously identified issue.</p> <h3>Before the Change</h3> <p>Previously, when you created a pull request from a forked repository, any files changed in the target branch after the PR creation would erroneously appear as part of the PR's changed files. This made it difficult to distinguish between the actual changes introduced by the PR and subsequent changes made directly to the target branch.</p> <h3>What Has Changed</h3> <p>With this update, a pull request from a fork will now <strong>only</strong> include the files that were explicitly changed in the fork. This ensures that the list of changed files in a PR accurately reflects the contributions from the fork, without being muddled by unrelated changes to the target branch.</p> <hr /> <h2>What's Changed</h2> <ul> <li>Upgraded to v43.0.1 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2004&q… <li>chore(deps): lock file maintenance by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2005&q… <li>chore(deps): update typescript-eslint monorepo to v7.4.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2006&q… <li>fix: bug with prs from forks returning incorrect set of changed files by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2007&q… <li>fix: check for setting remote urls for forks by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2009&q… <li>fix: update to add the fork remote by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2010&q… <li>fix: update previous sha for forks by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2011&q… <li>fix: ensure the fork remote doesn't exists before creating it by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2012&q… <li>chore: update description of other_deleted_files output by <a href="https://github.com/tonyejack1"><code>@tonyejack1&… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2008&q… <li>Updated README.md by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2013&q… <li>remove: unused code by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2014&q… <li>chore: update description of outputs removing asterisks by <a href="https://github.com/tonyejack1"><code>@tonyejack1&… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2015&q… <li>Updated README.md by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2016&q… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/tonyejack1"><code>@tonyejack1&… made their first contribution in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2008&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v43.0.1...v4… <hr /> <h2>v44.0.0</h2> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <h3>Overview</h3> <p>We've made a significant update to how pull requests (PRs) from forked repositories are processed. This improvement not only streamlines the handling of such PRs but also fixes a previously identified issue.</p> <h3>Before the Change</h3> <p>Previously, when you created a pull request from a forked repository, any files changed in the target branch after the PR creation would erroneously appear as part of the PR's changed files. This made it difficult to distinguish between the actual changes introduced by the PR and subsequent changes made directly to the target branch.</p> <h3>What Has Changed</h3> <p>With this update, a pull request from a fork will now <strong>only</strong> include the files that were explicitly changed in the fork. This ensures that the list of changed files in a PR accurately reflects the contributions from the fork, without being muddled by unrelated changes to the target branch.</p>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/blob/main/HISTORY.md… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h1><a href="https://github.com/tj-actions/changed-files/compare/v43.0.1...v4… - (2024-03-27)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Ensure the fork remote doesn't exists before creating it (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2012…) (<a href="https://github.com/tj-actions/changed-files/commit/4bbd49b9986b1…) - (Tonye Jack)</li> <li>Update previos sha for forks (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2011…) (<a href="https://github.com/tj-actions/changed-files/commit/f0e7702ccc359…) - (Tonye Jack)</li> <li>Update to add the fork remote (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2010…) (<a href="https://github.com/tj-actions/changed-files/commit/6354e6c5426d1…) - (Tonye Jack)</li> <li>Check for setting remote urls for forks (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2009…) (<a href="https://github.com/tj-actions/changed-files/commit/117616472fb77…) - (Tonye Jack)</li> <li>Bug with prs from forks returning incorrect set of changed files (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2007…) (<a href="https://github.com/tj-actions/changed-files/commit/4ff79362e5015…) - (Tonye Jack)</li> </ul> <h2>➖ Remove</h2> <ul> <li>Unused code (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2014…) (<a href="https://github.com/tj-actions/changed-files/commit/90941b398f6d8…) - (Tonye Jack)</li> </ul> <h2>🔄 Update</h2> <ul> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2016… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/2d756ea4c53f7…) - (tj-actions[bot])</p> <ul> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/2d21bbb405b3e…) - (Tonye Jack)</li> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2013… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/2ca8dc42f60aa…) - (tj-actions[bot])</p> <ul> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/4621617d4b568…) - (tonyejack1)</li> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/c6557ed000b9d…) - (Tonye Jack)</li> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/0713a11242c79…) - (Tonye Jack)</li> </ul> <h2>⚙️ Miscellaneous Tasks</h2> <ul> <li>Update description of outputs removing asterisks (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2015…) (<a href="https://github.com/tj-actions/changed-files/commit/ce497c39e9043…) - (tonyejack1)</li> <li>Update description of other_deleted_files output (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2008…) (<a href="https://github.com/tj-actions/changed-files/commit/ee096d679e877…) - (tonyejack1)</li> <li><strong>deps:</strong> Update typescript-eslint monorepo to v7.4.0 (<a href="https://github.com/tj-actions/changed-files/commit/064742427d810…) - (renovate[bot])</li> <li><strong>deps:</strong> Lock file maintenance (<a href="https://github.com/tj-actions/changed-files/commit/efe5e6c7a415f…) - (renovate[bot])</li> </ul> <h2>⬆️ Upgrades</h2> <ul> <li>Upgraded to v43.0.1 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2004… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/01e9662a12a71…) - (tj-actions[bot])</p> <h1><a href="https://github.com/tj-actions/changed-files/compare/v43.0.0...v4… - (2024-03-20)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Remove warning with detecting the local git repository when using Github's REST API (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2002…) (<a href="https://github.com/tj-actions/changed-files/commit/077b23f6a68d9…) - (Tonye Jack)</li> </ul> <h2>📦 Bumps</h2>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tj-actions/changed-files/commit/2d756ea4c53f7… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2016… <li><a href="https://github.com/tj-actions/changed-files/commit/ce497c39e9043… chore: update description of outputs removing asterisks (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2015… <li><a href="https://github.com/tj-actions/changed-files/commit/2d21bbb405b3e… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/90941b398f6d8… remove: unused code (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2014… <li><a href="https://github.com/tj-actions/changed-files/commit/2ca8dc42f60aa… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2013… <li><a href="https://github.com/tj-actions/changed-files/commit/ee096d679e877… chore: update description of other_deleted_files output (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2008… <li><a href="https://github.com/tj-actions/changed-files/commit/4621617d4b568… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/4bbd49b9986b1… fix: ensure the fork remote doesn't exists before creating it (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2012… <li><a href="https://github.com/tj-actions/changed-files/commit/c6557ed000b9d… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/f0e7702ccc359… fix: update previos sha for forks (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2011… <li>Additional commits viewable in <a href="https://github.com/tj-actions/changed-files/compare/v43...v44&qu… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3801 -- Commit Summary -- * github: [skip ci]: bump tj-actions/changed-files from 43 to 44 -- File Changes -- M .github/workflows/devcontainer.yaml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3801.patch https://github.com/kamailio/kamailio/pull/3801.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3801 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3801(a)github.com>

2 1

git:master:87e60ca5: github: [skip ci]: bump tj-actions/changed-files from 43 to 44
by Victor Seva 02 Apr '24

02 Apr '24

Module: kamailio Branch: master Commit: 87e60ca580f327d1d34f6881cda1048e5658a94b URL: https://github.com/kamailio/kamailio/commit/87e60ca580f327d1d34f6881cda1048… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-02T03:30:26+02:00 github: [skip ci]: bump tj-actions/changed-files from 43 to 44 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 43 to 44. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v43...v44) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/devcontainer.yaml --- Diff: https://github.com/kamailio/kamailio/commit/87e60ca580f327d1d34f6881cda1048… Patch: https://github.com/kamailio/kamailio/commit/87e60ca580f327d1d34f6881cda1048… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index a237e2a0338..e70f646891c 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -33,14 +33,14 @@ jobs: - name: Get changed files if: ${{ ! inputs.force }} id: changed-files - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@v44 with: since_last_remote_commit: true - name: changes in relevant files if: ${{ ! inputs.force }} id: changed-files-builder - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@v44 with: files: | .devcontainer/**

1 0

[kamailio/kamailio] Consider adding socket options SO_BINDTODEVICE when the interface name is given for listen in the config file (Issue #3716)
by Harish S 01 Apr '24

01 Apr '24

### Description Consider adding socket options SO_BINDTODEVICE when the interface name is given for listening in the config file. This will be useful in listening to linux VRF interfaces, especially when there are two different VRFs and it is required to proxy SIP messages between the VRFs -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3716 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3716(a)github.com>

3 3

git:5.8:4e4e935c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: 4e4e935c45ccf32dab9bf5af693a0f52f54684ae URL: https://github.com/kamailio/kamailio/commit/4e4e935c45ccf32dab9bf5af693a0f5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-01T08:31:34+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/smsops/README --- Diff: https://github.com/kamailio/kamailio/commit/4e4e935c45ccf32dab9bf5af693a0f5… Patch: https://github.com/kamailio/kamailio/commit/4e4e935c45ccf32dab9bf5af693a0f5… --- 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:5.8:e394a051: blst: reformat exported structures
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: e394a05152b29d4009c9cb963bced72526c7651b URL: https://github.com/kamailio/kamailio/commit/e394a05152b29d4009c9cb963bced72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:08:46+02:00 blst: reformat exported structures (cherry picked from commit e39557c96d2f419184c826d779f1a3309acc4269) --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/e394a05152b29d4009c9cb963bced72… Patch: https://github.com/kamailio/kamailio/commit/e394a05152b29d4009c9cb963bced72… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 6a2c1d625b6..148a9a9d9d0 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -49,37 +49,44 @@ static int blst_rpl_set_ignore_f(struct sip_msg *, char *, char *); static int blst_rpl_clear_ignore_f(struct sip_msg *, char *, char *); -static cmd_export_t cmds[] = {{"blst_add", blst_add0_f, 0, 0, 0, ANY_ROUTE}, - {"blst_add", blst_add1_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_add_retry_after", blst_add_retry_after_f, 2, fixup_var_int_12, 0, +/* clang-format off */ +static cmd_export_t cmds[] = { + {"blst_add", blst_add0_f, 0, 0, 0, ANY_ROUTE}, + {"blst_add", blst_add1_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, + {"blst_add_retry_after", blst_add_retry_after_f, 2, fixup_var_int_12, 0, ANY_ROUTE}, - {"blst_del", blst_del_f, 0, 0, 0, ANY_ROUTE}, - {"blst_is_blocklisted", blst_is_blocklisted_f, 0, 0, 0, ANY_ROUTE}, - {"blst_set_ignore", blst_set_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_set_ignore", blst_set_ignore_f, 1, fixup_var_int_1, 0, + {"blst_del", blst_del_f, 0, 0, 0, ANY_ROUTE}, + {"blst_is_blocklisted", blst_is_blocklisted_f, 0, 0, 0, ANY_ROUTE}, + {"blst_set_ignore", blst_set_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_set_ignore", blst_set_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_clear_ignore", blst_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_clear_ignore", blst_clear_ignore_f, 1, fixup_var_int_1, 0, + {"blst_clear_ignore", blst_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_clear_ignore", blst_clear_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 1, fixup_var_int_1, 0, + {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 1, fixup_var_int_1, + {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; /* no params */ struct module_exports exports = { - "blst", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, params, 0, /* RPC methods */ - 0, /* pseudo-variables exports */ - 0, /* response function */ - 0, /* module initialization function */ - 0, /* per-child init function */ - 0 /* destroy function */ + "blst", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, + params, + 0, /* RPC methods */ + 0, /* pseudo-variables exports */ + 0, /* response function */ + 0, /* module initialization function */ + 0, /* per-child init function */ + 0 /* destroy function */ }; +/* clang-format on */ /**

1 0

git:5.8:c0c8ee05: smsops: short reference section about variables
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: c0c8ee05ab25256b9154d2056ee04b07f3f2290a URL: https://github.com/kamailio/kamailio/commit/c0c8ee05ab25256b9154d2056ee04b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:08:38+02:00 smsops: short reference section about variables (cherry picked from commit 9a94930ae1168d5df79e3dc1414841cdf23a2eba) --- Modified: src/modules/smsops/doc/smsops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c0c8ee05ab25256b9154d2056ee04b0… Patch: https://github.com/kamailio/kamailio/commit/c0c8ee05ab25256b9154d2056ee04b0… --- diff --git a/src/modules/smsops/doc/smsops_admin.xml b/src/modules/smsops/doc/smsops_admin.xml index fa19ebfc79c..da95e37c012 100644 --- a/src/modules/smsops/doc/smsops_admin.xml +++ b/src/modules/smsops/doc/smsops_admin.xml @@ -95,5 +95,19 @@ smsdump(); </section> </section> + <section> + <title>Variables</title> + <para>Several variables are exported by the module to access the + attributes of the SMS.</para> + <itemizedlist> + <listitem> + <para><emphasis>$smsack</emphasis></para> + <para><emphasis>$smsbody</emphasis></para> + <para><emphasis>$rpdata(key)</emphasis></para> + <para><emphasis>$tpdu(key)</emphasis></para> + </listitem> + </itemizedlist> + </section> + </chapter>

1 0

git:5.8:b21a7aaa: smsops: reformat module exports structures
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: b21a7aaa467f2b76a52308557657c65274e34087 URL: https://github.com/kamailio/kamailio/commit/b21a7aaa467f2b76a52308557657c65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:55+02:00 smsops: reformat module exports structures (cherry picked from commit 9848d43cb367d6901a0b8c727759feb8a8fad930) --- Modified: src/modules/smsops/smsops.c --- Diff: https://github.com/kamailio/kamailio/commit/b21a7aaa467f2b76a52308557657c65… Patch: https://github.com/kamailio/kamailio/commit/b21a7aaa467f2b76a52308557657c65… --- diff --git a/src/modules/smsops/smsops.c b/src/modules/smsops/smsops.c index 3e2cb88bc58..d8354af2319 100644 --- a/src/modules/smsops/smsops.c +++ b/src/modules/smsops/smsops.c @@ -30,31 +30,36 @@ MODULE_VERSION -static pv_export_t mod_pvs[] = {{{"smsack", sizeof("smsack") - 1}, PVT_OTHER, - pv_sms_ack, 0, 0, 0, 0, 0}, - {{"rpdata", sizeof("rpdata") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, - pv_parse_rpdata_name, 0, 0, 0}, - {{"tpdu", sizeof("tpdu") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, +/* clang-format off */ +static pv_export_t mod_pvs[] = { + {{"smsack", sizeof("smsack") - 1}, PVT_OTHER, pv_sms_ack, 0, 0, 0, 0, 0}, + {{"rpdata", sizeof("rpdata") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, + pv_parse_rpdata_name, 0, 0, 0}, + {{"tpdu", sizeof("tpdu") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, pv_parse_tpdu_name, 0, 0, 0}, - {{"smsbody", sizeof("smsbody") - 1}, PVT_OTHER, pv_sms_body, 0, 0, 0, 0, - 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"smsbody", sizeof("smsbody") - 1}, PVT_OTHER, pv_sms_body, 0, 0, 0, 0, 0}, + + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; static cmd_export_t cmds[] = { - {"smsdump", (cmd_function)smsdump, 0, 0, 0, REQUEST_ROUTE}, - {"isRPDATA", (cmd_function)isRPDATA, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"smsdump", (cmd_function)smsdump, 0, 0, 0, REQUEST_ROUTE}, + {"isRPDATA", (cmd_function)isRPDATA, 0, 0, 0, REQUEST_ROUTE}, + + {0, 0, 0, 0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "smsops", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - 0, /* exported parameters */ - 0, /* exported rpc functions */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function*/ - 0, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "smsops", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + 0, /* exported parameters */ + 0, /* exported rpc functions */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function*/ + 0, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev