sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
312 discussions

git:5.5:390c668e: tls: Makefile - pkg-config for libcrypto

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 390c668e03d3347dbf429e395f7e5de230523629 URL: https://github.com/kamailio/kamailio/commit/390c668e03d3347dbf429e395f7e5de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:38+02:00 tls: Makefile - pkg-config for libcrypto - some distros have it separate of libssl (cherry picked from commit 2a9e8b9d5c5556a10229813c8878a81933325a01) --- Modified: src/modules/tls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/390c668e03d3347dbf429e395f7e5de… Patch: https://github.com/kamailio/kamailio/commit/390c668e03d3347dbf429e395f7e5de… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 48cb886619..3b90ec8fd6 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -20,25 +20,41 @@ SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) +CRYPTO_BUILDER=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'pkg-config libcrypto'; \ + fi) endif ifneq ($(SSL_BUILDER),) + ifneq ($(LIBSSL_STATIC),yes) DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs) -else + +ifneq ($(CRYPTO_BUILDER),) + DEFS += $(shell $(CRYPTO_BUILDER) --cflags) + LIBS += $(shell $(CRYPTO_BUILDER) --libs) +endif # ifneq ($(CRYPTO_BUILDER),) + +else # $(LIBSSL_STATIC),yes) + ifneq ($(LIBSSL_STATIC_SRCLIB),yes) ## when static libs (*.a) from packages are compiled with -fPIC DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs-only-L) + # TODO: explore use of LIBS += -Wl,-Bstatic $(shell $(SSL_BUILDER) --libs-only-l) LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a else ## when linking against static libs compiled from sources DEFS += -I$(LIBSSL_STATIC_SRCPATH)/include LIBS += $(LIBSSL_STATIC_SRCPATH)/libssl.a $(LIBSSL_STATIC_SRCPATH)/libcrypto.a endif # ifneq ($(LIBSSL_STATIC_SRCLIB),yes) + endif # ifneq ($(LIBSSL_STATIC),yes) -else + +else # ifneq ($(SSL_BUILDER),) + DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ @@ -46,7 +62,8 @@ else # NOTE: depending on the way in which libssl was compiled you might # have to add -lz -lkrb5 (zlib and kerberos5). # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" -endif + +endif # ifneq ($(SSL_BUILDER),) LIBS+= $(TLS_EXTRA_LIBS)

3 years, 3 months

git:5.5:6a527503: http_client: docs - fixed small typo

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 6a527503a653d554ffb38f8bd7a40fd75441ff4d URL: https://github.com/kamailio/kamailio/commit/6a527503a653d554ffb38f8bd7a40fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:23+02:00 http_client: docs - fixed small typo (cherry picked from commit 1f67ac5a62b58b35df52aedbd1a3d2234a72817e) --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6a527503a653d554ffb38f8bd7a40fd… Patch: https://github.com/kamailio/kamailio/commit/6a527503a653d554ffb38f8bd7a40fd… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 2c8295f07f..e52ec5ce26 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -446,7 +446,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: <itemizedlist> <listitem><para>0 - Return the entire HTTP result body</para></listitem> - <listitem><para>1 - Return the first oine from HTTP result body</para></listitem> + <listitem><para>1 - Return the first line from HTTP result body</para></listitem> </itemizedlist> </para> <para>

3 years, 3 months

git:5.5:cf6c70f0: xhttp: warning log if tcp_accept_no_cl is not set

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: cf6c70f00fda196ac9eba4a2ccd24b382d41b240 URL: https://github.com/kamailio/kamailio/commit/cf6c70f00fda196ac9eba4a2ccd24b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:10+02:00 xhttp: warning log if tcp_accept_no_cl is not set (cherry picked from commit b8fbf5e8c199b8277053f9c15231695a16058d6e) --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf6c70f00fda196ac9eba4a2ccd24b3… Patch: https://github.com/kamailio/kamailio/commit/cf6c70f00fda196ac9eba4a2ccd24b3… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index f62c880a9a..1aec2763d9 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -41,6 +41,7 @@ #include "../../core/sip_msg_clone.h" #include "../../core/mod_fix.h" #include "../../core/pvar.h" +#include "../../core/tcp_options.h" #include "../../core/kemi.h" #include "api.h" @@ -142,6 +143,11 @@ static int mod_init(void) xhttp_route_no = route_no; } + if(cfg_get(tcp, tcp_cfg, accept_no_cl)==0) { + LM_WARN("tcp_accept_no_cl not set - usually required" + " to handle HTTP requests with no Content-Lenght\n"); + } + /* bind the SL API */ if(sl_load_api(&slb) != 0) { LM_ERR("cannot bind to SL API\n");

3 years, 3 months

git:5.5:9d730165: websocket: docs - added tcp_accept_no_cl=yes to example

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 9d7301652ca7f051df4a23b6be3a83d3f21baa5d URL: https://github.com/kamailio/kamailio/commit/9d7301652ca7f051df4a23b6be3a83d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:33:54+02:00 websocket: docs - added tcp_accept_no_cl=yes to example (cherry picked from commit a05b4d7c2e413032b1a63f3d017243446a0bc6ec) --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9d7301652ca7f051df4a23b6be3a83d… Patch: https://github.com/kamailio/kamailio/commit/9d7301652ca7f051df4a23b6be3a83d… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 7cc6e09069..b4b5e2c8ce 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -43,6 +43,8 @@ <title>event_route[xhttp:request]</title> <programlisting><![CDATA[ ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets

3 years, 3 months

git:5.5:42df0f0b: xhttp: extended example for event_route[xhttp:request]

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 42df0f0b58a2b5780a9bf613a5a29d4af27b4f67 URL: https://github.com/kamailio/kamailio/commit/42df0f0b58a2b5780a9bf613a5a29d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:33:45+02:00 xhttp: extended example for event_route[xhttp:request] (cherry picked from commit 195de260f102f1a016ad7bd1021571c1dd8a983f) --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/42df0f0b58a2b5780a9bf613a5a29d4… Patch: https://github.com/kamailio/kamailio/commit/42df0f0b58a2b5780a9bf613a5a29d4… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index c2a18f9d44..507283b90f 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -222,6 +222,11 @@ event_route[xhttp:request] { </para> <programlisting format="linespecific"> ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

3 years, 3 months

git:5.5:5ebbb557: dispatcher: print eol in some log messages

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 5ebbb557729df2f888f288ac21f61a662f7d8aa8 URL: https://github.com/kamailio/kamailio/commit/5ebbb557729df2f888f288ac21f61a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:33:26+02:00 dispatcher: print eol in some log messages (cherry picked from commit e6f4e929efb61a1a51aa1b4b5587999acc8dc55d) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/5ebbb557729df2f888f288ac21f61a6… Patch: https://github.com/kamailio/kamailio/commit/5ebbb557729df2f888f288ac21f61a6… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 78ece3fffe..674678417d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -325,7 +325,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.weight = tmp_ival; } else { dest->attrs.weight = 0; - LM_ERR("weight %d not in 1-100 range - ignoring destination", + LM_ERR("weight %d not in 1-100 range - ignoring destination\n", tmp_ival); } } else if(pit->name.len == 7 @@ -350,7 +350,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.rweight = tmp_ival; } else { dest->attrs.rweight = 0; - LM_WARN("rweight %d not in 1-100 range - ignoring", tmp_ival); + LM_WARN("rweight %d not in 1-100 range - ignoring\n", tmp_ival); } } else if(pit->name.len == 9 && strncasecmp(pit->name.s, "ping_from", 9) == 0) {

3 years, 3 months

git:5.5:2ea0baf9: htable: fix documentation

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 2ea0baf9cf2cb0b30e6474cc150eb3580d8cdf5b URL: https://github.com/kamailio/kamailio/commit/2ea0baf9cf2cb0b30e6474cc150eb35… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:14:13+02:00 htable: fix documentation - reported by arkadiam on Github (cherry picked from commit ee9c2bc2046103f0f7888c078b1f88d0befd6f7d) --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2ea0baf9cf2cb0b30e6474cc150eb35… Patch: https://github.com/kamailio/kamailio/commit/2ea0baf9cf2cb0b30e6474cc150eb35… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 3a7f101bca..5ef04b2ee6 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1363,7 +1363,7 @@ kamcmd htable.sets test x[0] abc kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer -kamcmd htable.sets test x[0] 123 +kamcmd htable.seti test x[0] 123 ... </programlisting> </section>

3 years, 3 months

git:master:365e7e46: tls: info log when libssl is linked static

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 365e7e46dfb4f605bafe43b57e37e1ff68077567 URL: https://github.com/kamailio/kamailio/commit/365e7e46dfb4f605bafe43b57e37e1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T14:24:06+02:00 tls: info log when libssl is linked static --- Modified: src/modules/tls/Makefile Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/365e7e46dfb4f605bafe43b57e37e1f… Patch: https://github.com/kamailio/kamailio/commit/365e7e46dfb4f605bafe43b57e37e1f… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 3b90ec8fd6..32495099c0 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -39,6 +39,8 @@ endif # ifneq ($(CRYPTO_BUILDER),) else # $(LIBSSL_STATIC),yes) + DEFS += -DKSR_LIBSSL_STATIC + ifneq ($(LIBSSL_STATIC_SRCLIB),yes) ## when static libs (*.a) from packages are compiled with -fPIC DEFS += $(shell $(SSL_BUILDER) --cflags) diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index b71bbbd28b..4c858bbbd8 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -589,6 +589,10 @@ int tls_pre_init(void) void (*ff)(void *, const char *, int) = NULL; #endif +#ifdef KSR_LIBSSL_STATIC + LM_INFO("libssl linked mode: static\n"); +#endif + /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0

3 years, 3 months

git:master:81ace1c9: tls: debug messages with memory management functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 81ace1c94369fb98081918acb55a6a13686784e3 URL: https://github.com/kamailio/kamailio/commit/81ace1c94369fb98081918acb55a6a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T11:29:40+02:00 tls: debug messages with memory management functions --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/81ace1c94369fb98081918acb55a6a1… Patch: https://github.com/kamailio/kamailio/commit/81ace1c94369fb98081918acb55a6a1… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 8bdd14f2cc..b71bbbd28b 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -593,6 +593,12 @@ int tls_pre_init(void) * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0 */ + CRYPTO_get_mem_functions(&mf, &rf, &ff); + LM_DBG("initial memory functions - malloc: %p realloc: %p free: %p\n", + mf, rf, ff); + mf = NULL; + rf = NULL; + ff = NULL; #ifdef TLS_MALLOC_DBG if (!CRYPTO_set_mem_ex_functions(ser_malloc, ser_realloc, ser_free)) { #else @@ -602,10 +608,14 @@ int tls_pre_init(void) CRYPTO_get_mem_functions(&mf, &rf, &ff); LM_ERR("libssl current mem functions - m: %p r: %p f: %p\n", mf, rf, ff); + LM_ERR("module mem functions - m: %p r: %p f: %p\n", + ser_malloc, ser_realloc, ser_free); LM_ERR("Be sure tls module is loaded before any other module using" " libssl (can be loaded first to be safe)\n"); return -1; } + LM_DBG("updated memory functions - malloc: %p realloc: %p free: %p\n", + ser_malloc, ser_realloc, ser_free); #endif /* LIBRESSL_VERSION_NUMBER */ if (tls_init_locks()<0)

3 years, 3 months

git:master:2a9e8b9d: tls: Makefile - pkg-config for libcrypto

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2a9e8b9d5c5556a10229813c8878a81933325a01 URL: https://github.com/kamailio/kamailio/commit/2a9e8b9d5c5556a10229813c8878a81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T10:15:23+02:00 tls: Makefile - pkg-config for libcrypto - some distros have it separate of libssl --- Modified: src/modules/tls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2a9e8b9d5c5556a10229813c8878a81… Patch: https://github.com/kamailio/kamailio/commit/2a9e8b9d5c5556a10229813c8878a81… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 48cb886619..3b90ec8fd6 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -20,25 +20,41 @@ SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) +CRYPTO_BUILDER=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'pkg-config libcrypto'; \ + fi) endif ifneq ($(SSL_BUILDER),) + ifneq ($(LIBSSL_STATIC),yes) DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs) -else + +ifneq ($(CRYPTO_BUILDER),) + DEFS += $(shell $(CRYPTO_BUILDER) --cflags) + LIBS += $(shell $(CRYPTO_BUILDER) --libs) +endif # ifneq ($(CRYPTO_BUILDER),) + +else # $(LIBSSL_STATIC),yes) + ifneq ($(LIBSSL_STATIC_SRCLIB),yes) ## when static libs (*.a) from packages are compiled with -fPIC DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs-only-L) + # TODO: explore use of LIBS += -Wl,-Bstatic $(shell $(SSL_BUILDER) --libs-only-l) LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a else ## when linking against static libs compiled from sources DEFS += -I$(LIBSSL_STATIC_SRCPATH)/include LIBS += $(LIBSSL_STATIC_SRCPATH)/libssl.a $(LIBSSL_STATIC_SRCPATH)/libcrypto.a endif # ifneq ($(LIBSSL_STATIC_SRCLIB),yes) + endif # ifneq ($(LIBSSL_STATIC),yes) -else + +else # ifneq ($(SSL_BUILDER),) + DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ @@ -46,7 +62,8 @@ else # NOTE: depending on the way in which libssl was compiled you might # have to add -lz -lkrb5 (zlib and kerberos5). # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" -endif + +endif # ifneq ($(SSL_BUILDER),) LIBS+= $(TLS_EXTRA_LIBS)

3 years, 3 months

← Newer
1
...
11
12
13
14
15
16
17
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021