sr-dev July 2022

sr-dev@lists.kamailio.org

11 participants
230 discussions

git:master:c4f5b88b: tm: docs - fixed section for rpc.t_uac_wait_block
by Daniel-Constantin Mierla 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: c4f5b88b1861c73bc96904eef00b0048c9550240 URL: https://github.com/kamailio/kamailio/commit/c4f5b88b1861c73bc96904eef00b004… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T15:52:15+02:00 tm: docs - fixed section for rpc.t_uac_wait_block --- Modified: src/modules/tm/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/c4f5b88b1861c73bc96904eef00b004… Patch: https://github.com/kamailio/kamailio/commit/c4f5b88b1861c73bc96904eef00b004… --- diff --git a/src/modules/tm/doc/rpc.xml b/src/modules/tm/doc/rpc.xml index 18eeccd97c..d00ae09b73 100644 --- a/src/modules/tm/doc/rpc.xml +++ b/src/modules/tm/doc/rpc.xml @@ -70,9 +70,9 @@ </para> </section> - <section id="tm.rpc.t_uac_wait"> + <section id="tm.rpc.t_uac_wait_block"> <title> - <function moreinfo="none">tm.t_uac_wait</function> + <function moreinfo="none">tm.t_uac_wait_block</function> </title> <para> Similar to tm.t_uac_start, but blocks waiting for the SIP response and

1 0

git:master:ebbe6268: modules: readme files regenerated - ndb_redis ... [skip ci]
by Kamailio Dev 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: ebbe6268de3aff6ba830f1722942c2f10c6de2f3 URL: https://github.com/kamailio/kamailio/commit/ebbe6268de3aff6ba830f1722942c2f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-07-04T15:46:14+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/ebbe6268de3aff6ba830f1722942c2f… Patch: https://github.com/kamailio/kamailio/commit/ebbe6268de3aff6ba830f1722942c2f… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 2ca2c52c58..46081b7ec8 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -50,6 +50,7 @@ Carsten Bock 3.7. disable_time (integer) 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) + 3.10. debug (integer) 4. Functions @@ -69,9 +70,10 @@ Carsten Bock 1.7. Set disable_time parameter 1.8. Set flush_on_reconnect parameter 1.9. Set allow_dynamic_nodes parameter - 1.10. redis_cmd usage - 1.11. redis_execute usage - 1.12. redis_free usage + 1.10. Set debug parameter + 1.11. redis_cmd usage + 1.12. redis_execute usage + 1.13. redis_free usage Chapter 1. Admin Guide @@ -94,6 +96,7 @@ Chapter 1. Admin Guide 3.7. disable_time (integer) 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) + 3.10. debug (integer) 4. Functions @@ -138,6 +141,7 @@ Chapter 1. Admin Guide 3.7. disable_time (integer) 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) + 3.10. debug (integer) 3.1. server (str) @@ -319,6 +323,18 @@ modparam("ndb_redis", "cluster", 1) modparam("ndb_redis", "allow_dynamic_nodes", 1) ... +3.10. debug (integer) + + Set the verbosity level for some of the log messages. It has to be a + log level value. + + Default value is “3” (L_DBG). + + Example 1.10. Set debug parameter +... +modparam("ndb_redis", "debug", 1) +... + 4. Functions 4.1. redis_cmd(srvname, command, ..., replyid) @@ -359,7 +375,7 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) value. The key can be: rpl_str, rpl_arr, rpl_int, rpl_err, rpl_sts, rpl_nil. - Example 1.10. redis_cmd usage + Example 1.11. redis_cmd usage ... if(redis_cmd("srvN", "INCR cnt", "r")) { # success - the incremented value is in $redis(r=>value) @@ -438,7 +454,7 @@ if (redis_cmd("srvN", "EXEC", "r")) { If cluster parameter is set to 1, this function will log an error and do nothing. - Example 1.11. redis_execute usage + Example 1.12. redis_execute usage ... After several redis command calls: redis_pipe_cmd("srvA", "SET foo bar", "r1"); @@ -486,7 +502,7 @@ d commands. The call is not necessary function. When ndb_redis module closes, all pending replies are freed automatically. - Example 1.12. redis_free usage + Example 1.13. redis_free usage ... After a redis command call: redis_cmd("srvN", "INCR cnt", "r"); diff --git a/src/modules/topos/README b/src/modules/topos/README index 4c6c4532ad..b63965cd5d 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -143,11 +143,13 @@ Chapter 1. Admin Guide to be loaded (tune the module parameters if needed). It also works for SIP MESSAGE or other requests that do not create a - dialog -- record_route() must be used for them as well, the headers are - not going to be in the messages sent to the network, they are needed to - know local addresses used to communicate with each side. This module is - designed to work for presence (SUBSCRIBE-based) dialogs too. The - REGISTER and PUBLISH requests are skipped from processing by this + dialog (e.g., OPTIONS) -- record_route() must be used for them as well, + the headers are not going to be in the messages sent to the network, + they are needed to know local addresses used to communicate with each + side. This module is designed to work for presence (SUBSCRIBE-based) + dialogs too. + + The REGISTER and PUBLISH requests are skipped from processing by this module, expected to be terminated on a local SIP server. 2. Dependencies

1 0

git:master:b8fc507c: topos: docs - small updates to module description
by Daniel-Constantin Mierla 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: b8fc507c9dee07f1a0b7af01d24142240bcd8fa4 URL: https://github.com/kamailio/kamailio/commit/b8fc507c9dee07f1a0b7af01d241422… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T15:34:47+02:00 topos: docs - small updates to module description --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b8fc507c9dee07f1a0b7af01d241422… Patch: https://github.com/kamailio/kamailio/commit/b8fc507c9dee07f1a0b7af01d241422… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 1fb1d1f960..02e7e232d7 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -27,10 +27,12 @@ </para> <para> It also works for SIP MESSAGE or other requests that do not create - a dialog -- record_route() must be used for them as well, the - headers are not going to be in the messages sent to the network, they + a dialog (e.g., OPTIONS) -- record_route() must be used for them as well, + the headers are not going to be in the messages sent to the network, they are needed to know local addresses used to communicate with each side. - This module is designed to work for presence (SUBSCRIBE-based) dialogs too. + This module is designed to work for presence (SUBSCRIBE-based) dialogs too. + </para> + <para> The REGISTER and PUBLISH requests are skipped from processing by this module, expected to be terminated on a local SIP server. </para>

1 0

git:master:fdb7c2f6: ndb_redis: docs for debug parameter
by Daniel-Constantin Mierla 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: fdb7c2f635bf7145730444cafb129c4df37a1b7a URL: https://github.com/kamailio/kamailio/commit/fdb7c2f635bf7145730444cafb129c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T15:30:09+02:00 ndb_redis: docs for debug parameter --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fdb7c2f635bf7145730444cafb129c4… Patch: https://github.com/kamailio/kamailio/commit/fdb7c2f635bf7145730444cafb129c4… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index e71ce806a11..217a3d75d3d 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -304,6 +304,26 @@ modparam("ndb_redis", "server", "name=redis_cluster;addr=127.0.0.1;port=26008") ... modparam("ndb_redis", "cluster", 1) modparam("ndb_redis", "allow_dynamic_nodes", 1) +... + </programlisting> + </example> + </section> + <section id="ndb_redis.p.debug"> + <title><varname>debug</varname> (integer)</title> + <para> + Set the verbosity level for some of the log messages. It has to be + a log level value. + </para> + <para> + <emphasis> + Default value is <quote>3</quote> (L_DBG). + </emphasis> + </para> + <example> + <title>Set <varname>debug</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ndb_redis", "debug", 1) ... </programlisting> </example>

1 0

git:master:f1714283: ndb_redis: new param to control the verbosity of some log messages
by Daniel-Constantin Mierla 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: f171428374ecabb16e4f7621f2fcc7840bd22100 URL: https://github.com/kamailio/kamailio/commit/f171428374ecabb16e4f7621f2fcc78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T15:20:30+02:00 ndb_redis: new param to control the verbosity of some log messages --- Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/f171428374ecabb16e4f7621f2fcc78… Patch: https://github.com/kamailio/kamailio/commit/f171428374ecabb16e4f7621f2fcc78…

1 0

git:master:ef00062f: ndb_redis: clean up response on moved reply with cluster mode on
by Daniel-Constantin Mierla 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: ef00062fb3feb051e3e11c62ce3c529579d23f5b URL: https://github.com/kamailio/kamailio/commit/ef00062fb3feb051e3e11c62ce3c529… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T14:08:58+02:00 ndb_redis: clean up response on moved reply with cluster mode on --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/ef00062fb3feb051e3e11c62ce3c529… Patch: https://github.com/kamailio/kamailio/commit/ef00062fb3feb051e3e11c62ce3c529… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index aad0b6c1b62..c26154930b9 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1165,6 +1165,7 @@ redisReply* redisc_exec_argv(redisc_server_t *rsrv, int argc, const char **argv, if(res) { if (check_cluster_reply(res, &rsrv)) { + freeReplyObject(res); goto again; } return res; @@ -1175,6 +1176,7 @@ redisReply* redisc_exec_argv(redisc_server_t *rsrv, int argc, const char **argv, res = redisCommandArgv(rsrv->ctxRedis, argc, argv, argvlen); if (res) { if (check_cluster_reply(res, &rsrv)) { + freeReplyObject(res); goto again; } }

1 0

git:master:5f26491e: tls_wolfssl: cert serial number can exceed uint64
by S-P Chan 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: 5f26491e288092629fcd508b9acefe6edf175845 URL: https://github.com/kamailio/kamailio/commit/5f26491e288092629fcd508b9acefe6… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-07-04T19:48:54+08:00 tls_wolfssl: cert serial number can exceed uint64 - GH #3168 --- Modified: src/modules/tls_wolfssl/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/5f26491e288092629fcd508b9acefe6… Patch: https://github.com/kamailio/kamailio/commit/5f26491e288092629fcd508b9acefe6… --- diff --git a/src/modules/tls_wolfssl/tls_select.c b/src/modules/tls_wolfssl/tls_select.c index 0cb2d59c36..b61c7c2a59 100644 --- a/src/modules/tls_wolfssl/tls_select.c +++ b/src/modules/tls_wolfssl/tls_select.c @@ -632,24 +632,32 @@ static int pv_validity(sip_msg_t* msg, pv_param_t* param, pv_value_t* res) } -static int get_sn(str* res, int* ires, int local, sip_msg_t* msg) +static int get_sn(str* res, int local, sip_msg_t* msg) { - static char buf[INT2STR_MAX_LEN]; + static char buf[80]; // > log(2^256,10) X509* cert; struct tcp_connection* c; - char* sn; - int num; + char* sn = NULL; + WOLFSSL_BIGNUM* bn = NULL; if (get_cert(&cert, &c, msg, local) < 0) return -1; - num = ASN1_INTEGER_get(X509_get_serialNumber(cert)); - sn = int2str(num, &res->len); + if(!(bn = wolfSSL_BN_new())) goto error; + if (!wolfSSL_ASN1_INTEGER_to_BN(X509_get_serialNumber(cert), bn)) goto error; + if (!(sn = wolfSSL_BN_bn2dec(bn)) || strlen(sn) > 80) goto error; + res->len = strlen(sn); memcpy(buf, sn, res->len); res->s = buf; - if (ires) *ires = num; + if (!local) X509_free(cert); tcpconn_put(c); + wolfSSL_OPENSSL_free(sn); + wolfSSL_BN_free(bn); return 0; + error: + if (sn) wolfSSL_OPENSSL_free(sn); + if (bn) wolfSSL_BN_free(bn); + return -1; } static int sel_sn(str* res, select_t* s, sip_msg_t* msg) @@ -664,7 +672,7 @@ static int sel_sn(str* res, select_t* s, sip_msg_t* msg) return -1; } - return get_sn(res, NULL, local, msg); + return get_sn(res, local, msg); } @@ -681,11 +689,11 @@ static int pv_sn(sip_msg_t* msg, pv_param_t* param, pv_value_t* res) return pv_get_null(msg, param, res); } - if (get_sn(&res->rs, &res->ri, local, msg) < 0) { + if (get_sn(&res->rs, local, msg) < 0) { return pv_get_null(msg, param, res); } - res->flags = PV_VAL_STR | PV_VAL_INT; + res->flags = PV_VAL_STR; return 0; }

1 0

git:master:06e2363a: tls_wolfssl: move git submodule to misc/external/wolfssl
by S-P Chan 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: 06e2363a961a1f7f866faee81aeac737db2359fc URL: https://github.com/kamailio/kamailio/commit/06e2363a961a1f7f866faee81aeac73… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-07-04T19:43:35+08:00 tls_wolfssl: move git submodule to misc/external/wolfssl - GH #3164 --- Added: misc/external/wolfssl/.gitignore Added: misc/external/wolfssl/wolfssl Modified: .gitmodules Modified: src/modules/tls_wolfssl/Makefile Removed: src/modules/tls_wolfssl/lib/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/06e2363a961a1f7f866faee81aeac73… Patch: https://github.com/kamailio/kamailio/commit/06e2363a961a1f7f866faee81aeac73… --- diff --git a/.gitmodules b/.gitmodules index 97045b8acd8..1d8f99966ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,5 +2,5 @@ path = pkg/docker url = https://github.com/kamailio/kamailio-ci.git [submodule "src/modules/tls_wolfssl/lib/wolfssl"] - path = src/modules/tls_wolfssl/lib/wolfssl + path = misc/external/wolfssl/wolfssl url = https://github.com/wolfSSL/wolfssl.git diff --git a/misc/external/wolfssl/.gitignore b/misc/external/wolfssl/.gitignore new file mode 100644 index 00000000000..567609b1234 --- /dev/null +++ b/misc/external/wolfssl/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/src/modules/tls_wolfssl/lib/wolfssl b/misc/external/wolfssl/wolfssl similarity index 100% rename from src/modules/tls_wolfssl/lib/wolfssl rename to misc/external/wolfssl/wolfssl diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 687fe1a4947..f6a27f7f34e 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,15 +8,17 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so -LIBS += lib/lib/libwolfssl.a -INCLUDES += -I./lib/include/ +WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build +WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl +LIBS += $(WOLFSSL_PREFIX)/lib/libwolfssl.a +INCLUDES += -I$(WOLFSSL_PREFIX)/include/ include ../../Makefile.modules -$(objs): lib/include/wolfssl/options.h +$(objs): $(WOLFSSL_PREFIX)/include/wolfssl/options.h -lib/include/wolfssl/options.h lib/lib/libwolfssl.a: - @cd ./lib/wolfssl; \ +$(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: + @cd $(WOLFSSL_SRC); \ if [ ! -f "configure" ]; then \ ./autogen.sh; \ fi; \ @@ -24,16 +26,16 @@ lib/include/wolfssl/options.h lib/lib/libwolfssl.a: env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC -Wno-error=array-bounds -Wno-error=stringop-overflow" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-aligndata=no \ --disable-shared --disable-examples \ - --prefix=$(CURDIR)/lib \ - --exec-prefix=$(CURDIR)/lib; \ + --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ + --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \ fi; - @$(MAKE) -C ./lib/wolfssl install + @$(MAKE) -C $(WOLFSSL_SRC) install -$(NAME): lib/lib/libwolfssl.a +$(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a clean-wolfssl: - @rm -rf ./lib/{bin,include,share,lib}; \ - (cd ./lib/wolfssl; make distclean) || /bin/true + @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \ + (cd $(WOLFSSL_SRC); make distclean) || /bin/true clean-module: @rm -f *.o *.so

1 0

[kamailio/kamailio] Errormessage TLS read:error:0D0E10DF:asn1 encoding routines:asn1_get_uint64:too large (Issue #3168)
by MartinPalmAGDS 04 Jul '22

04 Jul '22

We use Kamilio as a proxy server to connect softphones to our PBX systems. We have run into some TLS problems. These problems result in a shut down of the TLS connection after the error is encountered. We have looked into serial numbers of certificates. The current code in kamailio seems to be broken due to changes in the world around... many certificates today do not adhere to the previously assumed behaviour of certificate serial numbers anymore. The error which causes the connection to drop seems to be related to a comparison of the certificate serial numbers during renegotiation. tls_err_ret(): TLS read:error:0D0E10DF:asn1 encoding routines:asn1_get_uint64:too large Kamailio expects serial numbers to fit in a 64 bit unsigned, however during the last years, starting around 2003 more and more systems use automatically generated serial numbers, which are frequently 128 bit long. The serialnumber of our own Auerswald root certificate looks to be only 64 bit long, but during the negotiation is presented as 9 bytes starting with 00h, which is interpreted as a 72bit value. Trying to put this serial number in a 64 bit long kills the connection. Due to the different ways that are used to generate serial numbers now, there is no simple algorithm to condense the number into a 64bit value, and the whole number should be compared to see if it is same or higher. We currently have disabled renegotiation to avoid the connection being dropped during renegotiation. Which however can lead to the connection being dropped by the other side during renegotiation, but this is not a good permanent workaround! #### Reproduction This issue happens infrequently ### Possible Solutions No workaround possible on our side ### Additional Information Kamailio Version 5.5.4 LibSSL 1.1.1.n * **Operating System**: Linux, Debian oldstable -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3168 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3168(a)github.com>

3 3

[kamailio/kamailio] tls: cert serial number can exceed uint64 (PR #3171)
by space88man 04 Jul '22

04 Jul '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) - [ ] New feature (non-breaking change which adds new functionality) - [X] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #3168 #### Description Certificate serial numbers can be large integers (> 2^64). Parse then as BIGNUM and store the string in pv; we cannot store as integer anymore. The original code handles 2^64 with a static buffer of 19. We upsize to 2^256 with a static buffer of 80. May break configurations that try to extract the sn pv as an integer (does anyone actually do this?) Addresses #3168. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3171 -- Commit Summary -- * tls: cert serial number can exceed uint64 -- File Changes -- M src/modules/tls/tls_select.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3171.patch https://github.com/kamailio/kamailio/pull/3171.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3171 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3171(a)github.com>

2 10

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2022