August 2021 - sr-dev - kamailio.org

[kamailio/kamailio] db_redis: fix broken pipe issue, if redis server with timeout setting. (#2791)
by FredWH 02 Aug '21

02 Aug '21

- issue #2764   #### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2791 -- Commit Summary -- * db_redis: fix broken pipe issue, if redis server with timeout setting. -- File Changes -- M src/modules/db_redis/redis_connection.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2791.patch https://github.com/kamailio/kamailio/pull/2791.diff -- 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/pull/2791

3 5

git:master:7cec977f: db_redis: fix broken pipe issue, if redis server with timeout setting.
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 7cec977f8e12bbeb0309d903e02461d1ccbf41a8 URL: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… Author: FredWH <wh720(a)139.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T15:00:18+02:00 db_redis: fix broken pipe issue, if redis server with timeout setting. - issue #2764 --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… Patch: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index ad2921f1d5..dd421a7844 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -305,7 +305,8 @@ void *db_redis_command_argv(km_redis_con_t *con, redis_key_t *query) { LM_DBG("query has %d args\n", argc); redisReply *reply = redisCommandArgv(con->con, argc, (const char**)argv, NULL); - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -344,7 +345,8 @@ int db_redis_append_command_argv(km_redis_con_t *con, redis_key_t *query, int qu // this should actually never happen, because if all replies // are properly consumed for the previous command, it won't send // out a new query until redisGetReply is called - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -374,8 +376,8 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { *reply = NULL; ret = redisGetReply(con->con, reply); - if (con->con->err == REDIS_ERR_EOF) { - LM_DBG("redis connection is gone, try reconnect\n"); + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); con->append_counter = 0; if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); @@ -396,7 +398,7 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { db_redis_key_free(&query); } ret = redisGetReply(con->con, reply); - if (con->con->err != REDIS_ERR_EOF) { + if (con->con->err == REDIS_OK) { con->append_counter--; } } else {

1 0

git:master:19d0a2a2: tlsa: imported README file
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 19d0a2a2177ca206de417fc1cb412c5b6dd0f393 URL: https://github.com/kamailio/kamailio/commit/19d0a2a2177ca206de417fc1cb412c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:38:49+02:00 tlsa: imported README file --- Added: src/modules/tlsa/README Modified: src/modules/tlsa/doc/tlsa.xml --- Diff: https://github.com/kamailio/kamailio/commit/19d0a2a2177ca206de417fc1cb412c5… Patch: https://github.com/kamailio/kamailio/commit/19d0a2a2177ca206de417fc1cb412c5… --- diff --git a/src/modules/tlsa/README b/src/modules/tlsa/README new file mode 100644 index 0000000000..100da0fed4 --- /dev/null +++ b/src/modules/tlsa/README @@ -0,0 +1,55 @@ +TLSA Module + +Daniel-Constantin Mierla + + kamailio.org + + Copyright © 2021 kamailio.org + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + +1. Overview + + This is a pseudo module that builds TLS module compiled statically + against libssl and libcrypto (from OpenSSL project). Its C code files + simply include the files from TLS module, setting a different module + name. + + It is a replacement for tls module, with the same modparams and + functions. Just replace ' loadmodule "tls.so" ' with ' loadmodule + "tlsa.so" ' and ' modparam("tls", ...) ' with ' modparam("tlsa", ...) + '. See the docs of TLS module for all the details related to its + parameters, functions, rpc commands, variables, ... + + The benefit of this module is having the libssl and libcrypto embedded + in the module object file, thus not sharing the SSL/TLS context with + any other modules that may link indirectly to libssl (e.g., like + http_client that links against libcurl, which uses libssl). In this + way, the initialization of SSL context (e.g., setting shared memory + management functions) by tlsa module does not impact the other modules. + + Another benefit could be the ability to link a specific libssl version + (e.g., using source build), not being bound to the version shipped with + the operating system. + + The drawback is that updates to the libssl done via operating system + upgrades are not reflected in the tlsa module. It has to be recompiled + every time a new libssl version is installed and it is wanted to be + used by tlsa module. + + NOTE: the module is known to work to be compiled with GCC on Linux + (tested on Debian Stable 10.x). Other compilers (e.g., clang, icc) may + not support same static linking options. Also, some operating systems + may provide only dynamic libssl and libcrypto libraries via their + packages. diff --git a/src/modules/tlsa/doc/tlsa.xml b/src/modules/tlsa/doc/tlsa.xml index 75da4b765c..eecc5f9ab1 100644 --- a/src/modules/tlsa/doc/tlsa.xml +++ b/src/modules/tlsa/doc/tlsa.xml @@ -65,6 +65,13 @@ be recompiled every time a new libssl version is installed and it is wanted to be used by tlsa module. </para> + <para> + NOTE: the module is known to work to be compiled with GCC on Linux + (tested on Debian Stable 10.x). Other compilers (e.g., clang, icc) + may not support same static linking options. Also, some operating + systems may provide only dynamic libssl and libcrypto libraries + via their packages. + </para> </section> </chapter> </book>

1 0

git:master:2b9e2f55: Makefile.groups: group for tlsa module
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 2b9e2f553284b985afb01b5b78a800b10f691c6f URL: https://github.com/kamailio/kamailio/commit/2b9e2f553284b985afb01b5b78a800b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:33:43+02:00 Makefile.groups: group for tlsa module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/2b9e2f553284b985afb01b5b78a800b… Patch: https://github.com/kamailio/kamailio/commit/2b9e2f553284b985afb01b5b78a800b… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 99a990ad83..aa709375bc 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -91,6 +91,9 @@ mod_list_tlsdeps=crypto tls # - modules depending on openssl (+curl) library mod_list_tlsdeps_curl=auth_identity +# - modules depending on static openssl library +mod_list_tlsa=tlsa + # - modules depending on openssl library mod_list_outbound=outbound @@ -276,6 +279,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_jwt) \ $(mod_list_lwsc) \ $(mod_list_stirshaken) \ + $(mod_list_tlsa) \ $(mod_list_rtp_media_server) @@ -394,6 +398,9 @@ module_group_ktls_basic=$(mod_list_tlsdeps) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) +# pkg tlsa module +module_group_ktlsa=$(mod_list_tlsa) + # pkg websocket module module_group_kwebsocket=$(mod_list_websocket)

1 0

git:master:14bcf765: tlsa: new (pseudo) module to compile tls module linked statically with libssl
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 14bcf765a945d0f7e2e39d538724fe4c247615b4 URL: https://github.com/kamailio/kamailio/commit/14bcf765a945d0f7e2e39d538724fe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:30:21+02:00 tlsa: new (pseudo) module to compile tls module linked statically with libssl --- Added: src/modules/tlsa/Makefile Added: src/modules/tlsa/doc/Makefile Added: src/modules/tlsa/doc/tlsa.xml Added: src/modules/tlsa/fixed_c_zlib.h Added: src/modules/tlsa/sbufq.h Added: src/modules/tlsa/tls_bio.c Added: src/modules/tlsa/tls_bio.h Added: src/modules/tlsa/tls_cfg.c Added: src/modules/tlsa/tls_cfg.h Added: src/modules/tlsa/tls_config.c Added: src/modules/tlsa/tls_config.h Added: src/modules/tlsa/tls_ct_q.h Added: src/modules/tlsa/tls_ct_wrq.c Added: src/modules/tlsa/tls_ct_wrq.h Added: src/modules/tlsa/tls_domain.c Added: src/modules/tlsa/tls_domain.h Added: src/modules/tlsa/tls_dump_vf.c Added: src/modules/tlsa/tls_dump_vf.h Added: src/modules/tlsa/tls_init.c Added: src/modules/tlsa/tls_init.h Added: src/modules/tlsa/tls_locking.c Added: src/modules/tlsa/tls_locking.h Added: src/modules/tlsa/tls_map.c Added: src/modules/tlsa/tls_map.h Added: src/modules/tlsa/tls_mod.h Added: src/modules/tlsa/tls_rand.c Added: src/modules/tlsa/tls_rand.h Added: src/modules/tlsa/tls_rpc.c Added: src/modules/tlsa/tls_rpc.h Added: src/modules/tlsa/tls_select.c Added: src/modules/tlsa/tls_select.h Added: src/modules/tlsa/tls_server.c Added: src/modules/tlsa/tls_server.h Added: src/modules/tlsa/tls_util.c Added: src/modules/tlsa/tls_util.h Added: src/modules/tlsa/tls_verify.c Added: src/modules/tlsa/tls_verify.h Added: src/modules/tlsa/tlsa_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/14bcf765a945d0f7e2e39d538724fe4… Patch: https://github.com/kamailio/kamailio/commit/14bcf765a945d0f7e2e39d538724fe4…

1 0

git:master:2fe5a0d1: tls: set module name using MOD_NAME define
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 2fe5a0d165082d7acde4695bffeb2d194e4bab58 URL: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:29:25+02:00 tls: set module name using MOD_NAME define --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… Patch: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 30a533994d..6e421635cb 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -256,12 +256,15 @@ static param_export_t params[] = { {0, 0, 0} }; +#ifndef MOD_NAME +#define MOD_NAME "tls" +#endif /* * Module interface */ struct module_exports exports = { - "tls", /* module name */ + MOD_NAME, /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */ params, /* exported parameters */

1 0

git:master:f614c39a: siputils: functions to compare uri and aor exported to kemi
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: f614c39a693cea39e3d96920fda3aa7a111c1d67 URL: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T09:02:14+02:00 siputils: functions to compare uri and aor exported to kemi --- Modified: src/modules/siputils/sipops.c Modified: src/modules/siputils/sipops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… Patch: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… --- diff --git a/src/modules/siputils/sipops.c b/src/modules/siputils/sipops.c index 4cba3c3181..5aba445b02 100644 --- a/src/modules/siputils/sipops.c +++ b/src/modules/siputils/sipops.c @@ -40,6 +40,18 @@ #include "sipops.h" +int ki_cmp_uri(sip_msg_t *msg, str *uri1, str *uri2) +{ + int ret; + + ret = cmp_uri_str(uri1, uri2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2) { str s1; @@ -64,6 +76,18 @@ int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2) return -2; } +int ki_cmp_aor(sip_msg_t *msg, str *uri1, str *uri2) +{ + int ret; + + ret = cmp_aor_str(uri1, uri2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2) { str s1; diff --git a/src/modules/siputils/sipops.h b/src/modules/siputils/sipops.h index 9926358e0a..7cbe77bd98 100644 --- a/src/modules/siputils/sipops.h +++ b/src/modules/siputils/sipops.h @@ -34,7 +34,9 @@ #include "../../core/parser/msg_parser.h" +int ki_cmp_uri(sip_msg_t *msg, str *uri1, str *uri2); int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2); +int ki_cmp_aor(sip_msg_t *msg, str *uri1, str *uri2); int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2); int ki_cmp_hdr_name(sip_msg_t *msg, str *shname1, str *shname2); int w_cmp_hdr_name(sip_msg_t *msg, char *hname1, char *hname2); diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index a23408ab79..747bf408fa 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -740,6 +740,16 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("cmp_uri"), + SR_KEMIP_INT, ki_cmp_uri, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("siputils"), str_init("cmp_aor"), + SR_KEMIP_INT, ki_cmp_aor, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("cmp_hdr_name"), SR_KEMIP_INT, ki_cmp_hdr_name, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:fa6245ce: core: cmp hdrname fix on checking type of second header
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: fa6245ce33602eeff1d776b921fd41400ae5bb48 URL: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T09:02:14+02:00 core: cmp hdrname fix on checking type of second header --- Modified: src/core/strutils.c --- Diff: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… Patch: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index 7b6a40ee3e..25d58747d9 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -477,7 +477,7 @@ int cmp_hdrname_str(str *s1, str *s2) } else { return 2; } - } else if(hf1.type!=HDR_OTHER_T) { + } else if(hf2.type!=HDR_OTHER_T) { return 2; } return cmpi_str(&n1, &n2); @@ -508,7 +508,7 @@ int cmp_hdrname_strzn(str *s1, char *s2, size_t len) } else { return 2; } - } else if(hf1.type!=HDR_OTHER_T) { + } else if(hf2.type!=HDR_OTHER_T) { return 2; } return cmpi_str(&n1, &n2);

1 0

[kamailio/kamailio] add debuginfo on dist other then x86 (#2789)
by sergey-safarov 01 Aug '21

01 Aug '21

### Description I want to debug `Kamailio` using `GDB` and compiled sources on `aarch64` architecture (`t4g` AWS instance). But produces object files do not contain debug info. Then executed ``` make -n ``` And found that no `-g` options used during compilation. I have specified `CFLAGS` and `CPPFLAGS` but with wont help. ### Expected behavior On all dist used `-g` compilation flag by default. If I have specified `CFLAGS` and `CPPFLAGS` as environment variables, then these flags used by GCC during compilation. #### Actual observed behavior `-g` flag do not used by default on `aarch64` architecture. `CFLAGS` and `CPPFLAGS` as environment variables do not used during compilation time. ### Additional info as hotfix I have used this patch ```diff diff --git a/src/Makefile.defs b/src/Makefile.defs index 027c985798..c91c34a7bb 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -885,7 +885,7 @@ endif ifeq ($(ARCH), aarch64) use_fast_lock=yes - C_DEFS+=-DNOSMP # memory barriers not implemented for arm + C_DEFS+= -g -DNOSMP # memory barriers not implemented for arm endif ifeq ($(ARCH), ppc) ``` -- 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/2789

3 7

[kamailio/kamailio] core: enabled compilation with debug symbols by default (#2811)
by sergey-safarov 01 Aug '21

01 Aug '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description closes GH #2789 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2811 -- Commit Summary -- * core: enabled compilation with debug symbols by default -- File Changes -- M src/Makefile.defs (66) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2811.patch https://github.com/kamailio/kamailio/pull/2811.diff -- 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/pull/2811

2 4