- sr-dev - kamailio.org

[kamailio/kamailio] tls_wolfssl: new module TLS stack based on wolfSSL (PR #3144)
by space88man 16 Jun '22

16 Jun '22

New module: add wolfSSL as alternate TLS stack.   #### 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 a new module: an alternate TLS implementation based on wolfSSL. The current tls module based on OpenSSL has many multi-process workarounds and can be quite fragile. This is the initial code dump which is a copy of `tls/` and edited to compile with wolfSSL by using the OpenSSL compatibility layer. The `doc/` directory has not been changed. The proposal is to get it into the code base as soon as possible so as to sync up with any ongoing changes in the `tls/` module. Any shared features can be extracted out into a common module: like certificate and configuration. In the short-term the steps are: * testing * use native wolfSSL APIs (remove OpenSSL compatibility layer) * remove OpenSSL multi-process hacks in this module This module is inspired by the `tls_wolfssl` module in the sister SIP project. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3144 -- Commit Summary -- * tls_wolfssl: new module TLS stack based on wolfSSL -- File Changes -- A src/modules/tls_wolfssl/Makefile (81) A src/modules/tls_wolfssl/README (1713) A src/modules/tls_wolfssl/TODO.md (7) A src/modules/tls_wolfssl/doc/Makefile (4) A src/modules/tls_wolfssl/doc/certs_howto.xml (154) A src/modules/tls_wolfssl/doc/functions.xml (63) A src/modules/tls_wolfssl/doc/history.xml (38) A src/modules/tls_wolfssl/doc/hsm_howto.xml (64) A src/modules/tls_wolfssl/doc/params.xml (1410) A src/modules/tls_wolfssl/doc/rpc.xml (69) A src/modules/tls_wolfssl/doc/tls.xml (367) A src/modules/tls_wolfssl/fixed_c_zlib.h (258) A src/modules/tls_wolfssl/sbufq.h (283) A src/modules/tls_wolfssl/tls.cfg (106) A src/modules/tls_wolfssl/tls_bio.c (314) A src/modules/tls_wolfssl/tls_bio.h (69) A src/modules/tls_wolfssl/tls_cert.sh (201) A src/modules/tls_wolfssl/tls_cfg.c (289) A src/modules/tls_wolfssl/tls_cfg.h (111) A src/modules/tls_wolfssl/tls_config.c (536) A src/modules/tls_wolfssl/tls_config.h (53) A src/modules/tls_wolfssl/tls_ct_q.h (133) A src/modules/tls_wolfssl/tls_ct_wrq.c (205) A src/modules/tls_wolfssl/tls_ct_wrq.h (98) A src/modules/tls_wolfssl/tls_domain.c (1585) A src/modules/tls_wolfssl/tls_domain.h (238) A src/modules/tls_wolfssl/tls_dump_vf.c (150) A src/modules/tls_wolfssl/tls_dump_vf.h (41) A src/modules/tls_wolfssl/tls_init.c (589) A src/modules/tls_wolfssl/tls_init.h (85) A src/modules/tls_wolfssl/tls_locking.c (59) A src/modules/tls_wolfssl/tls_locking.h (34) A src/modules/tls_wolfssl/tls_map.c (195) A src/modules/tls_wolfssl/tls_map.h (77) A src/modules/tls_wolfssl/tls_mod.c (733) A src/modules/tls_wolfssl/tls_mod.h (45) A src/modules/tls_wolfssl/tls_rand.c (375) A src/modules/tls_wolfssl/tls_rand.h (32) A src/modules/tls_wolfssl/tls_rpc.c (263) A src/modules/tls_wolfssl/tls_rpc.h (33) A src/modules/tls_wolfssl/tls_select.c (1707) A src/modules/tls_wolfssl/tls_select.h (52) A src/modules/tls_wolfssl/tls_server.c (1557) A src/modules/tls_wolfssl/tls_server.h (101) A src/modules/tls_wolfssl/tls_util.c (99) A src/modules/tls_wolfssl/tls_util.h (87) A src/modules/tls_wolfssl/tls_verify.c (135) A src/modules/tls_wolfssl/tls_verify.h (42) A src/modules/tls_wolfssl/todo.txt (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3144.patch https://github.com/kamailio/kamailio/pull/3144.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3144 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3144(a)github.com>

3 14

git:master:a21bf23c: modules: readme files regenerated - pua_dialoginfo ... [skip ci]
by Kamailio Dev 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: a21bf23c1299a15a538de9883082e1d075b7f7e0 URL: https://github.com/kamailio/kamailio/commit/a21bf23c1299a15a538de9883082e1d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-16T12:31:15+02:00 modules: readme files regenerated - pua_dialoginfo ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/a21bf23c1299a15a538de9883082e1d… Patch: https://github.com/kamailio/kamailio/commit/a21bf23c1299a15a538de9883082e1d…

1 0

[kamailio/kamailio] pua dialoginfo: improvements (PR #3143)
by Victor Seva 16 Jun '22

16 Jun '22

#### 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 Changes from Sipwise flavor: - refresh_pubruri_avps_flag: if enabled, this message flag indicates whether to refresh R-Uri from avps before sending the PUBLISH requests. - improvement for use_pubruri_avps: use locking to avoid crashes since we are using shared memory - local_identity_dlg_var: reporting dialog-information will use the value of the dialog variable if exists You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3143 -- Commit Summary -- * pua_dialoginfo: refresh_pubruri_avps_flag * pua_dialoginfo: use lock when use_puburi_avps is set * pua_dialoginfo: local_identity_dlg_var -- File Changes -- M src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml (39) M src/modules/pua_dialoginfo/pua_dialoginfo.c (113) M src/modules/pua_dialoginfo/pua_dialoginfo.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3143.patch https://github.com/kamailio/kamailio/pull/3143.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3143 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3143(a)github.com>

2 3

git:master:8ac31370: pua_dialoginfo: local_identity_dlg_var
by Victor Seva 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: 8ac3137057d07f42eb8845ae4fb29cd9c4021165 URL: https://github.com/kamailio/kamailio/commit/8ac3137057d07f42eb8845ae4fb29cd… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-16T12:17:32+02:00 pua_dialoginfo: local_identity_dlg_var --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/8ac3137057d07f42eb8845ae4fb29cd… Patch: https://github.com/kamailio/kamailio/commit/8ac3137057d07f42eb8845ae4fb29cd… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index f6e544c832..676201cad4 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -620,6 +620,25 @@ modparam("pua_dialoginfo", "publish_dialog_req_within", 0) </example> </section> + <section id="pua_dialoginfo.p.local_identity_dlg_var"> + <title><varname>local_identity_dlg_var</varname> (str)</title> + <para> + PUBLISH-requests reporting dialog-information will use the value of + the dialog variable if exists + </para> + <para> + <emphasis>Default value is <quote>NULL</quote>.</emphasis> + </para> + <example> + <title>Set <varname>local_identity_dlg_var</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "local_identity_dlg_var", "local_identity") +... +</programlisting> + </example> + </section> + <section id="pua_dialoginfo.p.attribute_display"> <title><varname>attribute_display</varname> (int)</title> <para> diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 83c4f2c3f8..1e4f17110d 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -87,6 +87,7 @@ static str caller_dlg_var = {0, 0}; /* pubruri_caller */ static str callee_dlg_var = {0, 0}; /* pubruri_callee */ static str caller_entity_when_publish_disabled = {0, 0}; /* pubruri_caller */ static str callee_entity_when_publish_disabled = {0, 0}; /* pubruri_callee */ +static str local_identity_dlg_var = STR_NULL; /* Module parameter variables */ int include_callid = DEF_INCLUDE_CALLID; @@ -132,6 +133,7 @@ static param_export_t params[]={ {"pubruri_callee_avp", PARAM_STRING, &pubruri_callee_avp }, {"pubruri_caller_dlg_var", PARAM_STR, &caller_dlg_var }, {"pubruri_callee_dlg_var", PARAM_STR, &callee_dlg_var }, + {"local_identity_dlg_var", PARAM_STR, &local_identity_dlg_var }, {"callee_trying", INT_PARAM, &callee_trying }, {"disable_caller_publish_flag", INT_PARAM, &disable_caller_publish_flag }, {"disable_callee_publish_flag", INT_PARAM, &disable_callee_publish_flag }, @@ -312,6 +314,17 @@ void refresh_pubruri_avps(struct dlginfo_cell *dlginfo, str *uri) } } +void refresh_local_identity(struct dlg_cell *dlg, str *uri) { + str *s = dlg_api.get_dlg_var(dlg, &local_identity_dlg_var); + + if(s != NULL) { + uri->s = s->s; + uri->len = s->len; + LM_DBG("Found local_identity in dialog '%.*s'\n", + uri->len, uri->s); + } +} + static void __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { @@ -357,6 +370,10 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para refresh_pubruri_avps(dlginfo, &uri); } + if(local_identity_dlg_var.len > 0) { + refresh_local_identity(dlg, &uri); + } + switch (type) { case DLGCB_FAILED: case DLGCB_TERMINATED:

1 0

git:master:a5c0d5fe: pua_dialoginfo: refresh_pubruri_avps_flag
by Victor Seva 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: a5c0d5fe890a243e648d0de7463da63b910c2a81 URL: https://github.com/kamailio/kamailio/commit/a5c0d5fe890a243e648d0de7463da63… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-16T12:17:32+02:00 pua_dialoginfo: refresh_pubruri_avps_flag --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a5c0d5fe890a243e648d0de7463da63… Patch: https://github.com/kamailio/kamailio/commit/a5c0d5fe890a243e648d0de7463da63…

1 0

git:master:bd7261a5: pua_dialoginfo: use lock when use_puburi_avps is set
by Victor Seva 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: bd7261a5f656a8e723bb6999633c55864b46f1b6 URL: https://github.com/kamailio/kamailio/commit/bd7261a5f656a8e723bb6999633c558… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-16T12:17:32+02:00 pua_dialoginfo: use lock when use_puburi_avps is set --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/bd7261a5f656a8e723bb6999633c558… Patch: https://github.com/kamailio/kamailio/commit/bd7261a5f656a8e723bb6999633c558… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index a705ed3e69..83c4f2c3f8 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -353,6 +353,7 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para if(use_pubruri_avps && (refresh_pubruri_avps_flag > -1 || (request->flags & (1<<refresh_pubruri_avps_flag)))) { + lock_get(&dlginfo->lock); refresh_pubruri_avps(dlginfo, &uri); } @@ -496,6 +497,12 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para send_publish_flag==-1?1:0,&(dlginfo->uuid)); } } + + if(use_pubruri_avps && (refresh_pubruri_avps_flag > -1 + || (request->flags & (1<<refresh_pubruri_avps_flag)))) + { + lock_release(&dlginfo->lock); + } } /* @@ -577,6 +584,12 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable } memset( dlginfo, 0, len); + if(use_pubruri_avps && lock_init(&dlginfo->lock) == 0) { + LM_ERR("cannot init the lock\n"); + free_dlginfo_cell(dlginfo); + return NULL; + } + /* copy from dlg structure to dlginfo structure */ dlginfo->lifetime = override_lifetime ? override_lifetime : dlg->lifetime; dlginfo->disable_caller_publish = disable_caller_publish; @@ -756,20 +769,24 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) if ((!disable_caller_publish) && (disable_caller_publish_flag == -1 || !(request && (request->flags & (1<<disable_caller_publish_flag))))) { + if(use_pubruri_avps) lock_get(&dlginfo->lock); dialog_publish_multi("Trying", dlginfo->pubruris_caller, &identity_local, &identity_remote, &(dlg->callid), 1, dlginfo->lifetime, 0, 0, 0, 0, (send_publish_flag==-1)?1:0,&(dlginfo->uuid)); + if(use_pubruri_avps) lock_release(&dlginfo->lock); } if (callee_trying && ((!disable_callee_publish) && (disable_callee_publish_flag == -1 || !(request && (request->flags & (1<<disable_callee_publish_flag)))))) { + if(use_pubruri_avps) lock_get(&dlginfo->lock); dialog_publish_multi("Trying", dlginfo->pubruris_callee, &identity_remote, &identity_local, &(dlg->callid), 0, dlginfo->lifetime, 0, 0, 0, 0, (send_publish_flag==-1)?1:0,&(dlginfo->uuid)); + if(use_pubruri_avps) lock_release(&dlginfo->lock); } } @@ -939,9 +956,7 @@ void free_dlginfo_cell(void *param) { free_str_list_all(cell->pubruris_caller); free_str_list_all(cell->pubruris_callee); - /*if (cell->to_tag) { - shm_free(cell->to_tag); - }*/ + if(use_pubruri_avps) lock_destroy(cell->lock); shm_free(param); } diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.h b/src/modules/pua_dialoginfo/pua_dialoginfo.h index d86799adee..04875536f3 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.h +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.h @@ -23,6 +23,7 @@ #ifndef _PUA_DLGINFO_H #define _PUA_DLGINFO_H +#include "../../core/locking.h" #include "../pua/pua_bind.h" extern send_publish_t pua_send_publish; @@ -35,6 +36,7 @@ void dialog_publish_multi(char *state, struct str_list* ruris, str *entity, str * dlg_cell during the callback (as this could create a race condition * if the dlg_cell gets meanwhile deleted) */ struct dlginfo_cell { + gen_lock_t lock; str from_uri; str to_uri; str callid;

1 0

git:5.6:d456f07c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: d456f07cd14b8f3bf7a4eae229a8e1ba46be45c4 URL: https://github.com/kamailio/kamailio/commit/d456f07cd14b8f3bf7a4eae229a8e1b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-16T09:46:34+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth_identity/README Modified: src/modules/db_cluster/README Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/d456f07cd14b8f3bf7a4eae229a8e1b… Patch: https://github.com/kamailio/kamailio/commit/d456f07cd14b8f3bf7a4eae229a8e1b… --- diff --git a/src/modules/auth_identity/README b/src/modules/auth_identity/README index 5ffdd5d9b1b..acbac172dd2 100644 --- a/src/modules/auth_identity/README +++ b/src/modules/auth_identity/README @@ -25,7 +25,7 @@ Gergely Kovacs 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 6. Functions @@ -91,7 +91,7 @@ Chapter 1. Admin Guide 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 6. Functions @@ -174,7 +174,7 @@ Chapter 1. Admin Guide 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 5.1. privatekey_path (string) @@ -296,11 +296,12 @@ modparam("auth_identity","certificate_cache_limit",4096) modparam("auth_identity","cainfo_path","/etc/ssl/certs/ca-certificates.crt") ... -5.9. accept_pem_certs ([0|1]) +5.9. accept_pem_certs (int) Note: this parameter is for verifier service. Enables the acquired certificate processing if it is in PEM format. + Value can be 0 or 1. This parameter is optional. The default value is "0". diff --git a/src/modules/db_cluster/README b/src/modules/db_cluster/README index 7260f0f1aa8..5b4962e0025 100644 --- a/src/modules/db_cluster/README +++ b/src/modules/db_cluster/README @@ -213,7 +213,8 @@ modparam("db_cluster", "max_query_length", 5) modparam("db_cluster", "connection", "c1=>mysql://kamailio:kamailiorw@localhost/kamailio1") modparam("db_cluster", "connection", - "c2=>mysql://kamailio:kamailiorw@localhost/kamailio2") + "c2=>mysql://kamailio:kamailiorw@remotehost/kamailio2") + modparam("db_cluster", "cluster", "k1=>c1=9r9p;c2=9r9p") modparam("acc", "db_url", "cluster://k1") diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index 8b03c3849f3..e5ba03d8fbd 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -320,7 +320,7 @@ modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") ... route[TCLEAN] { - exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +1 -delete &"); + exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +2 -delete &"); } ...

1 0

git:master:38c0469f: modules: readme files regenerated - tls_wolfssl ... [skip ci]
by Kamailio Dev 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: 38c0469fd804e79a6f9f69efb063a7e29c14485a URL: https://github.com/kamailio/kamailio/commit/38c0469fd804e79a6f9f69efb063a7e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-16T09:46:18+02:00 modules: readme files regenerated - tls_wolfssl ... [skip ci] --- Modified: src/modules/tls_wolfssl/README --- Diff: https://github.com/kamailio/kamailio/commit/38c0469fd804e79a6f9f69efb063a7e… Patch: https://github.com/kamailio/kamailio/commit/38c0469fd804e79a6f9f69efb063a7e…

1 0

git:master:20f37638: tls_wolfssl: initial docs
by S-P Chan 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: 20f37638e0457a029648785bb206f3fafdff0427 URL: https://github.com/kamailio/kamailio/commit/20f37638e0457a029648785bb206f3f… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-06-16T15:37:17+08:00 tls_wolfssl: initial docs --- Added: src/modules/tls_wolfssl/doc/tls_wolfssl.xml Modified: src/modules/tls_wolfssl/doc/Makefile Removed: src/modules/tls_wolfssl/doc/certs_howto.xml Removed: src/modules/tls_wolfssl/doc/history.xml Removed: src/modules/tls_wolfssl/doc/hsm_howto.xml Removed: src/modules/tls_wolfssl/doc/params.xml Removed: src/modules/tls_wolfssl/doc/rpc.xml Removed: src/modules/tls_wolfssl/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/20f37638e0457a029648785bb206f3f… Patch: https://github.com/kamailio/kamailio/commit/20f37638e0457a029648785bb206f3f…

1 0

git:master:a1398511: tls_wolfssl: Miscellaneous cleanup
by S-P Chan 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: a1398511036983471f4fd1d1e33099dee8a565bf URL: https://github.com/kamailio/kamailio/commit/a1398511036983471f4fd1d1e33099d… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-06-16T15:37:17+08:00 tls_wolfssl: Miscellaneous cleanup Cleanup of OpenSSL symbols and OpenSSL-related memory warnings. --- Modified: src/modules/tls_wolfssl/tls_bio.c Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_init.c Modified: src/modules/tls_wolfssl/tls_init.h Modified: src/modules/tls_wolfssl/tls_select.c Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a1398511036983471f4fd1d1e33099d… Patch: https://github.com/kamailio/kamailio/commit/a1398511036983471f4fd1d1e33099d…

1 0

git:5.6:87317235: tls: Makefile - link libdl dynamically
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: 873172351fae24ed8d74e9d5ce55a45f19b7bb01 URL: https://github.com/kamailio/kamailio/commit/873172351fae24ed8d74e9d5ce55a45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:36:01+02:00 tls: Makefile - link libdl dynamically - libcrypto uses dlopen() and dlclose() - GH #3115 (cherry picked from commit 9529730c478aef83c9b84c98242bf8af4bf152ad) --- Modified: src/modules/tlsa/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/873172351fae24ed8d74e9d5ce55a45… Patch: https://github.com/kamailio/kamailio/commit/873172351fae24ed8d74e9d5ce55a45… --- diff --git a/src/modules/tlsa/Makefile b/src/modules/tlsa/Makefile index 9295898aadb..d97e8652137 100644 --- a/src/modules/tlsa/Makefile +++ b/src/modules/tlsa/Makefile @@ -39,7 +39,7 @@ ifneq ($(CRYPTO_BUILDER),) LIBS += $(shell $(CRYPTO_BUILDER) --libs-only-L) endif # ifneq ($(CRYPTO_BUILDER),) - LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a + LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -ldl # TODO: explore use of LIBS += -Wl,-Bstatic $(shell $(SSL_BUILDER) --libs-only-l) else @@ -53,7 +53,7 @@ else # ifneq ($(SSL_BUILDER),) DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ - -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a + -l:libssl.a -l:libcrypto.a -l:libz.a -ldl endif # ifneq ($(SSL_BUILDER),) include ../../Makefile.modules

1 0

git:5.6:f2bad782: sipdump: docs - sync example with description
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: f2bad782198ae2c0f25713d93312bfb0b204d94b URL: https://github.com/kamailio/kamailio/commit/f2bad782198ae2c0f25713d93312bfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:34:38+02:00 sipdump: docs - sync example with description (cherry picked from commit 2a744a58c57542520e4ff4c73b1419a083b17076) --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f2bad782198ae2c0f25713d93312bfb… Patch: https://github.com/kamailio/kamailio/commit/f2bad782198ae2c0f25713d93312bfb… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index f0dd9fc1b4b..3bcdc31fc46 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -346,7 +346,7 @@ modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") ... route[TCLEAN] { - exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +1 -delete &"); + exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +2 -delete &"); } ... </programlisting>

1 0

git:5.6:aa759c12: db_cluster: docs - more suggestive db url examples
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: aa759c12aca3c8cdee11fcd383a2e565baef23be URL: https://github.com/kamailio/kamailio/commit/aa759c12aca3c8cdee11fcd383a2e56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:35:49+02:00 db_cluster: docs - more suggestive db url examples (cherry picked from commit 9b1a3a6b9a3e6a24d646e62ba74811cfdf553dae) --- Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aa759c12aca3c8cdee11fcd383a2e56… Patch: https://github.com/kamailio/kamailio/commit/aa759c12aca3c8cdee11fcd383a2e56… --- diff --git a/src/modules/db_cluster/doc/db_cluster_admin.xml b/src/modules/db_cluster/doc/db_cluster_admin.xml index 17e812f18f2..247ac178d48 100644 --- a/src/modules/db_cluster/doc/db_cluster_admin.xml +++ b/src/modules/db_cluster/doc/db_cluster_admin.xml @@ -204,9 +204,10 @@ modparam("db_cluster", "max_query_length", 5) <programlisting format="linespecific"> ... modparam("db_cluster", "connection", - "c1=>&defaultdb;1") + "c1=>mysql://kamailio:kamailiorw@localhost/kamailio1") modparam("db_cluster", "connection", - "c2=>&defaultdb;2") + "c2=>mysql://kamailio:kamailiorw@remotehost/kamailio2") + modparam("db_cluster", "cluster", "k1=>c1=9r9p;c2=9r9p") modparam("acc", "db_url", "cluster://k1")

1 0

git:5.6:5b8e5d02: dispatcher: fix for checking reply code class rule
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: 5b8e5d02c27b0cd3c5854012d0e0968504a6b252 URL: https://github.com/kamailio/kamailio/commit/5b8e5d02c27b0cd3c5854012d0e0968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:33:32+02:00 dispatcher: fix for checking reply code class rule (cherry picked from commit 1ac02d9f0b436602cfc8bf72037ca7f84be3d67f) --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/5b8e5d02c27b0cd3c5854012d0e0968… Patch: https://github.com/kamailio/kamailio/commit/5b8e5d02c27b0cd3c5854012d0e0968… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 827d925ed89..30620553a42 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1247,7 +1247,7 @@ int ds_ping_check_rplcode(int code) } } else { /* reply class */ - if(((*ds_ping_reply_codes)[i] / 100) == code) { + if((*ds_ping_reply_codes)[i] == code / 100) { return 1; } }

1 0

git:5.6:8d93720b: ims_qos: fix compilation warning
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: 8d93720b363babfe8d8c8fe58bd4c5022bd64954 URL: https://github.com/kamailio/kamailio/commit/8d93720b363babfe8d8c8fe58bd4c50… Author: Atanas Bakalov <atanas(a)wgtwo.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:33:06+02:00 ims_qos: fix compilation warning (cherry picked from commit bd4cc486879616d502362dd464b04d7d3c2865c4) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/8d93720b363babfe8d8c8fe58bd4c50… Patch: https://github.com/kamailio/kamailio/commit/8d93720b363babfe8d8c8fe58bd4c50… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index b60f689e604..9ebca2ecf1e 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -53,6 +53,7 @@ #include "../cdp_avp/cdp_avp_mod.h" #include "../../modules/ims_dialog/dlg_load.h" +#include "../../modules/ims_dialog/dlg_hash.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" #include "rx_authdata.h"

1 0

git:5.6:7f2a62ae: Makefile.groups: renamed malloc_test to misctest
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: 7f2a62ae9c6f06a5e2c4ea19ef6794aef4278298 URL: https://github.com/kamailio/kamailio/commit/7f2a62ae9c6f06a5e2c4ea19ef6794a… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:31:30+02:00 Makefile.groups: renamed malloc_test to misctest - building module_group_standard fail due to rename of malloc_test module. (cherry picked from commit 5910c8184f42e9564711a07959d410aa2d483b43) --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/7f2a62ae9c6f06a5e2c4ea19ef6794a… Patch: https://github.com/kamailio/kamailio/commit/7f2a62ae9c6f06a5e2c4ea19ef6794a… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index c388489a66..bd111ca7b5 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -38,7 +38,7 @@ mod_list_dbuid=db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ uid_uri_db # - modules for devel purposes -mod_list_devel=malloc_test print print_lib +mod_list_devel=misctest print print_lib # - modules depending on pcre3 library mod_list_pcre=dialplan lcr regex

1 0

git:5.6:b064a135: slack: Makefile - support for FreeBSD build
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: b064a1357e6a771eb4755824a42d842a85bda410 URL: https://github.com/kamailio/kamailio/commit/b064a1357e6a771eb4755824a42d842… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:31:40+02:00 slack: Makefile - support for FreeBSD build - added LIBS and DEFS variables, making them consistent with the rest of modules. (cherry picked from commit 36baa8cda606e107308303c33c5b98cbb513c653) --- Modified: src/modules/slack/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b064a1357e6a771eb4755824a42d842… Patch: https://github.com/kamailio/kamailio/commit/b064a1357e6a771eb4755824a42d842… --- diff --git a/src/modules/slack/Makefile b/src/modules/slack/Makefile index 9bc748a2e5c..a4f0c1ff814 100644 --- a/src/modules/slack/Makefile +++ b/src/modules/slack/Makefile @@ -8,5 +8,21 @@ include ../../Makefile.defs auto_gen= NAME=slack.so +ifeq ($(CROSS_COMPILE),) +CURL_BUILDER=$(shell \ + if pkg-config --exists libcurl; then \ + echo 'pkg-config libcurl'; \ + else \ + which curl-config; \ + fi) +endif + +ifneq ($(CURL_BUILDER),) + DEFS += $(shell $(CURL_BUILDER) --cflags ) + LIBS += $(shell $(CURL_BUILDER) --libs) +else + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lcurl +endif include ../../Makefile.modules

1 0

git:5.6:46db60f1: lost: Makefile - support for FreeBSD build
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: 46db60f1f4ee02ff5c28eee21b365963830790c7 URL: https://github.com/kamailio/kamailio/commit/46db60f1f4ee02ff5c28eee21b36596… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:32:03+02:00 lost: Makefile - support for FreeBSD build - added libcurl deps. (cherry picked from commit 881e3e1e195858d36d863a32f3c40f1cb83c8d9d) --- Modified: src/modules/lost/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/46db60f1f4ee02ff5c28eee21b36596… Patch: https://github.com/kamailio/kamailio/commit/46db60f1f4ee02ff5c28eee21b36596… --- diff --git a/src/modules/lost/Makefile b/src/modules/lost/Makefile index 30c12ce6553..b847094e1ca 100755 --- a/src/modules/lost/Makefile +++ b/src/modules/lost/Makefile @@ -16,6 +16,12 @@ XML2CFG=$(shell \ echo 'pkg-config libxml-2.0'; \ fi) endif +CURL_BUILDER=$(shell \ + if pkg-config --exists libcurl; then \ + echo 'pkg-config libcurl'; \ + else \ + which curl-config; \ + fi) endif ifneq ($(XML2CFG),) @@ -26,4 +32,12 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(CURL_BUILDER),) + DEFS += $(shell $(CURL_BUILDER) --cflags ) + LIBS += $(shell $(CURL_BUILDER) --libs) +else + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lcurl +endif + include ../../Makefile.modules

1 0

git:5.6:b7778364: auth_identity: docs - type for accept_pem_certs param
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: b7778364742726357071dbad7c0549cca2d40c91 URL: https://github.com/kamailio/kamailio/commit/b7778364742726357071dbad7c0549c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:29:38+02:00 auth_identity: docs - type for accept_pem_certs param (cherry picked from commit 6e7b6cfabba6774627f942d7f02e1adf62bf7797) --- Modified: src/modules/auth_identity/doc/auth_identity_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/b7778364742726357071dbad7c0549c… Patch: https://github.com/kamailio/kamailio/commit/b7778364742726357071dbad7c0549c… --- diff --git a/src/modules/auth_identity/doc/auth_identity_params.xml b/src/modules/auth_identity/doc/auth_identity_params.xml index a252bbed6b6..aefb49cdd00 100644 --- a/src/modules/auth_identity/doc/auth_identity_params.xml +++ b/src/modules/auth_identity/doc/auth_identity_params.xml @@ -190,11 +190,11 @@ modparam("auth_identity","cainfo_path","/etc/ssl/certs/ca-certificates.crt") </section> <section id="accept_pem_certs"> - <title><varname>accept_pem_certs</varname> ([0|1])</title> + <title><varname>accept_pem_certs</varname> (int)</title> <para>Note: this parameter is for verifier service.</para> <para> Enables the acquired certificate processing if it is in PEM - format. + format. Value can be 0 or 1. </para> <para> This parameter is optional. The default value is "0".

1 0

git:5.6:b106b2f9: lost: URI list support in LoST response (filter for sip/sips scheme)
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: b106b2f9047a5b6b322e09a6bd6ba768332b0486 URL: https://github.com/kamailio/kamailio/commit/b106b2f9047a5b6b322e09a6bd6ba76… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:30:18+02:00 lost: URI list support in LoST response (filter for sip/sips scheme) (cherry picked from commit 9b8a4fd17e8819395043f54d43dab07a226d8490) --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h --- Diff: https://github.com/kamailio/kamailio/commit/b106b2f9047a5b6b322e09a6bd6ba76… Patch: https://github.com/kamailio/kamailio/commit/b106b2f9047a5b6b322e09a6bd6ba76… --- diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c index 711c3732bfb..bc6dbd936cc 100644 --- a/src/modules/lost/functions.c +++ b/src/modules/lost/functions.c @@ -1,7 +1,7 @@ /* * lost module functions * - * Copyright (C) 2021 Wolfgang Kampichler + * Copyright (C) 2022 Wolfgang Kampichler * DEC112, FREQUENTIS AG * * This file is part of Kamailio, a free SIP server. @@ -1123,16 +1123,24 @@ int lost_function(struct sip_msg *_m, char *_con, char *_uri, char *_name, switch(fsrdata->category) { case RESPONSE: if(fsrdata->uri != NULL) { - /* get the first uri element */ - if((tmp.s = fsrdata->uri->value) != NULL) { - tmp.len = strlen(fsrdata->uri->value); - if(pkg_str_dup(&uri, &tmp) < 0) { - LM_ERR("could not copy: [%.*s]\n", tmp.len, tmp.s); - goto err; - } + /* get the first sips uri element ... */ + if(lost_search_response_list(&fsrdata->uri, &tmp.s, SIPS_S) > 0) { + tmp.len = strlen(tmp.s); + /* or the first sip uri element ... */ + } else if(lost_search_response_list(&fsrdata->uri, &tmp.s, SIP_S) > 0) { + tmp.len = strlen(tmp.s); + /* or return error if nothing found */ + } else { + LM_ERR("sip/sips uri not found: [%.*s]\n", ret.len, ret.s); + goto err; + } + /* copy uri string */ + if(pkg_str_dup(&uri, &tmp) < 0) { + LM_ERR("could not copy: [%.*s]\n", tmp.len, tmp.s); + goto err; } } else { - LM_ERR("uri not found: [%.*s]\n", ret.len, ret.s); + LM_ERR("uri element not found: [%.*s]\n", ret.len, ret.s); goto err; } if(fsrdata->mapping != NULL) { diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index cc6d65ad2aa..dcd6dc5363b 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -1,7 +1,7 @@ /* * lost module LoST response parsing functions * - * Copyright (C) 2021 Wolfgang Kampichler + * Copyright (C) 2022 Wolfgang Kampichler * DEC112, FREQUENTIS AG * * This file is part of Kamailio, a free SIP server. @@ -353,6 +353,40 @@ void lost_reverse_response_list(p_lost_list_t *head) *head = prev; } +/* + * lost_search_response_list(list, value, search) + * looks for search string in list object and returns pointer if found + */ +int lost_search_response_list(p_lost_list_t *list, char **val, const char *str) +{ + p_lost_list_t cur; + p_lost_list_t next; + + if(*list == NULL) + return 0; + + if(str == NULL) + return 0; + + LM_DBG("### list data search [%s]\n", str); + + next = *list; + while((cur = next) != NULL) { + next = cur->next; + if(cur->value != NULL) { + if(strncasecmp(cur->value, str, strlen(str)) == 0) { + *val = cur->value; + + LM_DBG("###\t[%s] found\n", cur->value); + + return 1; + } + } + } + + return 0; +} + /* * lost_delete_response_list(list) * removes response list from private memory diff --git a/src/modules/lost/response.h b/src/modules/lost/response.h index 991f82ac6ec..9c1fcbcb23a 100644 --- a/src/modules/lost/response.h +++ b/src/modules/lost/response.h @@ -1,7 +1,7 @@ /* * lost module LoST response parsing functions * - * Copyright (C) 2021 Wolfgang Kampichler + * Copyright (C) 2022 Wolfgang Kampichler * DEC112, FREQUENTIS AG * * This file is part of Kamailio, a free SIP server. @@ -56,6 +56,9 @@ #define ERRORS_NODE (const char *)"errors" +#define SIP_S (const char *)"sip:" +#define SIPS_S (const char *)"sips:" + #define HELD_RESPONSE_REFERENCE 1 #define HELD_RESPONSE_VALUE 2 @@ -133,4 +136,7 @@ int is_cid_laquot(char *); int is_http_laquot(char *); int is_https_laquot(char *); +/* list search */ +int lost_search_response_list(p_lost_list_t *, char **, const char *); + #endif

1 0

git:5.6:ec6b0a11: auth_identity: removed auth_identity.xml from source folder
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: ec6b0a110c9e71897c0cbf8a5a62ea37e9c7733a URL: https://github.com/kamailio/kamailio/commit/ec6b0a110c9e71897c0cbf8a5a62ea3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:29:23+02:00 auth_identity: removed auth_identity.xml from source folder - there is one in doc/ subfolder (cherry picked from commit 9155a53bccd090e51b274802d140f363aca6d4b7) --- Removed: src/modules/auth_identity/auth_identity.xml --- Diff: https://github.com/kamailio/kamailio/commit/ec6b0a110c9e71897c0cbf8a5a62ea3… Patch: https://github.com/kamailio/kamailio/commit/ec6b0a110c9e71897c0cbf8a5a62ea3…

1 0

git:master:585ee603: tls_wolfssl: renamed tls_mod.{c, h} to tls_wolfssl_mod.{c, h}
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: 585ee60394db1c0ea1143a95523131fc212aca38 URL: https://github.com/kamailio/kamailio/commit/585ee60394db1c0ea1143a95523131f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:17:06+02:00 tls_wolfssl: renamed tls_mod.{c,h} to tls_wolfssl_mod.{c,h} - main files of the module to match module name --- Added: src/modules/tls_wolfssl/tls_wolfssl_mod.c Added: src/modules/tls_wolfssl/tls_wolfssl_mod.h Modified: src/modules/tls_wolfssl/tls_config.c Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_dump_vf.c Modified: src/modules/tls_wolfssl/tls_init.c Modified: src/modules/tls_wolfssl/tls_rpc.c Modified: src/modules/tls_wolfssl/tls_select.c Modified: src/modules/tls_wolfssl/tls_server.c Modified: src/modules/tls_wolfssl/tls_util.c Removed: src/modules/tls_wolfssl/tls_mod.c Removed: src/modules/tls_wolfssl/tls_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/585ee60394db1c0ea1143a95523131f… Patch: https://github.com/kamailio/kamailio/commit/585ee60394db1c0ea1143a95523131f…

1 0

git:master:5080208f: Makefile.groups: added group for tls_wolfssl module
by Daniel-Constantin Mierla 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: 5080208f445b4f4b4c01530fe485fca6f38541f0 URL: https://github.com/kamailio/kamailio/commit/5080208f445b4f4b4c01530fe485fca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:00:16+02:00 Makefile.groups: added group for tls_wolfssl module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/5080208f445b4f4b4c01530fe485fca… Patch: https://github.com/kamailio/kamailio/commit/5080208f445b4f4b4c01530fe485fca… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index bd111ca7b5..4934ff0815 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -94,6 +94,9 @@ mod_list_tlsdeps_curl=auth_identity # - modules depending on static openssl library mod_list_tlsa=tlsa +# - modules depending on static wolfssl library +mod_list_tls_wolfssl=tls_wolfssl + # - modules depending on openssl library mod_list_outbound=outbound @@ -280,6 +283,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_lwsc) \ $(mod_list_stirshaken) \ $(mod_list_tlsa) \ + $(mod_list_tls_wolfssl) \ $(mod_list_rtp_media_server) @@ -405,6 +409,9 @@ module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa) +# pkg tls_wolfssl module +module_group_ktls_wolfssl=$(mod_list_tls_wolfssl) + # pkg websocket module module_group_kwebsocket=$(mod_list_websocket)

1 0

git:master:c08a7cbd: Merge pull request #3144 from space88man/wolfssl
by GitHub 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: c08a7cbdfc34f19b8abe8a92d8d75dab8a05d729 URL: https://github.com/kamailio/kamailio/commit/c08a7cbdfc34f19b8abe8a92d8d75da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-06-16T08:39:02+02:00 Merge pull request #3144 from space88man/wolfssl tls_wolfssl: new module TLS stack based on wolfSSL --- Added: src/modules/tls_wolfssl/Makefile Added: src/modules/tls_wolfssl/README Added: src/modules/tls_wolfssl/TODO.md Added: src/modules/tls_wolfssl/doc/Makefile Added: src/modules/tls_wolfssl/doc/certs_howto.xml Added: src/modules/tls_wolfssl/doc/functions.xml Added: src/modules/tls_wolfssl/doc/history.xml Added: src/modules/tls_wolfssl/doc/hsm_howto.xml Added: src/modules/tls_wolfssl/doc/params.xml Added: src/modules/tls_wolfssl/doc/rpc.xml Added: src/modules/tls_wolfssl/doc/tls.xml Added: src/modules/tls_wolfssl/sbufq.h Added: src/modules/tls_wolfssl/tls.cfg Added: src/modules/tls_wolfssl/tls_bio.c Added: src/modules/tls_wolfssl/tls_bio.h Added: src/modules/tls_wolfssl/tls_cert.sh Added: src/modules/tls_wolfssl/tls_cfg.c Added: src/modules/tls_wolfssl/tls_cfg.h Added: src/modules/tls_wolfssl/tls_config.c Added: src/modules/tls_wolfssl/tls_config.h Added: src/modules/tls_wolfssl/tls_ct_q.h Added: src/modules/tls_wolfssl/tls_ct_wrq.c Added: src/modules/tls_wolfssl/tls_ct_wrq.h Added: src/modules/tls_wolfssl/tls_domain.c Added: src/modules/tls_wolfssl/tls_domain.h Added: src/modules/tls_wolfssl/tls_dump_vf.c Added: src/modules/tls_wolfssl/tls_dump_vf.h Added: src/modules/tls_wolfssl/tls_init.c Added: src/modules/tls_wolfssl/tls_init.h Added: src/modules/tls_wolfssl/tls_map.c Added: src/modules/tls_wolfssl/tls_map.h Added: src/modules/tls_wolfssl/tls_mod.c Added: src/modules/tls_wolfssl/tls_mod.h Added: src/modules/tls_wolfssl/tls_rand.c Added: src/modules/tls_wolfssl/tls_rand.h Added: src/modules/tls_wolfssl/tls_rpc.c Added: src/modules/tls_wolfssl/tls_rpc.h Added: src/modules/tls_wolfssl/tls_select.c Added: src/modules/tls_wolfssl/tls_select.h Added: src/modules/tls_wolfssl/tls_server.c Added: src/modules/tls_wolfssl/tls_server.h Added: src/modules/tls_wolfssl/tls_util.c Added: src/modules/tls_wolfssl/tls_util.h Added: src/modules/tls_wolfssl/tls_verify.c Added: src/modules/tls_wolfssl/tls_verify.h Added: src/modules/tls_wolfssl/todo.txt --- Diff: https://github.com/kamailio/kamailio/commit/c08a7cbdfc34f19b8abe8a92d8d75da… Patch: https://github.com/kamailio/kamailio/commit/c08a7cbdfc34f19b8abe8a92d8d75da…

1 0

git:master:7c1326aa: tls_wolfssl: new module TLS stack based on wolfSSL
by S-P Chan 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: 7c1326aa14ad651ff916b8ef35fa08d2dc90a3a7 URL: https://github.com/kamailio/kamailio/commit/7c1326aa14ad651ff916b8ef35fa08d… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-06-16T14:14:34+08:00 tls_wolfssl: new module TLS stack based on wolfSSL Initial support. Use OpenSSL-compatiblity layer to achieve compilation. --- Added: src/modules/tls_wolfssl/Makefile Added: src/modules/tls_wolfssl/README Added: src/modules/tls_wolfssl/TODO.md Added: src/modules/tls_wolfssl/doc/Makefile Added: src/modules/tls_wolfssl/doc/certs_howto.xml Added: src/modules/tls_wolfssl/doc/functions.xml Added: src/modules/tls_wolfssl/doc/history.xml Added: src/modules/tls_wolfssl/doc/hsm_howto.xml Added: src/modules/tls_wolfssl/doc/params.xml Added: src/modules/tls_wolfssl/doc/rpc.xml Added: src/modules/tls_wolfssl/doc/tls.xml Added: src/modules/tls_wolfssl/sbufq.h Added: src/modules/tls_wolfssl/tls.cfg Added: src/modules/tls_wolfssl/tls_bio.c Added: src/modules/tls_wolfssl/tls_bio.h Added: src/modules/tls_wolfssl/tls_cert.sh Added: src/modules/tls_wolfssl/tls_cfg.c Added: src/modules/tls_wolfssl/tls_cfg.h Added: src/modules/tls_wolfssl/tls_config.c Added: src/modules/tls_wolfssl/tls_config.h Added: src/modules/tls_wolfssl/tls_ct_q.h Added: src/modules/tls_wolfssl/tls_ct_wrq.c Added: src/modules/tls_wolfssl/tls_ct_wrq.h Added: src/modules/tls_wolfssl/tls_domain.c Added: src/modules/tls_wolfssl/tls_domain.h Added: src/modules/tls_wolfssl/tls_dump_vf.c Added: src/modules/tls_wolfssl/tls_dump_vf.h Added: src/modules/tls_wolfssl/tls_init.c Added: src/modules/tls_wolfssl/tls_init.h Added: src/modules/tls_wolfssl/tls_map.c Added: src/modules/tls_wolfssl/tls_map.h Added: src/modules/tls_wolfssl/tls_mod.c Added: src/modules/tls_wolfssl/tls_mod.h Added: src/modules/tls_wolfssl/tls_rand.c Added: src/modules/tls_wolfssl/tls_rand.h Added: src/modules/tls_wolfssl/tls_rpc.c Added: src/modules/tls_wolfssl/tls_rpc.h Added: src/modules/tls_wolfssl/tls_select.c Added: src/modules/tls_wolfssl/tls_select.h Added: src/modules/tls_wolfssl/tls_server.c Added: src/modules/tls_wolfssl/tls_server.h Added: src/modules/tls_wolfssl/tls_util.c Added: src/modules/tls_wolfssl/tls_util.h Added: src/modules/tls_wolfssl/tls_verify.c Added: src/modules/tls_wolfssl/tls_verify.h Added: src/modules/tls_wolfssl/todo.txt --- Diff: https://github.com/kamailio/kamailio/commit/7c1326aa14ad651ff916b8ef35fa08d… Patch: https://github.com/kamailio/kamailio/commit/7c1326aa14ad651ff916b8ef35fa08d…

1 0

[kamailio/kamailio] Database TLS connection through cnf file: TLS error followed by memory corruption messages (Issue #3115)
by liviu-rolo 16 Jun '22

16 Jun '22

### Description Using kamailio 5.5.4 from the official Docker image (created like `create_dockerfile.sh bullseye 5.5.4`, but with no ENTRYPOINT). Doing TLS listening like: ``` socket_workers=2 tls_max_connections=20000 listen=tls:192.168.0.11:5061 enable_tls=yes dns_tls_pref=50 tls_port_no=5061 loadmodule "tls.so" ``` It is the second loaded module after tcpops. Have to connect to the database through cnf files for the SSL support: `modparam("sqlops","sqlcon","euler=>mysql://[euler]/euclid")` Relevant section in the cnf file: ``` [euler] port = 3306 host = 127.0.0.1 protocol = tcp user = gauss password = fermat default-character-set = utf8 ssl-ca = /SSL/riemann/ca-cert.pem ssl-cert = /SSL/riemann/client-cert.pem ssl-key = /SSL/riemann/client-key.pem #ssl-verify-server-cert ``` When starting kamailio: ``` 8(18) ERROR: db_mysql [km_my_con.c:163]: db_mysql_new_connection(): driver error: SSL connection error: PEM lib 8(18) ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool 8(18) ERROR: sqlops [sql_api.c:165]: sql_connect(): failed to connect to the database [euclid] 8(18) ERROR: <core> [core/sr_module.c:874]: init_mod_child(): error while initializing module sqlops (/home/euler/lib64/euler/modules/sqlops.so) (idx: 8 rank: -2 desc: [Async Task Worker - default]) 8(18) ERROR: <core> [core/pt.c:338]: fork_process(): init_child failed for process 8, pid 18, "Async Task Worker - default" 8(18) ERROR: <core> [main.c:1850]: main_loop(): error in init_child 12(22) CRITICAL: <core> [core/mem/q_malloc.c:501]: qm_free(): BUG: bad pointer 0x7fafa23e6270 (out of memory block!) called from tls: tls_init.c: ser_free(323) - ignoring ``` Then kamailio just hangs on in an incomplete state: ``` / # ps auxww --forest USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND root 29 0.6 0.0 4092 3244 pts/1 Ss 08:59 0:00 bash root 36 0.0 0.0 6692 2964 pts/1 R+ 08:59 0:00 \_ ps auxww --forest root 1 0.0 0.0 4092 3252 pts/0 Ss 08:58 0:00 bash root 8 0.4 0.0 110868 23764 pts/0 S+ 08:58 0:00 kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 9 0.0 0.0 0 0 ? Zs 08:58 0:00 \_ [kamailio] <defunct> root 10 0.5 0.0 111080 31148 ? S 08:58 0:00 kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 11 0.0 0.0 111080 13412 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 12 99.9 0.0 111080 13240 ? R 08:58 0:43 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 13 0.0 0.0 111080 14252 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 14 0.0 0.0 111080 13432 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 15 0.0 0.0 111080 13296 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 16 0.0 0.0 111080 13348 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 17 0.0 0.0 111080 13220 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 18 0.0 0.0 111072 14196 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 19 99.7 0.0 111080 10748 ? R 08:58 0:43 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 20 0.2 0.0 0 0 ? Z 08:58 0:00 \_ [kamailio] <defunct> root 21 0.0 0.0 111080 13068 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 22 0.0 0.0 111080 13156 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 23 0.0 0.0 111080 10684 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 24 0.0 0.0 111080 10684 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 25 0.0 0.0 111080 10748 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 26 0.0 0.0 111080 10748 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 27 0.0 0.0 111080 13344 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 28 0.0 0.0 111080 10748 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg ```  ### Troubleshooting #### Reproduction  It is always happening, but not when either `listen=tls` or the SSL options in the cnf file are dropped. #### Debugging Data  ``` / # ps auxww --forest USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND root 29 0.6 0.0 4092 3244 pts/1 Ss 08:59 0:00 bash root 36 0.0 0.0 6692 2964 pts/1 R+ 08:59 0:00 \_ ps auxww --forest root 1 0.0 0.0 4092 3252 pts/0 Ss 08:58 0:00 bash root 8 0.4 0.0 110868 23764 pts/0 S+ 08:58 0:00 kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 9 0.0 0.0 0 0 ? Zs 08:58 0:00 \_ [kamailio] <defunct> root 10 0.5 0.0 111080 31148 ? S 08:58 0:00 kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 11 0.0 0.0 111080 13412 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 12 99.9 0.0 111080 13240 ? R 08:58 0:43 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 13 0.0 0.0 111080 14252 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 14 0.0 0.0 111080 13432 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 15 0.0 0.0 111080 13296 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 16 0.0 0.0 111080 13348 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 17 0.0 0.0 111080 13220 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 18 0.0 0.0 111072 14196 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 19 99.7 0.0 111080 10748 ? R 08:58 0:43 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 20 0.2 0.0 0 0 ? Z 08:58 0:00 \_ [kamailio] <defunct> root 21 0.0 0.0 111080 13068 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 22 0.0 0.0 111080 13156 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 23 0.0 0.0 111080 10684 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 24 0.0 0.0 111080 10684 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 25 0.0 0.0 111080 10748 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 26 0.0 0.0 111080 10748 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 27 0.0 0.0 111080 13344 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg root 28 0.0 0.0 111080 10748 ? S 08:58 0:00 \_ kamailio -A NO_JSON_LOG -f /home/euler/etc/euler.cfg ``` #### Log Messages  ``` 8(18) ERROR: db_mysql [km_my_con.c:163]: db_mysql_new_connection(): driver error: SSL connection error: PEM lib 8(18) ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool 8(18) ERROR: sqlops [sql_api.c:165]: sql_connect(): failed to connect to the database [euclid] 8(18) ERROR: <core> [core/sr_module.c:874]: init_mod_child(): error while initializing module sqlops (/home/euler/lib64/euler/modules/sqlops.so) (idx: 8 rank: -2 desc: [Async Task Worker - default]) 8(18) ERROR: <core> [core/pt.c:338]: fork_process(): init_child failed for process 8, pid 18, "Async Task Worker - default" 8(18) ERROR: <core> [main.c:1850]: main_loop(): error in init_child 12(22) CRITICAL: <core> [core/mem/q_malloc.c:501]: qm_free(): BUG: bad pointer 0x7fafa23e6270 (out of memory block!) called from tls: tls_init.c: ser_free(323) - ignoring ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.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, 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 ``` * **Operating System**:  ``` Linux euler01 5.4.44-2-pve #1 SMP PVE 5.4.44-2 (Wed, 01 Jul 2020 16:37:57 +0200) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3115 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3115(a)github.com>

2 9

git:master:9529730c: tls: Makefile - link libdl dynamically
by Daniel-Constantin Mierla 15 Jun '22

15 Jun '22

Module: kamailio Branch: master Commit: 9529730c478aef83c9b84c98242bf8af4bf152ad URL: https://github.com/kamailio/kamailio/commit/9529730c478aef83c9b84c98242bf8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-15T11:38:19+02:00 tls: Makefile - link libdl dynamically - libcrypto uses dlopen() and dlclose() - GH #3115 --- Modified: src/modules/tlsa/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/9529730c478aef83c9b84c98242bf8a… Patch: https://github.com/kamailio/kamailio/commit/9529730c478aef83c9b84c98242bf8a… --- diff --git a/src/modules/tlsa/Makefile b/src/modules/tlsa/Makefile index 9295898aadb..d97e8652137 100644 --- a/src/modules/tlsa/Makefile +++ b/src/modules/tlsa/Makefile @@ -39,7 +39,7 @@ ifneq ($(CRYPTO_BUILDER),) LIBS += $(shell $(CRYPTO_BUILDER) --libs-only-L) endif # ifneq ($(CRYPTO_BUILDER),) - LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a + LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -ldl # TODO: explore use of LIBS += -Wl,-Bstatic $(shell $(SSL_BUILDER) --libs-only-l) else @@ -53,7 +53,7 @@ else # ifneq ($(SSL_BUILDER),) DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ - -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a + -l:libssl.a -l:libcrypto.a -l:libz.a -ldl endif # ifneq ($(SSL_BUILDER),) include ../../Makefile.modules

1 0

git:master:b08b9d90: modules: readme files regenerated - db_cluster ... [skip ci]
by Kamailio Dev 15 Jun '22

15 Jun '22

Module: kamailio Branch: master Commit: b08b9d9038e0f90a9475a209c8941b930f7a12a1 URL: https://github.com/kamailio/kamailio/commit/b08b9d9038e0f90a9475a209c8941b9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-15T11:31:26+02:00 modules: readme files regenerated - db_cluster ... [skip ci] --- Modified: src/modules/db_cluster/README --- Diff: https://github.com/kamailio/kamailio/commit/b08b9d9038e0f90a9475a209c8941b9… Patch: https://github.com/kamailio/kamailio/commit/b08b9d9038e0f90a9475a209c8941b9… --- diff --git a/src/modules/db_cluster/README b/src/modules/db_cluster/README index 7260f0f1aa..5b4962e002 100644 --- a/src/modules/db_cluster/README +++ b/src/modules/db_cluster/README @@ -213,7 +213,8 @@ modparam("db_cluster", "max_query_length", 5) modparam("db_cluster", "connection", "c1=>mysql://kamailio:kamailiorw@localhost/kamailio1") modparam("db_cluster", "connection", - "c2=>mysql://kamailio:kamailiorw@localhost/kamailio2") + "c2=>mysql://kamailio:kamailiorw@remotehost/kamailio2") + modparam("db_cluster", "cluster", "k1=>c1=9r9p;c2=9r9p") modparam("acc", "db_url", "cluster://k1")

1 0

git:master:9b1a3a6b: db_cluster: docs - more suggestive db url examples
by Daniel-Constantin Mierla 15 Jun '22

15 Jun '22

Module: kamailio Branch: master Commit: 9b1a3a6b9a3e6a24d646e62ba74811cfdf553dae URL: https://github.com/kamailio/kamailio/commit/9b1a3a6b9a3e6a24d646e62ba74811c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-15T11:29:33+02:00 db_cluster: docs - more suggestive db url examples --- Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9b1a3a6b9a3e6a24d646e62ba74811c… Patch: https://github.com/kamailio/kamailio/commit/9b1a3a6b9a3e6a24d646e62ba74811c… --- diff --git a/src/modules/db_cluster/doc/db_cluster_admin.xml b/src/modules/db_cluster/doc/db_cluster_admin.xml index 17e812f18f2..247ac178d48 100644 --- a/src/modules/db_cluster/doc/db_cluster_admin.xml +++ b/src/modules/db_cluster/doc/db_cluster_admin.xml @@ -204,9 +204,10 @@ modparam("db_cluster", "max_query_length", 5) <programlisting format="linespecific"> ... modparam("db_cluster", "connection", - "c1=>&defaultdb;1") + "c1=>mysql://kamailio:kamailiorw@localhost/kamailio1") modparam("db_cluster", "connection", - "c2=>&defaultdb;2") + "c2=>mysql://kamailio:kamailiorw@remotehost/kamailio2") + modparam("db_cluster", "cluster", "k1=>c1=9r9p;c2=9r9p") modparam("acc", "db_url", "cluster://k1")

1 0

[kamailio/kamailio] Kamailio 5.5.4 siputils doesn't validate long Austrian numbers as valid e164 (Issue #3117)
by Simone de Blasiis 15 Jun '22

15 Jun '22

### Description When using the [is_e164 function](https://kamailio.org/docs/modules/5.5.x/modules/siputils.html#sip… on a long Austrian number it doesn't seem to return true even if it's in e164 format. #### Reproduction The number in question, with some digits obfuscated for privacy, is +4322367108xxxxxx. I can confirm that the number exists and is a valid one. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.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, 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 ``` * **Operating System**: ``` No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye Linux kamailio-primary 5.10.0-14-amd64 #1 SMP Debian 5.10.113-1 (2022-04-29) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3117 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3117(a)github.com>

3 4

[kamailio/kamailio] crash related to functions in cfg file parser for invalid cfg (#2239)
by Henning Westerholt 14 Jun '22

14 Jun '22

Against current git master. ``` henning@static:~/repositories/kamailio$ cat etc/crash-4.cfg #!KAMAILIO loadmodule "sl.so" request_route { switch (1) { case -1: send_reply("404", "Not Found"); case -2: send_reply("405",("Method Not Allowed"); exit; } ``` > $ ./src/kamailio -f etc/crash-4.cfg -L src/modules/ -Y /tmp -E -d > 0(2278) CRITICAL: <core> [core/cfg.y:3549]: yyerror_at(): parse error in config file /home/henning/repositories/kamailio/etc/crash-4.cfg, line 10, column 43: syntax error > 0(2278) CRITICAL: <core> [core/cfg.y:3549]: yyerror_at(): parse error in config file /home/henning/repositories/kamailio/etc/crash-4.cfg, line 10, column 43: '('')' expected (function call) > Segmentation fault (core dumped) > henning@static:~/repositories/kamailio$ gdb src/kamailio core > Reading symbols from src/kamailio...done. > [New LWP 2278] > Core was generated by `./src/kamailio -f etc/crash-4.cfg -L src/modules/ -Y /tmp -E -d'. > Program terminated with signal SIGSEGV, Segmentation fault. > #0 0x00005580cdbd131e in append_action (a=0x7fad84db9300, b=0x7fad84db97f8) at core/route_struct.c:147 > 147 for(t=a; t->next; t=t->next); > (gdb) bt > #0 0x00005580cdbd131e in append_action (a=0x7fad84db9300, b=0x7fad84db97f8) at core/route_struct.c:147 > #1 0x00005580cdf9208b in yyparse () at core/cfg.y:2428 > #2 0x00005580cdb96c11 in main (argc=9, argv=0x7ffc2d9f6a68) at main.c:2309 > (gdb) f 0 > #0 0x00005580cdbd131e in append_action (a=0x7fad84db9300, b=0x7fad84db97f8) at core/route_struct.c:147 > 147 for(t=a; t->next; t=t->next); > (gdb) p a > $1 = (struct action *) 0x7fad84db9300 > (gdb) p b > $2 = (struct action *) 0x7fad84db97f8 > (gdb) p t > $3 = (struct action *) 0x80 > (gdb) p a->next > $4 = (struct action *) 0x80 > (gdb) p *t > Cannot access memory at address 0x80 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2239

2 2

git:master:f0cea1a7: core: stop at the first config error on startup
by Daniel-Constantin Mierla 14 Jun '22

14 Jun '22

Module: kamailio Branch: master Commit: f0cea1a7c03e400b4398795c2d8b0f7e45d1dfb5 URL: https://github.com/kamailio/kamailio/commit/f0cea1a7c03e400b4398795c2d8b0f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-14T11:46:39+02:00 core: stop at the first config error on startup - continuing to look for more errors to print them on one check can end up in crashing because some internal interpreter structure may not be filled properly - new cli option --all-errors that can be used to enable printing details for more detected config errors --- Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/f0cea1a7c03e400b4398795c2d8b0f7… Patch: https://github.com/kamailio/kamailio/commit/f0cea1a7c03e400b4398795c2d8b0f7… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 713b6789b0..acf5e8c490 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -3854,6 +3854,9 @@ static void yyerror_at(struct cfg_pos* p, char* format, ...) LM_CRIT("parse error in config file %s, line %d, column %d: %s\n", p->fname, p->s_line, p->s_col, s); cfg_errors++; + if(ksr_all_errors==0) { + ksr_exit(-1); + } } diff --git a/src/core/globals.h b/src/core/globals.h index a4857cbf0c..03eb1ef897 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -213,6 +213,7 @@ extern int rt_timer2_policy; /* "slow" timer, SCHED_OTHER */ extern int http_reply_parse; extern int _sr_ip_free_bind; extern int ksr_verbose_startup; +extern int ksr_all_errors; extern int ksr_route_locks_size; extern str _ksr_xavp_via_params; extern str _ksr_xavp_via_fields; diff --git a/src/main.c b/src/main.c index cb0c92e357..e919a23274 100644 --- a/src/main.c +++ b/src/main.c @@ -206,6 +206,7 @@ Options:\n\ --modparam=modname:paramname:type:value set the module parameter\n\ type has to be 's' for string value and 'i' for int value, \n\ example: --modparam=corex:alias_subdomains:s:" NAME ".org\n\ + --all-errors Print details about all config errors that can be detected\n\ -M nr Size of private memory allocated, in Megabytes\n\ -n processes Number of child processes to fork per interface\n\ (default: 8)\n" @@ -482,6 +483,7 @@ int child_rank = 0; int ser_kill_timeout=DEFAULT_SER_KILL_TIMEOUT; int ksr_verbose_startup = 0; +int ksr_all_errors = 0; /* cfg parsing */ int cfg_errors=0; @@ -2018,6 +2020,7 @@ int main(int argc, char** argv) {"debug", required_argument, 0, KARGOPTVAL + 8}, {"cfg-print", no_argument, 0, KARGOPTVAL + 9}, {"atexit", required_argument, 0, KARGOPTVAL + 10}, + {"all-errors", no_argument, 0, KARGOPTVAL + 11}, {0, 0, 0, 0 } }; @@ -2128,6 +2131,9 @@ int main(int argc, char** argv) goto error; } break; + case KARGOPTVAL+11: + ksr_all_errors = 1; + break; default: if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { @@ -2317,6 +2323,7 @@ int main(int argc, char** argv) case KARGOPTVAL+8: case KARGOPTVAL+9: case KARGOPTVAL+10: + case KARGOPTVAL+11: break; /* long options */

1 0

git:master:649b421c: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 14 Jun '22

14 Jun '22

Module: kamailio Branch: master Commit: 649b421cf6b8b9dbec5bf632b612214d3918899b URL: https://github.com/kamailio/kamailio/commit/649b421cf6b8b9dbec5bf632b612214… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-14T10:31:17+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/649b421cf6b8b9dbec5bf632b612214… Patch: https://github.com/kamailio/kamailio/commit/649b421cf6b8b9dbec5bf632b612214…

1 0

git:master:96c49c5a: siputils: docs - proper module name in examples
by Daniel-Constantin Mierla 14 Jun '22

14 Jun '22

Module: kamailio Branch: master Commit: 96c49c5adc22bd80eca465cea619c20f926bb3ef URL: https://github.com/kamailio/kamailio/commit/96c49c5adc22bd80eca465cea619c20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-14T10:27:06+02:00 siputils: docs - proper module name in examples --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/96c49c5adc22bd80eca465cea619c20… Patch: https://github.com/kamailio/kamailio/commit/96c49c5adc22bd80eca465cea619c20… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index ce9b87cff1..d6480000b7 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -201,7 +201,7 @@ modparam("siputils", "options_support", "100rel") <example> <title>rpid_prefix parameter example</title> <programlisting format="linespecific"> -modparam("auth", "rpid_prefix", "Whatever <") +modparam("siputils", "rpid_prefix", "Whatever <") </programlisting> </example> </section> @@ -218,7 +218,7 @@ modparam("auth", "rpid_prefix", "Whatever <") <example> <title>rpid_suffix parameter example</title> <programlisting format="linespecific"> -modparam("auth", "rpid_suffix", "@1.2.3.4>") +modparam("siputils", "rpid_suffix", "@1.2.3.4>") </programlisting> </example> </section> @@ -240,7 +240,7 @@ modparam("auth", "rpid_suffix", "@1.2.3.4>") <example> <title>rpid_avp parameter example</title> <programlisting format="linespecific"> -modparam("auth", "rpid_avp", "$avp(myrpid)") +modparam("siputils", "rpid_avp", "$avp(myrpid)") </programlisting> </example> </section>

1 0

git:master:0b629dfc: siputils: added e164_max_len modparam
by Daniel-Constantin Mierla 14 Jun '22

14 Jun '22

Module: kamailio Branch: master Commit: 0b629dfc66ec7a2f5620ba253f8a932e3f164b07 URL: https://github.com/kamailio/kamailio/commit/0b629dfc66ec7a2f5620ba253f8a932… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-14T10:20:59+02:00 siputils: added e164_max_len modparam - specify the max length for e164 number check, includting the leading '+' - GH #3117 --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/0b629dfc66ec7a2f5620ba253f8a932… Patch: https://github.com/kamailio/kamailio/commit/0b629dfc66ec7a2f5620ba253f8a932… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 792cfca94a..d9730ddad1 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -48,6 +48,8 @@ #include "../../core/mod_fix.h" #include "checks.h" +extern int e164_max_len; + /** * return 1 (true) if the SIP message type is request */ @@ -661,7 +663,7 @@ int siputils_e164_check(str* _user) int i; char c; - if ((_user->len > 2) && (_user->len < 17) && ((_user->s)[0] == '+')) { + if ((_user->len > 2) && (_user->len <= e164_max_len) && ((_user->s)[0] == '+')) { for (i = 1; i < _user->len; i++) { c = (_user->s)[i]; if (c < '0' || c > '9') return -1; diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 2e7ddeb7c0..e7c5e3dcfc 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -89,6 +89,9 @@ str rpid_suffix = {DEF_RPID_SUFFIX, sizeof(DEF_RPID_SUFFIX) - 1}; /*! Definition of AVP containing rpid value */ char* rpid_avp_param = DEF_RPID_AVP; +/* max length for e164 number including the leading '+' */ +int e164_max_len = 16; + /* for options functionality */ str opt_accept = str_init(ACPT_DEF); str opt_accept_enc = str_init(ACPT_ENC_DEF); @@ -217,6 +220,7 @@ static param_export_t params[] = { {"rpid_prefix", PARAM_STR, &rpid_prefix }, {"rpid_suffix", PARAM_STR, &rpid_suffix }, {"rpid_avp", PARAM_STRING, &rpid_avp_param }, + {"e164_max_len", PARAM_INT, &e164_max_len }, {0, 0, 0} };

1 0

git:master:badb945a: siputils: docs for e164_max_len param
by Daniel-Constantin Mierla 14 Jun '22

14 Jun '22

Module: kamailio Branch: master Commit: badb945afc11cde49b3c5d26be7c63f8d64d4dcd URL: https://github.com/kamailio/kamailio/commit/badb945afc11cde49b3c5d26be7c63f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-14T10:25:15+02:00 siputils: docs for e164_max_len param --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/badb945afc11cde49b3c5d26be7c63f… Patch: https://github.com/kamailio/kamailio/commit/badb945afc11cde49b3c5d26be7c63f… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 73178847ad0..ce9b87cff10 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -244,6 +244,21 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") </programlisting> </example> </section> + <section id="siputils.p.e164_max_len"> + <title><varname>e164_max_len</varname> (int)</title> + <para> + The maximum length for checking e164 numbers, including the leading '+'. + </para> + <para> + Default value is <quote>16</quote>. + </para> + <example> + <title>e164_max_len parameter example</title> + <programlisting format="linespecific"> +modparam("siputils", "e164_max_len", 20) +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:93dccff9: modules: readme files regenerated - auth ... [skip ci]
by Kamailio Dev 14 Jun '22

14 Jun '22

Module: kamailio Branch: master Commit: 93dccff9391e1336e1a37add1d07b4058b7593e8 URL: https://github.com/kamailio/kamailio/commit/93dccff9391e1336e1a37add1d07b40… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-14T10:01:27+02:00 modules: readme files regenerated - auth ... [skip ci] --- Modified: src/modules/auth/README --- Diff: https://github.com/kamailio/kamailio/commit/93dccff9391e1336e1a37add1d07b40… Patch: https://github.com/kamailio/kamailio/commit/93dccff9391e1336e1a37add1d07b40… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index 25c448901d..f846d752d9 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -836,6 +836,7 @@ if (!auth_check("$fd", "subscriber", "1")) { + 4 - build challenge header with qop=auth and add it to avp + 8 - build challenge header with qop=auth-int and add it to avp + 16 - build challenge header with stale=true + + 32 - don't invalidate nc on authentication failure * method - the method to be used for authentication. This parameter is optional and if not set is the first "word" on the request-line.

1 0

[kamailio/kamailio] auth: Add flag for not invalidating nc on auth failure (PR #3133)
by Jon Bergli Heier 14 Jun '22

14 Jun '22

#### 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 change modifies `pv_www_authenticate` and related functions to add flag 32. If the flag is set and `nonce_count` is enabled then we skip updating nc in `pre_auth`. On success we call `check_nonce` once more to do the nc update. This can be used to chain calls to authenticate against multiple passwords. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3133 -- Commit Summary -- * auth: Add flag for not invalidating nc on auth failure -- File Changes -- M src/modules/auth/api.c (16) M src/modules/auth/api.h (3) M src/modules/auth/auth_mod.c (31) M src/modules/auth/doc/auth_functions.xml (4) M src/modules/auth/nc.c (4) M src/modules/auth/nc.h (2) M src/modules/auth/nonce.c (4) M src/modules/auth/nonce.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3133.patch https://github.com/kamailio/kamailio/pull/3133.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3133 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3133(a)github.com>

2 2

git:master:8d7583b8: Merge pull request #3133 from sn4kebite/auth-dont-invalidate-nc
by GitHub 14 Jun '22

14 Jun '22

Module: kamailio Branch: master Commit: 8d7583b82a1ffff78fb61b2de7b51deb77ba30a4 URL: https://github.com/kamailio/kamailio/commit/8d7583b82a1ffff78fb61b2de7b51de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-06-14T09:49:14+02:00 Merge pull request #3133 from sn4kebite/auth-dont-invalidate-nc auth: Add flag for not invalidating nc on auth failure --- Modified: src/modules/auth/api.c Modified: src/modules/auth/api.h Modified: src/modules/auth/auth_mod.c Modified: src/modules/auth/doc/auth_functions.xml Modified: src/modules/auth/nc.c Modified: src/modules/auth/nc.h Modified: src/modules/auth/nonce.c Modified: src/modules/auth/nonce.h --- Diff: https://github.com/kamailio/kamailio/commit/8d7583b82a1ffff78fb61b2de7b51de… Patch: https://github.com/kamailio/kamailio/commit/8d7583b82a1ffff78fb61b2de7b51de…

1 0

git:master:a82e5657: auth: Add flag for not invalidating nc on auth failure
by Jon Bergli Heier 14 Jun '22

14 Jun '22

Module: kamailio Branch: master Commit: a82e5657b66272c0833c1d1d6a55ee29acc315a5 URL: https://github.com/kamailio/kamailio/commit/a82e5657b66272c0833c1d1d6a55ee2… Author: Jon Bergli Heier <jon.bergli.heier(a)zisson.com> Committer: Jon Bergli Heier <jon.bergli.heier(a)zisson.com> Date: 2022-06-03T16:30:53+02:00 auth: Add flag for not invalidating nc on auth failure If flag 32 is set then we skip updating nc in pre_auth. On success we call check_nonce once more to do the update. This can be used to chain calls to eg. pv_auth_check to authenticate against multiple passwords. --- Modified: src/modules/auth/api.c Modified: src/modules/auth/api.h Modified: src/modules/auth/auth_mod.c Modified: src/modules/auth/doc/auth_functions.xml Modified: src/modules/auth/nc.c Modified: src/modules/auth/nc.h Modified: src/modules/auth/nonce.c Modified: src/modules/auth/nonce.h --- Diff: https://github.com/kamailio/kamailio/commit/a82e5657b66272c0833c1d1d6a55ee2… Patch: https://github.com/kamailio/kamailio/commit/a82e5657b66272c0833c1d1d6a55ee2…

1 0

[kamailio/kamailio] Not able to get CDR using current documentation (Issue #3142)
by olegans1972 13 Jun '22

13 Jun '22

### Description I want to get the CDR of the whole call. For this I use the following configuration. I don't use any sql database. I want to get CDR in syslog ... loadmodule "db_text.so" loadmodule "dialog.so" loadmodule "acc.so" ... #----Dialog-------------------------- modparam("dialog", "db_mode", 0) #-----ACCounting module ----- modparam("acc", "early_media", 0) modparam("acc", "report_cancels", 1) modparam("acc", "log_facility", "LOG_LOCAL1") modparam("acc", "detect_direction", 0) modparam("acc", "log_level", ACC_LOG_LEVEL) modparam("acc", "log_flag", FLAG_ACC_LOG) modparam("acc", "log_missed_flag", FLAG_ACC_LOG_MISSED) modparam("acc", "failed_transaction_flag", FLAG_ACC_LOG_FAILED) modparam("acc", "log_extra", "ip_src=$si;ip_dst=$avp(ip_dst);sip_from=$fU;sip_to=$tU;ruri_user=$rU;spx_rs=$avp(spx_http_rs)") ## TODO modparam("acc", "cdr_enable", 1) modparam("acc", "cdr_facility", "LOG_LOCAL1") modparam("acc", "cdr_log_enable", 1) ... request_route { setflag(FLAG_ACC_LOG); setflag(FLAG_ACC_LOG_MISSED); setflag(FLAG_ACC_LOG_FAILED); ... ... ... } ... #___handle requests within SIP dialogs route[HANDLE_IN_DIALOG_REQUESTS] { if (has_totag()) { if (loose_route()) { xlog("L_INFO", "route[WITHINDLG]|$rm with to-tag and loose route|\n"); if (is_method("BYE")) { setflag(FLAG_ACC_LOG); } } } As a result, I get two separate records for INVITE and BYE transactions. But I'm expecting one CDR for the entire call.  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions I tried to find a solution on the internet, and found this message https://www.mail-archive.com/sr-users@lists.kamailio.org/msg13617.html The author talks about an additional flag in the dialog module. And also asks to add this to the documentation of the ACC module I tried adding a flag but didn't get the desired result. Probably something else needs to be done. There is nothing in the documentation about this. Maybe it makes sense to write a similar article for kamailio? https://www.opensips.org/Documentation/Tutorials-Advanced-Accounting  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [opodguyko@vms-vms-spx-1 ~]$ kamailio -v version: kamailio 5.5.3 (x86_64/linux) b02728-dirty 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: b02728 -dirty compiled on 15:35:46 Dec 15 2021 with gcc 8.3.1 ``` * **Operating System**:  ``` [opodguyko@vms-vms-spx-1 ~]$ cat /etc/redhat-release AlmaLinux release 8.5 (Arctic Sphynx) [opodguyko@vms-vms-spx-1 ~]$ ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3142 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3142(a)github.com>

2 2

[kamailio/kamailio] packaging: on EL8 package with Python 3.9 (PR #3140)
by aalba6675 11 Jun '22

11 Jun '22

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [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  On EL8 package with Python 3.9; that is EoL in 2025; Python 3.6 was EoL end 2021. Python 3.9 lifecycle matches the remaining Full Support cycle of EL8. Although 5.6 packages were released with Python 3.6; this PR could be backported to 5.6 as 5.6 still has a lot of runway. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3140 -- Commit Summary -- * packaging: on EL8 package with Python 3.9 -- File Changes -- M pkg/kamailio/obs/kamailio.spec (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3140.patch https://github.com/kamailio/kamailio/pull/3140.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3140 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3140(a)github.com>

2 2

git:5.6:b552a278: packaging: on EL8 package with Python 3.9
by Sergey Safarov 11 Jun '22

11 Jun '22

Module: kamailio Branch: 5.6 Commit: b552a27821cf083e87bf0e2cd2c05acb6cf79aea URL: https://github.com/kamailio/kamailio/commit/b552a27821cf083e87bf0e2cd2c05ac… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-06-11T14:20:06+03:00 packaging: on EL8 package with Python 3.9 (cherry picked from commit c938619e458e0efa0676e7e60c2b1a6fc7e947db) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b552a27821cf083e87bf0e2cd2c05ac… Patch: https://github.com/kamailio/kamailio/commit/b552a27821cf083e87bf0e2cd2c05ac… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5ba68a92241..fbc41f36ce0 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -794,6 +794,10 @@ BuildRequires: python2, python2-devel %if 0%{?rhel} == 7 Requires: python36, kamailio = %ver BuildRequires: python36, python36-devel +%endif +%if 0%{?rhel} == 8 +Requires: python39, kamailio = %ver +BuildRequires: python39, python39-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1178,6 +1182,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ +%endif +%if 0%{?rhel} == 8 + PYTHON3=python3.9 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc} @@ -1279,6 +1286,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ +%endif +%if 0%{?rhel} == 8 + PYTHON3=python3.9 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc}

1 0

git:master:c938619e: packaging: on EL8 package with Python 3.9
by sergey-safarov 11 Jun '22

11 Jun '22

Module: kamailio Branch: master Commit: c938619e458e0efa0676e7e60c2b1a6fc7e947db URL: https://github.com/kamailio/kamailio/commit/c938619e458e0efa0676e7e60c2b1a6… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: sergey-safarov <s.safarov(a)gmail.com> Date: 2022-06-11T14:18:50+03:00 packaging: on EL8 package with Python 3.9 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c938619e458e0efa0676e7e60c2b1a6… Patch: https://github.com/kamailio/kamailio/commit/c938619e458e0efa0676e7e60c2b1a6… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index a2b7e1406c8..ba08d5b52d2 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -794,6 +794,10 @@ BuildRequires: python2, python2-devel %if 0%{?rhel} == 7 Requires: python36, kamailio = %ver BuildRequires: python36, python36-devel +%endif +%if 0%{?rhel} == 8 +Requires: python39, kamailio = %ver +BuildRequires: python39, python39-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1178,6 +1182,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ +%endif +%if 0%{?rhel} == 8 + PYTHON3=python3.9 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc} @@ -1279,6 +1286,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ +%endif +%if 0%{?rhel} == 8 + PYTHON3=python3.9 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc}

1 0

[kamailio/kamailio] KEMI Fatal Python error: failed releasing import lock after fork (Issue #3125)
by Nigel Daniels 10 Jun '22

10 Jun '22

### Description using kamailio 5.6.0 python: 3.8.10 OS : ubuntu 20.0.4 When trying to use kemi with the default configuration I get on startup. ` Fatal Python error: failed releasing import lock after fork ` #### Reproduction Using The configuration described here : https://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/kemi/#bas… #### Debugging Data ``` 0(1) INFO: <core> [core/kemi.c:106]: sr_kemi_core_info(): ===== kamailio.child_init(1) kamailio | 0(1) DEBUG: <core> [core/sr_module.c:923]: init_child(): initializing PROC_POSTCHILDINIT with rank -126 kamailio | 0(1) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 0 rank -126: app_python3 [stand-alone receiver @ 10.10.0.4:5060] kamailio | Fatal Python error: failed releasing import lock after fork kamailio | Python runtime state: initialized kamailio | kamailio | Current thread 0x00007f3faa857180 (most recent call first): kamailio | <no Python frame> kamailio | 7(14) DEBUG: <core> [core/pt.c:308]: fork_process(): seeding PRNG with 1232772928 kamailio | 7(14) DEBUG: <core> [core/rand/cryptorand.c:36]: cryptorand_seed(): seeding cryptorand generator with 1232772928 kamailio | 7(14) DEBUG: <core> [core/rand/fortuna/random.c:175]: sr_add_entropy(): additional 4 bytes entropy added to cryptographic PRNG kamailio | 7(14) DEBUG: <core> [core/pt.c:313]: fork_process(): test random numbers 987270226 561754816 1532392054 1162699744 kamailio | 7(14) DEBUG: <core> [core/sr_module.c:923]: init_child(): initializing PROC_RPC with rank -2 kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: corex [ctl handler] kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: usrloc [ctl handler] kamailio | 7(14) DEBUG: <core> [core/utils/sruid.c:121]: sruid_init(): root for sruid is [ulcx-62931156-e-] (0 / 16) kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: registrar [ctl handler] kamailio | 7(14) DEBUG: <core> [core/utils/sruid.c:121]: sruid_init(): root for sruid is [uloc-62931156-e-] (0 / 16) kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: jsonrpcs [ctl handler] kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: kex [ctl handler] kamailio | 7(14) DEBUG: kex [kex_mod.c:155]: child_init(): rank is (-2) kamailio | 7(14) DEBUG: <core> [core/utils/sruid.c:121]: sruid_init(): root for sruid is [srid-62931156-e-] (0 / 16) kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: tm [ctl handler] kamailio | 7(14) DEBUG: tm [callid.c:136]: child_init_callid(): callid: '2ef035de7699493f-14(a)10.10.0.4' kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: tmx [ctl handler] kamailio | 7(14) DEBUG: tmx [tmx_mod.c:262]: child_init(): rank is (-2) kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: sl [ctl handler] kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: ctl [ctl handler] kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: debugger [ctl handler] kamailio | 7(14) DEBUG: debugger [debugger_mod.c:224]: child_init(): rank is (-2) kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: app_python3 [ctl handler] kamailio | 7(14) DEBUG: app_python3 [apy_kemi.c:234]: sr_apy_kemi_exec_func_ex(): execution of method: .info kamailio | 7(14) DEBUG: app_python3 [apy_kemi.c:266]: sr_apy_kemi_exec_func_ex(): param[1] for: info is str: ===== kamailio.child_init(-2) kamailio | kamailio | 7(14) INFO: <core> [core/kemi.c:106]: sr_kemi_core_info(): ===== kamailio.child_init(-2) kamailio | 7(14) DEBUG: ctl [ctl.c:329]: mod_child(): ctl: mod_child(0), fork_process=0, csl=0x56186255e180 kamailio | 7(14) DEBUG: ctl [ctl.c:336]: mod_child(): ctl: 0 io_listen_loop(1, 0x56186255e180) kamailio | 7(14) INFO: ctl [io_listener.c:213]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) kamailio | 7(14) DEBUG: ctl [io_listener.c:245]: io_listen_loop(): io_listen_loop: adding socket 8, type 2, transport 3 (/var/run/kamailio//kamailio_ctl) kamailio | 7(14) DEBUG: ctl [../../core/io_wait.h:374]: io_watch_add(): processing io_watch_add(0x7f3fa8aa2380, 8, 2, 0x56186255e180) - fd_no=0 kamailio exited with code 139 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3125 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3125(a)github.com>

3 9

[kamailio/kamailio] WIP app_python3: need a test for a real child process (PR #3139)
by aalba6675 10 Jun '22

10 Jun '22

app_python3 needs to call `PyOS_AfterFork_Child()`/`PyOS_AfterFork()` in real child processes. We need a test for this: rank > 0 may not be sufficient due to non-forking mode. This POC uses getpid(). - [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  @miconda @henningw : this PR is for discussion only: in KEMI Python there is an interpreter function that needs to be called after `fork()` in real child processes. I realise that `rank > 0` may not be a completely correct test as kamailio has a non-forking mode. Your comments would be appreciated. This POC uses `getpid()` to detect a &ldquo;real&rdquo; child process. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3139 -- Commit Summary -- * WIP app_python3: need a test for a real child process -- File Changes -- M src/modules/app_python3/app_python3_mod.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3139.patch https://github.com/kamailio/kamailio/pull/3139.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3139 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3139(a)github.com>

1 3

git:5.6:824867fd: app_python3: use _ksr_is_main to detect child process
by Anthony Alba 10 Jun '22

10 Jun '22

Module: kamailio Branch: 5.6 Commit: 824867fd1f81c78cc0fd8c688aa4032c24e49781 URL: https://github.com/kamailio/kamailio/commit/824867fd1f81c78cc0fd8c688aa4032… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-10T22:20:06+08:00 app_python3: use _ksr_is_main to detect child process (cherry picked from commit 8683deb20a) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/824867fd1f81c78cc0fd8c688aa4032… Patch: https://github.com/kamailio/kamailio/commit/824867fd1f81c78cc0fd8c688aa4032… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index d250640e0c..376d1c1312 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -185,9 +185,6 @@ static int child_init(int rank) * this is called before any process is forked * so the Python internal state handler * should be called now. - * - * TODO: is PyOS_AfterFork_Parent() necesary - * in the main process? */ #if PY_VERSION_HEX >= 0x03070000 PyOS_BeforeFork() ; @@ -206,7 +203,7 @@ static int child_init(int rank) } _apy_process_rank = rank; - if (rank > 0) { + if (!_ksr_is_main) { #if PY_VERSION_HEX >= 0x03070000 PyOS_AfterFork_Child(); #else

1 0

git:master:8683deb2: app_python3: use _ksr_is_main to detect child process
by Anthony Alba 10 Jun '22

10 Jun '22

Module: kamailio Branch: master Commit: 8683deb20a3f69c3b6d2c8370d23d1451f823a6b URL: https://github.com/kamailio/kamailio/commit/8683deb20a3f69c3b6d2c8370d23d14… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-10T22:13:39+08:00 app_python3: use _ksr_is_main to detect child process --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8683deb20a3f69c3b6d2c8370d23d14… Patch: https://github.com/kamailio/kamailio/commit/8683deb20a3f69c3b6d2c8370d23d14… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index d250640e0c..376d1c1312 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -185,9 +185,6 @@ static int child_init(int rank) * this is called before any process is forked * so the Python internal state handler * should be called now. - * - * TODO: is PyOS_AfterFork_Parent() necesary - * in the main process? */ #if PY_VERSION_HEX >= 0x03070000 PyOS_BeforeFork() ; @@ -206,7 +203,7 @@ static int child_init(int rank) } _apy_process_rank = rank; - if (rank > 0) { + if (!_ksr_is_main) { #if PY_VERSION_HEX >= 0x03070000 PyOS_AfterFork_Child(); #else

1 0

git:master:64ae9ed7: siputils: removed duplicated function for e164 check
by Daniel-Constantin Mierla 10 Jun '22

10 Jun '22

Module: kamailio Branch: master Commit: 64ae9ed7212c1db352ab583b8d319358da23775f URL: https://github.com/kamailio/kamailio/commit/64ae9ed7212c1db352ab583b8d31935… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-10T14:05:41+02:00 siputils: removed duplicated function for e164 check --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/rpid.c Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/64ae9ed7212c1db352ab583b8d31935… Patch: https://github.com/kamailio/kamailio/commit/64ae9ed7212c1db352ab583b8d31935… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 3e01eb97829..792cfca94aa 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -656,7 +656,7 @@ int tel2sip(struct sip_msg* _msg, char* _uri, char* _hostpart, char* _res) /* * Check if parameter is an e164 number. */ -static inline int e164_check(str* _user) +int siputils_e164_check(str* _user) { int i; char c; @@ -675,7 +675,7 @@ static inline int e164_check(str* _user) /* * Check if user part of URI in pseudo variable is an e164 number */ -int is_e164(struct sip_msg* _m, char* _sp, char* _s2) +int w_is_e164(struct sip_msg* _m, char* _sp, char* _s2) { pv_spec_t *sp; pv_value_t pv_val; @@ -688,7 +688,7 @@ int is_e164(struct sip_msg* _m, char* _sp, char* _s2) LM_DBG("missing argument\n"); return -1; } - return e164_check(&(pv_val.rs)); + return siputils_e164_check(&(pv_val.rs)); } else { LM_ERR("pseudo variable value is not string\n"); return -1; @@ -743,7 +743,7 @@ int is_uri_user_e164(str *uri) if (chr == NULL) return -1; user.len = chr - user.s; - return e164_check(&user); + return siputils_e164_check(&user); } /* diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 2a05bdd53d8..164f086f26e 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -89,7 +89,9 @@ int is_uri_user_e164(str *uri); /* * Check if pseudo variable argument value is an e164 number */ -int is_e164(struct sip_msg* _m, char* _sp, char* _s2); +int w_is_e164(struct sip_msg* _m, char* _sp, char* _s2); + +int siputils_e164_check(str* _user); /* * Set userpart of URI diff --git a/src/modules/siputils/rpid.c b/src/modules/siputils/rpid.c index 617f3d4220a..c725116034c 100644 --- a/src/modules/siputils/rpid.c +++ b/src/modules/siputils/rpid.c @@ -37,6 +37,7 @@ #include "../../core/parser/parser_f.h" #include "../../core/ut.h" #include "../../core/pvar.h" +#include "checks.h" #include "rpid.h" @@ -95,29 +96,6 @@ void get_rpid_avp( int_str *rpid_avp_p, int *rpid_avp_type_p ) } -/*! - * \brief Check if user is a E164 number - * \param _user user - * \note Copy of is_e164 from enum module - * \return 1 if its a E164 number, -1 if not - */ -static inline int is_e164(str* _user) -{ - int i; - char c; - - if ((_user->len > 2) && (_user->len < 17) && ((_user->s)[0] == '+')) { - for (i = 1; i < _user->len; i++) { - c = (_user->s)[i]; - if ((c < '0') || (c > '9')) return -1; - } - return 1; - } else { - return -1; - } -} - - /*! * \brief Append RPID helper function * \param _m SIP message @@ -325,7 +303,7 @@ int is_rpid_user_e164(struct sip_msg* _m, char* _s1, char* _s2) goto err; } - return is_e164(&uri.user); + return siputils_e164_check(&uri.user); err: return -1; diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 704f3e9a299..2e7ddeb7c08 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -141,7 +141,7 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE}, {"is_uri", (cmd_function)is_uri, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, - {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, + {"is_e164", (cmd_function)w_is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"is_uri_user_e164", (cmd_function)w_is_uri_user_e164, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE},

1 0

git:master:da4f786b: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 10 Jun '22

10 Jun '22

Module: kamailio Branch: master Commit: da4f786b0c0275a6e4c8324f9b4c347351b5a48a URL: https://github.com/kamailio/kamailio/commit/da4f786b0c0275a6e4c8324f9b4c347… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-10T09:16:30+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/da4f786b0c0275a6e4c8324f9b4c347… Patch: https://github.com/kamailio/kamailio/commit/da4f786b0c0275a6e4c8324f9b4c347… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 6f0978dc6d..9d4287804f 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1458,12 +1458,13 @@ if(ds_list_exists("10")) { specific group id. The parameter can be an integer or a variable holding an integer value. * mode - (optional) - a bitmask to specify how the matching should be - done. If parameter is 0, all ip, port and proto are matched and - active status is ignored. If bit one is set, then port is ignored. - If bit two is set, then protocol is ignored. If bit three is set, - then state must be active. The parameter can be an integer or a - variable holding an integer value. It must be provided if the uri - parameter is provided. + done. If the parameter is missing, the matching is done with + ignoring the protocol (value 2). If parameter is 0, all ip, port + and proto are matched and active status is ignored. If bit one is + set, then port is ignored. If bit two is set, then protocol is + ignored. If bit three is set, then state must be active. The + parameter can be an integer or a variable holding an integer value. + It must be provided if the uri parameter is provided. * uri (optional) - if parameter is empty or missing, the matching is done against source IP, port and protocol. Otherwise the value has to be a valid SIP URI, used to match against addresses in the

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev