- sr-dev - kamailio.org

git:5.5:1ff0d8bc: tls: debug messages with memory management functions
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: 1ff0d8bce7a84a2afca206cd5efee781edc264d6 URL: https://github.com/kamailio/kamailio/commit/1ff0d8bce7a84a2afca206cd5efee78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:47+02:00 tls: debug messages with memory management functions (cherry picked from commit 81ace1c94369fb98081918acb55a6a13686784e3) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/1ff0d8bce7a84a2afca206cd5efee78… Patch: https://github.com/kamailio/kamailio/commit/1ff0d8bce7a84a2afca206cd5efee78… --- 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)

1 0

git:5.5:a7007532: tls: info log when libssl is linked static
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: a7007532ff6d351629bf1467a1e74b29c0125917 URL: https://github.com/kamailio/kamailio/commit/a7007532ff6d351629bf1467a1e74b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:56+02:00 tls: info log when libssl is linked static (cherry picked from commit 365e7e46dfb4f605bafe43b57e37e1ff68077567) --- Modified: src/modules/tls/Makefile Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/a7007532ff6d351629bf1467a1e74b2… Patch: https://github.com/kamailio/kamailio/commit/a7007532ff6d351629bf1467a1e74b2… --- 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

1 0

git:5.5:cf6c70f0: xhttp: warning log if tcp_accept_no_cl is not set
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

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");

1 0

git:5.5:6a527503: http_client: docs - fixed small typo
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

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>

1 0

git:5.5:390c668e: tls: Makefile - pkg-config for libcrypto
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

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)

1 0

git:5.5:42df0f0b: xhttp: extended example for event_route[xhttp:request]
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

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>");

1 0

git:5.5:9d730165: websocket: docs - added tcp_accept_no_cl=yes to example
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

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

1 0

git:5.5:2ea0baf9: htable: fix documentation
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

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>

1 0

git:5.5:5ebbb557: dispatcher: print eol in some log messages
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

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) {

1 0

git:master:365e7e46: tls: info log when libssl is linked static
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

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

1 0

git:master:81ace1c9: tls: debug messages with memory management functions
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

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)

1 0

git:master:2a9e8b9d: tls: Makefile - pkg-config for libcrypto
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

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)

1 0

git:master:795a9f57: core: kemi - exported KSR.to_UDP()
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 795a9f5714607f829d5a0abfc53cb61cb2f8d421 URL: https://github.com/kamailio/kamailio/commit/795a9f5714607f829d5a0abfc53cb61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T18:39:54+02:00 core: kemi - exported KSR.to_UDP() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/795a9f5714607f829d5a0abfc53cb61… Patch: https://github.com/kamailio/kamailio/commit/795a9f5714607f829d5a0abfc53cb61… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 63be6bb0fc..76ace9c3d2 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2042,6 +2042,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("to_UDP"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_udp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("to_TCP"), SR_KEMIP_BOOL, sr_kemi_core_to_proto_tcp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:bff78b91: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: bff78b91788a35e51bd70c6a693b9addd5b48701 URL: https://github.com/kamailio/kamailio/commit/bff78b91788a35e51bd70c6a693b9ad… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-23T13:16:19+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/bff78b91788a35e51bd70c6a693b9ad… Patch: https://github.com/kamailio/kamailio/commit/bff78b91788a35e51bd70c6a693b9ad… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 0028f9e623..a3de550a2b 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -503,7 +503,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: * 0 - Return the entire HTTP result body - * 1 - Return the first oine from HTTP result body + * 1 - Return the first line from HTTP result body Default value: 1 (return first line).

1 0

[kamailio/kamailio] siptrace: added extra params to $siptrace() pseudo-variable (#2777)
by sergey-safarov 23 Jun '21

23 Jun '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 - [ ] 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 added 1. $siptrace(src_addr) 2. $siptrace(src_host) 3. $siptrace(src_port) 4. $siptrace(src_proto) 5. $siptrace(dst_addr) 6. $siptrace(dst_host) 7. $siptrace(dst_port) 8. $siptrace(dst_proto) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2777 -- Commit Summary -- * siptrace: added extra params to $siptrace() pseudo-variable -- File Changes -- M src/modules/siptrace/siptrace.c (74) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2777.patch https://github.com/kamailio/kamailio/pull/2777.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/2777

2 12

git:master:1f67ac5a: http_client: docs - fixed small typo
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 1f67ac5a62b58b35df52aedbd1a3d2234a72817e URL: https://github.com/kamailio/kamailio/commit/1f67ac5a62b58b35df52aedbd1a3d22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T13:06:19+02:00 http_client: docs - fixed small typo --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1f67ac5a62b58b35df52aedbd1a3d22… Patch: https://github.com/kamailio/kamailio/commit/1f67ac5a62b58b35df52aedbd1a3d22… --- 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>

1 0

git:master:261c57ae: siptrace: added extra params to $siptrace() pseudo-variable
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 261c57aedf1f35ddc3959a21043b34750274935f URL: https://github.com/kamailio/kamailio/commit/261c57aedf1f35ddc3959a21043b347… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T09:56:51+02:00 siptrace: added extra params to $siptrace() pseudo-variable for more details check GH #2777 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/261c57aedf1f35ddc3959a21043b347… Patch: https://github.com/kamailio/kamailio/commit/261c57aedf1f35ddc3959a21043b347… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 13cc220457..d7416506dd 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2505,16 +2505,82 @@ static sr_kemi_t sr_kemi_siptrace_exports[] = { int pv_get_siptrace(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { + str host; + int port; + int proto; + str sproto; if (siptrace_event_data==NULL) { return pv_get_null(msg, param, res); } switch(param->pvn.u.isname.name.n) { - case 1: /* dst_uri*/ + case 2: /* src_host */ + case 4: /* src_port */ + case 6: /* src_proto */ + case 8: /* src_hostip */ + if (parse_phostport(siptrace_event_data->fromip.s, &host.s, &host.len, &port, &proto)!=0) { + LM_ERR("invalid src_addr: %.*s\n", siptrace_event_data->fromip.len, siptrace_event_data->fromip.s); + return pv_get_null(msg, param, res); + } + break; + case 3: /* dst_host */ + case 5: /* dst_port */ + case 7: /* dst_proto */ + case 9: /* dst_hostip */ + if (parse_phostport(siptrace_event_data->toip.s, &host.s, &host.len, &port, &proto)!=0) { + LM_ERR("invalid dst_addr: %.*s\n", siptrace_event_data->toip.len, siptrace_event_data->toip.s); + return pv_get_null(msg, param, res); + } + break; + } + + switch(param->pvn.u.isname.name.n) { + case 6: /* src_proto */ + case 7: /* dst_proto */ + if(get_valid_proto_string(proto, 0, 0, &sproto)<0) + { + sproto.s = "none"; + sproto.len = 4; + } + break; + } + + switch(param->pvn.u.isname.name.n) { + case 8: /* src_hostip */ + case 9: /* dst_hostip */ + + /* now IPv6 address has brakets that not wanted in IP address operations */ + if(host.s[0] == '[' && host.s[host.len-1] == ']') { + host.s++; + host.len = host.len - 2; + } + break; + } + + switch(param->pvn.u.isname.name.n) { + case 0: /* src_addr */ + return pv_get_strval(msg, param, res, &siptrace_event_data->fromip); + case 1: /* dst_addr */ return pv_get_strval(msg, param, res, &siptrace_event_data->toip); + case 2: /* src_host */ + return pv_get_strval(msg, param, res, &host); + case 3: /* dst_host */ + return pv_get_strval(msg, param, res, &host); + case 4: /* src_port */ + return pv_get_sintval(msg, param, res, port); + case 5: /* dst_port */ + return pv_get_sintval(msg, param, res, port); + case 6: /* src_proto */ + return pv_get_strintval(msg, param, res, &sproto, proto); + case 7: /* dst_proto */ + return pv_get_strintval(msg, param, res, &sproto, proto); + case 8: /* src_hostip */ + return pv_get_strval(msg, param, res, &host); + case 9: /* dst_hostip */ + return pv_get_strval(msg, param, res, &host); default: - /* 0 - src_uri */ - return pv_get_strval(msg, param, res, &siptrace_event_data->fromip); + LM_ERR("unexpected config param\n"); + return pv_get_null(msg, param, res); } } @@ -2533,6 +2599,28 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "dst_addr", 8)==0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "src_host", 8)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "dst_host", 8)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "src_port", 8)==0) + sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "dst_port", 8)==0) + sp->pvp.pvn.u.isname.name.n = 5; + else goto error; + break; + case 9: + if(strncmp(in->s, "src_proto", 9)==0) + sp->pvp.pvn.u.isname.name.n = 6; + else if(strncmp(in->s, "dst_proto", 9)==0) + sp->pvp.pvn.u.isname.name.n = 7; + else goto error; + break; + case 10: + if(strncmp(in->s, "src_hostip", 10)==0) + sp->pvp.pvn.u.isname.name.n = 8; + else if(strncmp(in->s, "dst_hostip", 10)==0) + sp->pvp.pvn.u.isname.name.n = 9; else goto error; break; default:

1 0

git:master:b8fbf5e8: xhttp: warning log if tcp_accept_no_cl is not set
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: b8fbf5e8c199b8277053f9c15231695a16058d6e URL: https://github.com/kamailio/kamailio/commit/b8fbf5e8c199b8277053f9c15231695… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T08:49:38+02:00 xhttp: warning log if tcp_accept_no_cl is not set --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b8fbf5e8c199b8277053f9c15231695… Patch: https://github.com/kamailio/kamailio/commit/b8fbf5e8c199b8277053f9c15231695… --- 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");

1 0

git:master:7979925f: modules: readme files regenerated - tcpops ... [skip ci]
by Kamailio Dev 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 7979925ff2a53dcc2111c1ebbbc94b2cac6103df URL: https://github.com/kamailio/kamailio/commit/7979925ff2a53dcc2111c1ebbbc94b2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-23T08:46:24+02:00 modules: readme files regenerated - tcpops ... [skip ci] --- Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/7979925ff2a53dcc2111c1ebbbc94b2… Patch: https://github.com/kamailio/kamailio/commit/7979925ff2a53dcc2111c1ebbbc94b2… --- diff --git a/src/modules/tcpops/README b/src/modules/tcpops/README index 70209686f0..5bbd683440 100644 --- a/src/modules/tcpops/README +++ b/src/modules/tcpops/README @@ -34,6 +34,7 @@ Olle E. Johansson 3.7. tcp_get_conid(hostport, pvname) 3.8. tcp_set_otcpid(conid) 3.9. tcp_set_otcpid_flag(mode) + 3.10. tcp_close_connection([conid]) 4. Event routes @@ -55,6 +56,7 @@ Olle E. Johansson 1.9. tcp_get_conid usage 1.10. tcp_set_otcpid usage 1.11. tcp_set_otcpid_flag usage + 1.12. tcp_close_connection usage Chapter 1. Admin Guide @@ -77,6 +79,7 @@ Chapter 1. Admin Guide 3.7. tcp_get_conid(hostport, pvname) 3.8. tcp_set_otcpid(conid) 3.9. tcp_set_otcpid_flag(mode) + 3.10. tcp_close_connection([conid]) 4. Event routes @@ -152,6 +155,7 @@ end 3.7. tcp_get_conid(hostport, pvname) 3.8. tcp_set_otcpid(conid) 3.9. tcp_set_otcpid_flag(mode) + 3.10. tcp_close_connection([conid]) 3.1. tcp_conid_alive(conid) @@ -400,6 +404,25 @@ event_route[tcp:closed] { tcp_set_otcpid_flag("$var(cmode)"); ... +3.10. tcp_close_connection([conid]) + + Trigger a close of the connection corresponding to current SIP message + or to connection id 'conid'. + + Meaning of the parameters is as follows: + * conid - the value of tcp connection id. It can be an integer number + or a variable holding an interver value. + + Return values: + * 1: success + * -1 (or other negative values): failure + + Example 1.12. tcp_close_connection usage +... + $var(conid) = 10; + tcp_close_connection("$var(conid)"); +... + 4. Event routes 4.1. tcp:closed

1 0

git:master:4ea4f598: tcpops: docs for tcp_close_connection()
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 4ea4f598a10b6f0f690cf8a9b6174997ccb62b6f URL: https://github.com/kamailio/kamailio/commit/4ea4f598a10b6f0f690cf8a9b617499… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T08:40:46+02:00 tcpops: docs for tcp_close_connection() --- Modified: src/modules/tcpops/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ea4f598a10b6f0f690cf8a9b617499… Patch: https://github.com/kamailio/kamailio/commit/4ea4f598a10b6f0f690cf8a9b617499… --- diff --git a/src/modules/tcpops/doc/functions.xml b/src/modules/tcpops/doc/functions.xml index 94cefaa776..1502386598 100644 --- a/src/modules/tcpops/doc/functions.xml +++ b/src/modules/tcpops/doc/functions.xml @@ -375,4 +375,40 @@ event_route[tcp:closed] { ]]></programlisting> </example> </section> + <section id="tcpops.f.tcp_close_connection"> + <title> + <function>tcp_close_connection([conid])</function> + </title> + <para> + Trigger a close of the connection corresponding to current SIP + message or to connection id 'conid'. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>conid</emphasis> - the value of tcp connection id. + It can be an integer number or a variable holding an interver value. + </para> + </listitem> + </itemizedlist> + <para>Return values:</para> + <itemizedlist> + <listitem> + <para>1: success</para> + </listitem> + <listitem> + <para>-1 (or other negative values): failure</para> + </listitem> + </itemizedlist> + <example> + <title><function>tcp_close_connection</function> usage</title> + <programlisting><![CDATA[ +... + $var(conid) = 10; + tcp_close_connection("$var(conid)"); +... + ]]></programlisting> + </example> + </section> + </section>

1 0

git:master:ac55488b: tcpops: added tcp_close_connection([conid])
by Daniel-Constantin Mierla 22 Jun '21

22 Jun '21

Module: kamailio Branch: master Commit: ac55488bc2fac333b0b777d38875b7516c430925 URL: https://github.com/kamailio/kamailio/commit/ac55488bc2fac333b0b777d38875b75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-22T19:01:02+02:00 tcpops: added tcp_close_connection([conid]) - close connection for current sip message or by conid --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ac55488bc2fac333b0b777d38875b75… Patch: https://github.com/kamailio/kamailio/commit/ac55488bc2fac333b0b777d38875b75… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 23036fd771..8590e4b6b6 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -39,6 +39,7 @@ #include "../../core/mod_fix.h" #include "../../core/events.h" #include "../../core/kemi.h" +#include "../../core/pass_fd.h" #include "tcpops.h" @@ -63,6 +64,8 @@ static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); static int w_tcp_set_otcpid(sip_msg_t* msg, char* conid, char *p2); static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2); +static int w_tcp_close_connection(sip_msg_t* msg, char* p1, char *p2); +static int w_tcp_close_connection_id(sip_msg_t* msg, char* pconid, char *p2); str tcpops_event_callback = STR_NULL; @@ -103,6 +106,10 @@ static cmd_export_t cmds[]={ fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, + {"tcp_close_connection", (cmd_function)w_tcp_close_connection, 0, + 0, 0, ANY_ROUTE}, + {"tcp_close_connection", (cmd_function)w_tcp_close_connection_id, 1, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -665,6 +672,65 @@ static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2) return ki_tcp_set_otcpid_flag(msg, vmode); } +/*! + * \brief Close a TCP connection + * + * Requests the TCP main process to close the specified TCP connection + * \param conid the internal connection ID + */ +static int ki_tcp_close_connection_id(sip_msg_t *msg, int conid) +{ + struct tcp_connection *con; + long mcmd[2]; + int n; + + if ((con = tcpconn_get(conid, 0, 0, 0, 0))) { + mcmd[0] = (long)con; + mcmd[1] = CONN_EOF; + + con->send_flags.f |= SND_F_CON_CLOSE; + con->flags |= F_CONN_FORCE_EOF; + + n = send_all(unix_tcp_sock, mcmd, sizeof(mcmd)); + if (unlikely(n <= 0)){ + LM_ERR("failed to send close request: %s (%d)\n", strerror(errno), errno); + return -2; + } + return 1; + } + return -1; +} + +/** + * + */ +static int ki_tcp_close_connection(sip_msg_t *msg) +{ + return ki_tcp_close_connection_id(msg, msg->rcv.proto_reserved1); +} + +/** + * + */ +static int w_tcp_close_connection_id(sip_msg_t* msg, char* pconid, char *p2) +{ + int conid = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)pconid, &conid)<0) { + LM_ERR("failed to get conid parameter\n"); + return -1; + } + return ki_tcp_close_connection_id(msg, conid); +} + +/** + * + */ +static int w_tcp_close_connection(sip_msg_t* msg, char* p1, char *p2) +{ + return ki_tcp_close_connection_id(msg, msg->rcv.proto_reserved1); +} + /** * */ @@ -799,6 +865,16 @@ static sr_kemi_t sr_kemi_tcpops_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tcpops"), str_init("tcp_close_connection"), + SR_KEMIP_INT, ki_tcp_close_connection, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tcpops"), str_init("tcp_close_connection_id"), + SR_KEMIP_INT, ki_tcp_close_connection_id, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:77896de7: secsipid: added kemi function to get $secsioid(val)
by Daniel-Constantin Mierla 22 Jun '21

22 Jun '21

Module: kamailio Branch: master Commit: 77896de79710063469a123efb5e1d2ab1dfd5e25 URL: https://github.com/kamailio/kamailio/commit/77896de79710063469a123efb5e1d2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-22T11:20:42+02:00 secsipid: added kemi function to get $secsioid(val) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/77896de79710063469a123efb5e1d2a… Patch: https://github.com/kamailio/kamailio/commit/77896de79710063469a123efb5e1d2a… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 6a42076c0b..27216e1cec 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -815,6 +815,23 @@ static int pv_parse_secsipid_name(pv_spec_p sp, str *in) } + +/** + * + */ +static sr_kemi_xval_t* ki_secsipid_get_val(sip_msg_t *msg) +{ + memset(&_sr_kemi_secsipid_xval, 0, sizeof(sr_kemi_xval_t)); + if(_secsipid_data.value.s==NULL || _secsipid_data.value.len<=0) { + sr_kemi_xval_null(&_sr_kemi_secsipid_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_secsipid_xval; + } + _sr_kemi_secsipid_xval.vtype = SR_KEMIP_STR; + _sr_kemi_secsipid_xval.v.s = _secsipid_data.value; + + return &_sr_kemi_secsipid_xval; +} + /** * */ @@ -845,6 +862,11 @@ static sr_kemi_t sr_kemi_secsipid_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR } }, + { str_init("secsipid"), str_init("secsipid_get_val"), + SR_KEMIP_XVAL, ki_secsipid_get_val, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("secsipid"), str_init("secsipid_get_url"), SR_KEMIP_XVAL, ki_secsipid_get_url, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:03248001: modules: readme files regenerated - websocket ... [skip ci]
by Kamailio Dev 21 Jun '21

21 Jun '21

Module: kamailio Branch: master Commit: 0324800109442bf5786dae6d8238a3bf4e0e51f4 URL: https://github.com/kamailio/kamailio/commit/0324800109442bf5786dae6d8238a3b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-21T09:46:15+02:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/0324800109442bf5786dae6d8238a3b… Patch: https://github.com/kamailio/kamailio/commit/0324800109442bf5786dae6d8238a3b… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 7ac759b205..cbe8fd98eb 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -162,6 +162,8 @@ Chapter 1. Admin Guide Example 1.1. event_route[xhttp:request] ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index a38599775f..781ac41392 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -220,6 +220,11 @@ event_route[xhttp:request] { The event route is executed when a new HTTP request is received. ... +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>");

1 0

git:master:a05b4d7c: websocket: docs - added tcp_accept_no_cl=yes to example
by Daniel-Constantin Mierla 21 Jun '21

21 Jun '21

Module: kamailio Branch: master Commit: a05b4d7c2e413032b1a63f3d017243446a0bc6ec URL: https://github.com/kamailio/kamailio/commit/a05b4d7c2e413032b1a63f3d0172434… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-21T09:43:55+02:00 websocket: docs - added tcp_accept_no_cl=yes to example --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a05b4d7c2e413032b1a63f3d0172434… Patch: https://github.com/kamailio/kamailio/commit/a05b4d7c2e413032b1a63f3d0172434… --- 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

1 0

git:master:195de260: xhttp: extended example for event_route[xhttp:request]
by Daniel-Constantin Mierla 21 Jun '21

21 Jun '21

Module: kamailio Branch: master Commit: 195de260f102f1a016ad7bd1021571c1dd8a983f URL: https://github.com/kamailio/kamailio/commit/195de260f102f1a016ad7bd1021571c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-21T09:42:28+02:00 xhttp: extended example for event_route[xhttp:request] --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/195de260f102f1a016ad7bd1021571c… Patch: https://github.com/kamailio/kamailio/commit/195de260f102f1a016ad7bd1021571c… --- 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>");

1 0

git:master:c825673b: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 21 Jun '21

21 Jun '21

Module: kamailio Branch: master Commit: c825673bad8b04dcbf0dc8c150e3048a791091e8 URL: https://github.com/kamailio/kamailio/commit/c825673bad8b04dcbf0dc8c150e3048… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-21T08:16:23+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/c825673bad8b04dcbf0dc8c150e3048… Patch: https://github.com/kamailio/kamailio/commit/c825673bad8b04dcbf0dc8c150e3048… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index aaae0747e1..87a33aebfd 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -45,6 +45,8 @@ Daniel-Constantin Mierla 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 5. Installation List of Examples @@ -61,7 +63,8 @@ Daniel-Constantin Mierla 1.10. secsipid_get_url usage 1.11. secsipid_add_identity usage 1.12. secsipid_build_identity usage - 1.13. Libsecsipid Usage + 1.13. secsipid_sign usage + 1.14. Libsecsipid Usage Chapter 1. Admin Guide @@ -94,6 +97,8 @@ Chapter 1. Admin Guide 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 5. Installation 1. Overview @@ -227,6 +232,8 @@ modparam("secsipid", "libopt", "CacheExpires=0") 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 4.1. secsipid_check_identity(keyPath) Check the validity of the Identity header using the keys stored in the @@ -376,6 +383,30 @@ request_route { } ... +4.7. secsipid_sign(sheaders, spaypload, keyPath) + + Build Identity value using the key specified by "keyPath" to sign the + JWT body. The sheaders and spayload have to be string representation of + JSON headers and payload to be signed. On success, the Indentity value + is stored in variable $secsipid(val). It also sets $secsipid(ret) to + the return value of the libsecsipid functions. + + The parameters can contain pseudo-variables. + + This function can be used from ANY_ROUTE. + + Example 1.13. secsipid_sign usage +... +request_route { + ... + if(secsipid_sign("_JSON_HEADERS_", "_JSON_PAYLOAD_", + "/secsipid/$rd/key.pem")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... + 5. Installation The module needs "secsipdi_proc.so" module that depends on @@ -390,7 +421,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.13. Libsecsipid Usage + Example 1.14. Libsecsipid Usage ... export GO111MODULE=off go get https://github.com/asipto/secsipidx

1 0

git:master:a5997c29: secsipid: docs for secsipid_sign()
by Daniel-Constantin Mierla 21 Jun '21

21 Jun '21

Module: kamailio Branch: master Commit: a5997c29468efabb5a7745bc5b1c99c0f9eb8999 URL: https://github.com/kamailio/kamailio/commit/a5997c29468efabb5a7745bc5b1c99c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-21T08:12:15+02:00 secsipid: docs for secsipid_sign() --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a5997c29468efabb5a7745bc5b1c99c… Patch: https://github.com/kamailio/kamailio/commit/a5997c29468efabb5a7745bc5b1c99c… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 28f3dce68a..cc9c6c9fdf 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -397,6 +397,39 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="secsipid.f.secsipid_sign"> + <title> + <function moreinfo="none">secsipid_sign(sheaders, spaypload, keyPath)</function> + </title> + <para> + Build Identity value using the key specified by "keyPath" to sign the JWT body. + The sheaders and spayload have to be string representation of JSON + headers and payload to be signed. On success, the Indentity value is + stored in variable $secsipid(val). It also sets $secsipid(ret) to + the return value of the libsecsipid functions. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_sign</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_sign("_JSON_HEADERS_", "_JSON_PAYLOAD_", + "/secsipid/$rd/key.pem")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... </programlisting> </example> </section>

1 0

git:master:35f45d41: secsipid: added secsipid_sign(headers, payload, keypath)
by Daniel-Constantin Mierla 20 Jun '21

20 Jun '21

Module: kamailio Branch: master Commit: 35f45d412c0e3b01eac34af74f2783d7bb1fdbf6 URL: https://github.com/kamailio/kamailio/commit/35f45d412c0e3b01eac34af74f2783d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-20T11:28:37+02:00 secsipid: added secsipid_sign(headers, payload, keypath) - store the result in $secsipid(val) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35f45d412c0e3b01eac34af74f2783d… Patch: https://github.com/kamailio/kamailio/commit/35f45d412c0e3b01eac34af74f2783d… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 83a1f236dc..6a42076c0b 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -58,6 +58,7 @@ static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); static int w_secsipid_build_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); +static int w_secsipid_sign(sip_msg_t *msg, char *phdrs, char *ppayload, char *pkeypath); static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *pout); static int secsipid_libopt_param(modparam_t type, void *val); @@ -89,6 +90,8 @@ static cmd_export_t cmds[]={ fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_build_identity", (cmd_function)w_secsipid_build_identity, 6, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"secsipid_sign", (cmd_function)w_secsipid_sign, 3, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_get_url", (cmd_function)w_secsipid_get_url, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -379,6 +382,7 @@ static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath) return ki_secsipid_check(msg, &sidentity, &keypath); } + /** * */ @@ -573,6 +577,75 @@ static int w_secsipid_build_identity(sip_msg_t *msg, char *porigtn, char *pdestt &attest, &origid, &x5u, &keypath, 1); } +/** + * + */ +static int ki_secsipid_sign(sip_msg_t *msg, str *sheaders, str *spayload, + str *keypath) +{ + str ibody = STR_NULL; + + if(secsipid_libopt_list_used==0) { + str_list_t *sit; + for(sit=secsipid_libopt_list; sit!=NULL; sit=sit->next) { + _secsipid_papi.SecSIPIDOptSetV(sit->s.s); + } + secsipid_libopt_list_used = 1; + } + + ibody.len = _secsipid_papi.SecSIPIDSignJSONHP(sheaders->s, spayload->s, + keypath->s, &ibody.s); + + _secsipid_data.ret = ibody.len; + + if(ibody.len<=0) { + LM_ERR("failed to get identity value (%d)\n", ibody.len); + goto error; + } + + LM_DBG("identity value: %.*s\n", ibody.len, ibody.s); + + if(_secsipid_data.value.s) { + free(_secsipid_data.value.s); + } + _secsipid_data.value = ibody; + + return 1; + +error: + if(ibody.s) { + free(ibody.s); + } + return -1; +} + +/** + * + */ +static int w_secsipid_sign(sip_msg_t *msg, char *phdrs, char *ppayload, char *pkeypath) +{ + str shdrs = STR_NULL; + str spayload = STR_NULL; + str keypath = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)phdrs, &shdrs)<0) { + LM_ERR("failed to get JSON headers parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)ppayload, &spayload)<0) { + LM_ERR("failed to get JSON payload parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)pkeypath, &keypath)<0) { + LM_ERR("failed to get keypath parameter\n"); + return -1; + } + + return ki_secsipid_sign(msg, &shdrs, &spayload, &keypath); +} + /** * */

1 0

git:5.5:01d43e2d: pkg/kamailio/obs: disabled lwsc build on CentOS 6 dist
by Sergey Safarov 20 Jun '21

20 Jun '21

Module: kamailio Branch: 5.5 Commit: 01d43e2d6f78fff7fca8d6fc00adfab7f62a5320 URL: https://github.com/kamailio/kamailio/commit/01d43e2d6f78fff7fca8d6fc00adfab… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:21:12+03:00 pkg/kamailio/obs: disabled lwsc build on CentOS 6 dist (cherry picked from commit 03c2ea28767106333ee04c5e19ee490c010dfb58) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/01d43e2d6f78fff7fca8d6fc00adfab… Patch: https://github.com/kamailio/kamailio/commit/01d43e2d6f78fff7fca8d6fc00adfab… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index cb70c1af90..28dc1c9720 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -46,6 +47,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_with lwsc %bcond_without kazoo %bcond_without memcached %bcond_with mongodb @@ -79,6 +81,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -122,6 +125,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -148,6 +152,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_with kazoo %bcond_without memcached %bcond_with mongodb @@ -611,6 +616,7 @@ Lua extensions for Kamailio. %endif +%if %{with lwsc} %package lwsc Summary: Websocket client implementation to interact with external systems, similar to http client Group: %{PKGGROUP} @@ -619,6 +625,7 @@ BuildRequires: libwebsockets-devel %description lwsc Websocket client implementation to interact with external systems, similar to http client. +%endif %if %{with memcached} @@ -1138,7 +1145,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with lua} klua \ %endif +%if %{with lwsc} klwsc \ +%endif %if %{with memcached} kmemcached \ %endif @@ -1231,7 +1240,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with lua} klua \ %endif +%if %{with lwsc} klwsc \ +%endif %if %{with memcached} kmemcached \ %endif @@ -1894,10 +1905,12 @@ fi %endif +%if %{with lwsc} %files lwsc %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.lwsc %{_libdir}/kamailio/modules/lwsc.so +%endif %if %{with memcached} %files memcached

1 0

git:5.5:efe83bb8: pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1 [skip ci]
by Sergey Safarov 20 Jun '21

20 Jun '21

Module: kamailio Branch: 5.5 Commit: efe83bb89e9582b5c58a85626cc45d87dc124205 URL: https://github.com/kamailio/kamailio/commit/efe83bb89e9582b5c58a85626cc45d8… Author: SPChan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:21:43+03:00 pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1 [skip ci] (cherry picked from commit ecc2cc69b08e797ca954af233c229ed44475ce33) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/efe83bb89e9582b5c58a85626cc45d8… Patch: https://github.com/kamailio/kamailio/commit/efe83bb89e9582b5c58a85626cc45d8… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 28dc1c9720..3ca6df74fc 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -172,6 +172,11 @@ %define _rundir %{_localstatedir}/run %endif +# build with openssl 1.1.1 on RHEL 7 based dists +%if 0%{?rhel} == 7 +%bcond_with openssl11 +%endif + # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370 %if 0%{?suse_version} == 1315 %define _sharedstatedir /var/lib @@ -279,8 +284,13 @@ Account transaction information in a JSON dictionary. %package auth-ephemeral Summary: Functions for authentication using ephemeral credentials Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description auth-ephemeral Functions for authentication using ephemeral credentials. @@ -365,9 +375,14 @@ Requires: openssl BuildRequires: openssl-devel %endif %if 0%{?rhel} == 7 +%if %{with openssl11} +Requires: openssl11-libs +BuildRequires: openssl11-devel +%else Requires: openssl-libs BuildRequires: openssl-devel %endif +%endif %if 0%{?fedora} Requires: openssl-libs BuildRequires: openssl-devel @@ -673,8 +688,13 @@ MySQL database connectivity for Kamailio. %package outbound Summary: Outbound (RFC 5626) support for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description outbound RFC 5626, "Managing Client-Initiated Connections in the Session Initiation @@ -952,8 +972,13 @@ SQLite database connectivity for Kamailio. %package tls Summary: TLS transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description tls TLS transport for Kamailio. @@ -1008,8 +1033,13 @@ Non-SIP utitility functions for Kamailio. %package websocket Summary: WebSocket transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: libunistring, openssl11, kamailio = %ver +BuildRequires: libunistring-devel, openssl11-devel +%else Requires: libunistring, openssl, kamailio = %ver BuildRequires: libunistring-devel, openssl-devel +%endif %description websocket WebSocket transport for Kamailio. @@ -1106,6 +1136,9 @@ make cfg prefix=/usr \ make make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ jabber ndb_cassandra osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif @@ -1201,6 +1234,9 @@ rm -rf %{buildroot} make install make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ iptrtpproxy jabber osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif

1 0

git:5.5:0f0e7e8f: pkg: add support for AlmaLinux and Rocky Linux
by Sergey Safarov 20 Jun '21

20 Jun '21

Module: kamailio Branch: 5.5 Commit: 0f0e7e8f139042e2dd03e01a6ac66d32727dc69a URL: https://github.com/kamailio/kamailio/commit/0f0e7e8f139042e2dd03e01a6ac66d3… Author: SPChan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:20:34+03:00 pkg: add support for AlmaLinux and Rocky Linux (cherry picked from commit b3d3cb366b67941ecebd297038522580114e3a0b) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0f0e7e8f139042e2dd03e01a6ac66d3… Patch: https://github.com/kamailio/kamailio/commit/0f0e7e8f139042e2dd03e01a6ac66d3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index e095ac9b5e..ce12e50579 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -81,10 +81,23 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 8 +%if 0%{?centos_ver} == 8 || 0%{?almalinux_ver} == 8 || 0%{?rocky_ver} == 8 +%define rhel_rebuild 8 +% if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el8.centos +%endif +% if 0%{?almalinux_ver} +%define dist_name centos +%define dist_version %{?almalinux} +%define dist .el8.almalinux +%endif +% if 0%{?rocky_ver} +%define dist_name centos +%define dist_version %{?rocky} +%define dist .el8.rocky +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -186,7 +199,7 @@ %bcond_without xmlrpc %endif -%if 0%{?rhel} == 8 && 0%{?centos_ver} != 8 +%if 0%{?rhel} == 8 && 0%{?rhel_rebuild} != 8 %define dist_name rhel %define dist_version %{?rhel} %bcond_without cnxcc

1 0

git:5.5:0e8bb2fc: pkg/kamailio/obs: simlifid module definition for RHEL dist
by Sergey Safarov 20 Jun '21

20 Jun '21

Module: kamailio Branch: 5.5 Commit: 0e8bb2fc46b74b5171edeb64776d280c35739ce9 URL: https://github.com/kamailio/kamailio/commit/0e8bb2fc46b74b5171edeb64776d280… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:21:01+03:00 pkg/kamailio/obs: simlifid module definition for RHEL dist (cherry picked from commit e7a14f37c98e2bbfcf234165dc5dfd4121db5b5b) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0e8bb2fc46b74b5171edeb64776d280… Patch: https://github.com/kamailio/kamailio/commit/0e8bb2fc46b74b5171edeb64776d280… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ce12e50579..cb70c1af90 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -28,9 +28,15 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 6 +%if 0%{?rhel} == 6 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_with cnxcc %bcond_without dnssec %bcond_without evapi @@ -54,10 +60,16 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 7 +%if 0%{?rhel} == 7 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el7.centos +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -81,23 +93,26 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 8 || 0%{?almalinux_ver} == 8 || 0%{?rocky_ver} == 8 -%define rhel_rebuild 8 -% if 0%{?centos_ver} +%if 0%{?rhel} == 8 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el8.centos %endif -% if 0%{?almalinux_ver} +%if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} %define dist .el8.almalinux %endif -% if 0%{?rocky_ver} +%if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} %define dist .el8.rocky %endif +%if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -147,84 +162,6 @@ %bcond_without xmlrpc %endif -%if 0%{?rhel} == 6 && 0%{?centos_ver} != 6 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_with cnxcc -%bcond_without dnssec -%bcond_without evapi -%bcond_with geoip -%bcond_with http_async_client -%bcond_with ims -%bcond_with jansson -%bcond_with json -%bcond_with lua -%bcond_with kazoo -%bcond_with memcached -%bcond_with mongodb -%bcond_with perl -%bcond_with phonenum -%bcond_with python3 -%bcond_with rabbitmq -%bcond_with redis -%bcond_with ruby -%bcond_with sctp -%bcond_with websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 7 && 0%{?centos_ver} != 7 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 8 && 0%{?rhel_rebuild} != 8 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - # Defining missing macros on RHEL/CentOS 6 %if 0%{?rhel} == 6 %define _rundir %{_localstatedir}/run

1 0

Interconnecting SIP servers without the PSTN
by Bill Neely 20 Jun '21

20 Jun '21

greetings all: I have long believed that VOIP and SIP will not reach their full potential until SIP servers can route calls to other SIP servers without having to go through the ancient telephone system, and pay their tolls. There is nothing of substance preventing any SIP server from calling numbers at any other SIP server. They just need to know which numbers are hosted on which servers. There have been several attempts to resolve this issue: freenum.org, e164,org, Dundi (for asterisk). All appear to be dead at this time. I think that one of the reasons for these failures was that all of these systems relied on the public DNS system to exchange server location info. Putting your SIP server address on a public system and advertising that this is the IP of a SIP server is simply begging for hackers to attempt to breach your SIP server. Its like painting a big target on your back. We at Xantek have been working on an alternate approach, using AGI calls and responses to identify routing info. This approach allows us to limit server identification to registered users of the system, and registered users will have to provide identification (something that hackers probably won't do). We also are incorporating a PIN number into the dial string, so that recipients are aware that the call is coming from a valid user. The PIN can be easily changed if fraudulent activity is suspected. We have a working model for Asterisk set up (see voipconnect.tel for details), but we would like to expand into the Kamailio-verse. What we need is a few Kamailio experts to help with the development of the system on Kamailio. If you have any interest in helping, please reply to this post. TIA, Bill

3 2

Re: [sr-dev] [kamailio/kamailio] secsipid: docs for secsipid_check(...) function (6822bde)
by David Villasmil 18 Jun '21

18 Jun '21

Nice! -- 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/commit/6822bde4dc4715043d3d416b710664e…

1 0

git:master:ecc2cc69: pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1
by sergey-safarov 18 Jun '21

18 Jun '21

Module: kamailio Branch: master Commit: ecc2cc69b08e797ca954af233c229ed44475ce33 URL: https://github.com/kamailio/kamailio/commit/ecc2cc69b08e797ca954af233c229ed… Author: SPChan <shihping.chan(a)gmail.com> Committer: sergey-safarov <s.safarov(a)gmail.com> Date: 2021-06-18T15:56:41+03:00 pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ecc2cc69b08e797ca954af233c229ed… Patch: https://github.com/kamailio/kamailio/commit/ecc2cc69b08e797ca954af233c229ed… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8e9483bada..b68df0eef5 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -172,6 +172,11 @@ %define _rundir %{_localstatedir}/run %endif +# build with openssl 1.1.1 on RHEL 7 based dists +%if 0%{?rhel} == 7 +%bcond_with openssl11 +%endif + # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370 %if 0%{?suse_version} == 1315 %define _sharedstatedir /var/lib @@ -279,8 +284,13 @@ Account transaction information in a JSON dictionary. %package auth-ephemeral Summary: Functions for authentication using ephemeral credentials Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description auth-ephemeral Functions for authentication using ephemeral credentials. @@ -365,9 +375,14 @@ Requires: openssl BuildRequires: openssl-devel %endif %if 0%{?rhel} == 7 +%if %{with openssl11} +Requires: openssl11-libs +BuildRequires: openssl11-devel +%else Requires: openssl-libs BuildRequires: openssl-devel %endif +%endif %if 0%{?fedora} Requires: openssl-libs BuildRequires: openssl-devel @@ -673,8 +688,13 @@ MySQL database connectivity for Kamailio. %package outbound Summary: Outbound (RFC 5626) support for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description outbound RFC 5626, "Managing Client-Initiated Connections in the Session Initiation @@ -952,8 +972,13 @@ SQLite database connectivity for Kamailio. %package tls Summary: TLS transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description tls TLS transport for Kamailio. @@ -1008,8 +1033,13 @@ Non-SIP utitility functions for Kamailio. %package websocket Summary: WebSocket transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: libunistring, openssl11, kamailio = %ver +BuildRequires: libunistring-devel, openssl11-devel +%else Requires: libunistring, openssl, kamailio = %ver BuildRequires: libunistring-devel, openssl-devel +%endif %description websocket WebSocket transport for Kamailio. @@ -1106,6 +1136,9 @@ make cfg prefix=/usr \ make make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ jabber ndb_cassandra osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif @@ -1201,6 +1234,9 @@ rm -rf %{buildroot} make install make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ iptrtpproxy jabber osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif

1 0

git:master:e4527941: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 18 Jun '21

18 Jun '21

Module: kamailio Branch: master Commit: e4527941b9d16b476a60b19bd15307cdac4b530b URL: https://github.com/kamailio/kamailio/commit/e4527941b9d16b476a60b19bd15307c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-18T14:16:22+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/e4527941b9d16b476a60b19bd15307c… Patch: https://github.com/kamailio/kamailio/commit/e4527941b9d16b476a60b19bd15307c…

1 0

git:master:961ac613: secsipid: added secsipid_check(sidentity, keypath)
by Daniel-Constantin Mierla 18 Jun '21

18 Jun '21

Module: kamailio Branch: master Commit: 961ac61392fb3f916287e16380cd64b5ef499360 URL: https://github.com/kamailio/kamailio/commit/961ac61392fb3f916287e16380cd64b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-18T14:02:07+02:00 secsipid: added secsipid_check(sidentity, keypath) - check the identity value provided in the first parameter --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/961ac61392fb3f916287e16380cd64b… Patch: https://github.com/kamailio/kamailio/commit/961ac61392fb3f916287e16380cd64b… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 1f8bc7e72c..83a1f236dc 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -52,6 +52,7 @@ static int child_init(int); static void mod_destroy(void); static int w_secsipid_check_identity(sip_msg_t *msg, char *pkeypath, char *str2); +static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath); static int w_secsipid_check_identity_pubkey(sip_msg_t *msg, char *pkeyval, char *str2); static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); @@ -82,6 +83,8 @@ static cmd_export_t cmds[]={ fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"secsipid_check_identity_pubkey", (cmd_function)w_secsipid_check_identity_pubkey, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"secsipid_check", (cmd_function)w_secsipid_check, 2, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"secsipid_add_identity", (cmd_function)w_secsipid_add_identity, 6, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_build_identity", (cmd_function)w_secsipid_build_identity, 6, @@ -325,6 +328,56 @@ static int w_secsipid_check_identity_pubkey(sip_msg_t *msg, char *pkeyval, char return ki_secsipid_check_identity_pubkey(msg, &keyval); } +/** + * + */ +static int ki_secsipid_check(sip_msg_t *msg, str *sidentity, str *keypath) +{ + int ret = 1; + + if(secsipid_cache_dir.len > 0) { + _secsipid_papi.SecSIPIDSetFileCacheOptions(secsipid_cache_dir.s, + secsipid_cache_expire); + } + if(secsipid_libopt_list_used==0) { + str_list_t *sit; + for(sit=secsipid_libopt_list; sit!=NULL; sit=sit->next) { + _secsipid_papi.SecSIPIDOptSetV(sit->s.s); + } + secsipid_libopt_list_used = 1; + } + ret = _secsipid_papi.SecSIPIDCheckFull(sidentity->s, sidentity->len, + secsipid_expire, keypath->s, secsipid_timeout); + + if(ret==0) { + LM_DBG("identity check: ok\n"); + return 1; + } + + LM_DBG("identity check: failed\n"); + return ret; +} + +/** + * + */ +static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath) +{ + str sidentity = STR_NULL; + str keypath = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)pidentity, &sidentity)<0) { + LM_ERR("failed to get identity value parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)pkeypath, &keypath)<0) { + LM_ERR("failed to get keypath parameter\n"); + return -1; + } + + return ki_secsipid_check(msg, &sidentity, &keypath); +} /** * @@ -704,6 +757,11 @@ static sr_kemi_t sr_kemi_secsipid_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("secsipid"), str_init("secsipid_check"), + SR_KEMIP_INT, ki_secsipid_check, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("secsipid"), str_init("secsipid_add_identity"), SR_KEMIP_INT, ki_secsipid_add_identity, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

1 0

git:master:6822bde4: secsipid: docs for secsipid_check(...) function
by Daniel-Constantin Mierla 18 Jun '21

18 Jun '21

Module: kamailio Branch: master Commit: 6822bde4dc4715043d3d416b710664e5b14637b8 URL: https://github.com/kamailio/kamailio/commit/6822bde4dc4715043d3d416b710664e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-18T14:06:42+02:00 secsipid: docs for secsipid_check(...) function --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6822bde4dc4715043d3d416b710664e… Patch: https://github.com/kamailio/kamailio/commit/6822bde4dc4715043d3d416b710664e… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index bc1a8ac332..28f3dce68a 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -266,6 +266,45 @@ request_route { </programlisting> </example> </section> + <section id="secsipid.f.secsipid_check"> + <title> + <function moreinfo="none">secsipid_check(sIdentity, keyPath)</function> + </title> + <para> + Check the validity of the "sIdentity" parameter using the keys stored + in the file specified by "keyPath". If the keyPath parameter is empty, + the function is downloading the key using the URL from "info" + parameter of the sIdentity, using the value of "timeout" + parameter to limit the download time. The validity of the JWT + in the sIdentity value is also checked against the "expire" + parameter. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_check</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_check_identity("...", "/secsipid/$si/cert.pem")) { ... } + ... + if(secsipid_check_identity("...", "")) { ... } + ... +} +... +</programlisting> + </example> + <para> + Further checks can be done with config operations, decoding the JWT header + and payload using {s.select} and {s.decode.base64t} transformations + together with jansson module. + </para> + </section> <section id="secsipid.f.secsipid_get_url"> <title> <function moreinfo="none">secsipid_get_url(url, ovar)</function>

1 0

[kamailio/kamailio] TLS: same TLSc is used for different outbound connection when it is switched with tls_set_connect_server_id() (#2760)
by arkadiam 18 Jun '21

18 Jun '21

### Description Thank you for implementing #2413, I'm looking forward to use it. I was trying it on a dev system. It works fine when the same TLS client needs to be selected for ALL connections. Having issue with it when connection expected to alternate between multiple configured TLS clients. When configured as bellow and event_route alternates between connections (like in logs bellow) connection is always using TLSc with one of the server-ids, e.g. "domain-02". It looks like it's a race between setting server id in event_route and a "thread" that starts TLS client. In my observations only one TLS client is used. Expecting: each outbound connection use TLSc as it was set by tls_set_connect_server_id(). ``` event_route[tm:local-request] { if (is_method("OPTIONS")) { $var(contact) = "Contact: <sip:" + $fd + ":5061;transport=tls>\r\n"; append_hf("$var(contact)"); if ($fd == "domain-01") { tls_set_connect_server_id("domain-01"); xlog("L_INFO", "ID=$ci|tls_set_connect_server_id(domain-01)\n"); } else if ($fd == "domain-02") { tls_set_connect_server_id("domain-02"); xlog("L_INFO", "ID=$ci|tls_set_connect_server_id(domain-02)\n"); } } } ``` Dispatcher configured as: ``` loadmodule "dispatcher.so" modparam("dispatcher", "list_file", "/etc/kamailio/dispatcher.list") modparam("dispatcher", "ds_probing_mode", 1) modparam("dispatcher", "ds_ping_interval", 60) ``` With records like: ``` 1 sip:sip1.host.com;transport=tls 0 1 socket=tls:111.222.233.11:5061;ping_from=sip:my-domain-01.com 1 sip:sip2.host.com;transport=tls 0 2 socket=tls:111.222.233.12:5061;ping_from=sip:my-domain-01.com 1 sip:sip3.host.com;transport=tls 0 3 socket=tls:111.222.233.13:5061;ping_from=sip:my-domain-01.com 2 sip:sip1.host.com;transport=tls 0 1 socket=tls:111.222.233.21:5061;ping_from=sip:my-domain-02.com 2 sip:sip2.host.com;transport=tls 0 2 socket=tls:111.222.233.22:5061;ping_from=sip:my-domain-02.com 2 sip:sip3.host.com;transport=tls 0 3 socket=tls:111.222.233.23:5061;ping_from=sip:my-domain-02.com ``` #### Log Messages ``` Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb1-948(a)1.2.3.4|tls_set_connect_server_id(domain-02) Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb2-948(a)1.2.3.4|tls_set_connect_server_id(domain-01) Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb3-948(a)1.2.3.4|tls_set_connect_server_id(domain-02) Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb4-948(a)1.2.3.4|tls_set_connect_server_id(domain-01) Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb5-948(a)1.2.3.4|tls_set_connect_server_id(domain-02) Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb6-948(a)1.2.3.4|tls_set_connect_server_id(domain-01) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.0 (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 7.5.0 ``` * **Operating System**: ``` Linux dev03 4.15.0-143-generic #147-Ubuntu SMP Wed Apr 14 16:10:11 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux Ubuntu 18.04.5 LTS ``` -- 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/2760

3 11

git:master:e87fd9ce: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: e87fd9ce381c73d3733c38812c86e467cf966089 URL: https://github.com/kamailio/kamailio/commit/e87fd9ce381c73d3733c38812c86e46… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-17T16:46:24+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/e87fd9ce381c73d3733c38812c86e46… Patch: https://github.com/kamailio/kamailio/commit/e87fd9ce381c73d3733c38812c86e46… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 004d376fb4..5e07580ddf 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -41,6 +41,9 @@ Daniel-Constantin Mierla 4.4. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.5. secsipid_build_identity(origTN, destTN, attest, origID, + x5u, keyPath) + 5. Installation List of Examples @@ -55,7 +58,8 @@ Daniel-Constantin Mierla 1.8. secsipid_check_identity_pubkey usage 1.9. secsipid_get_url usage 1.10. secsipid_add_identity usage - 1.11. Libsecsipid Usage + 1.11. secsipid_build_identity usage + 1.12. Libsecsipid Usage Chapter 1. Admin Guide @@ -84,6 +88,9 @@ Chapter 1. Admin Guide 4.4. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.5. secsipid_build_identity(origTN, destTN, attest, origID, x5u, + keyPath) + 5. Installation 1. Overview @@ -213,6 +220,9 @@ modparam("secsipid", "libopt", "CacheExpires=0") 4.4. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.5. secsipid_build_identity(origTN, destTN, attest, origID, x5u, + keyPath) + 4.1. secsipid_check_identity(keyPath) Check the validity of the Identity header using the keys stored in the @@ -305,6 +315,35 @@ request_route { } ... +4.5. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + + Build Identity value using the key specified by "keyPath" to sign the + JWT body. If origID is empty, a UUID string is generated to fill the + field. The origTN represents the origination telephone number; destTN + represents the destination telephone number; x5u is the HTTP URL + referencing to the public key that should be used to verify the + signature; attest represents the attestation level (should be "A", "B" + or "C"). On success, the Indentity value is stored in variable + $secsipid(val). It also sets $secsipid(ret) to the return value of the + libsecsipid functions. + + The parameters can contain pseudo-variables. + + This function can be used from ANY_ROUTE. + + Example 1.11. secsipid_build_identity usage +... +request_route { + ... + if(secsipid_build_identity("$fU", "$rU", "A", "", + "https://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")) +{ + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... + 5. Installation The module needs "secsipdi_proc.so" module that depends on @@ -319,7 +358,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.11. Libsecsipid Usage + Example 1.12. Libsecsipid Usage ... export GO111MODULE=off go get https://github.com/asipto/secsipidx

1 0

git:master:e6f4e929: dispatcher: print eol in some log messages
by Daniel-Constantin Mierla 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: e6f4e929efb61a1a51aa1b4b5587999acc8dc55d URL: https://github.com/kamailio/kamailio/commit/e6f4e929efb61a1a51aa1b4b5587999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-17T16:40:39+02:00 dispatcher: print eol in some log messages --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/e6f4e929efb61a1a51aa1b4b5587999… Patch: https://github.com/kamailio/kamailio/commit/e6f4e929efb61a1a51aa1b4b5587999… --- 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) {

1 0

git:master:6ebcd34b: secsipid: add function to build identity value and store in pv
by Daniel-Constantin Mierla 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: 6ebcd34b74452642c44b296525766791bb33a7b0 URL: https://github.com/kamailio/kamailio/commit/6ebcd34b74452642c44b29652576679… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-17T15:40:16+02:00 secsipid: add function to build identity value and store in pv - new function secsipid_build_identity(...) - if successful, identity value is available in $secsipid(val) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6ebcd34b74452642c44b29652576679… Patch: https://github.com/kamailio/kamailio/commit/6ebcd34b74452642c44b29652576679…

1 0

git:master:cf828521: secsipid: docs for secsipid_build_identity(...) function
by Daniel-Constantin Mierla 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: cf82852199f1fee7ee01e4a25d5e79a2ab1bbf8d URL: https://github.com/kamailio/kamailio/commit/cf82852199f1fee7ee01e4a25d5e79a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-17T16:35:55+02:00 secsipid: docs for secsipid_build_identity(...) function --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf82852199f1fee7ee01e4a25d5e79a… Patch: https://github.com/kamailio/kamailio/commit/cf82852199f1fee7ee01e4a25d5e79a… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 527db1aecf..bc1a8ac332 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -322,6 +322,42 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="secsipid.f.secsipid_build_identity"> + <title> + <function moreinfo="none">secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath)</function> + </title> + <para> + Build Identity value using the key specified by "keyPath" to sign the JWT body. + If origID is empty, a UUID string is generated to fill the field. The origTN + represents the origination telephone number; destTN represents the destination + telephone number; x5u is the HTTP URL referencing to the public key that + should be used to verify the signature; attest represents the attestation + level (should be "A", "B" or "C"). On success, the Indentity value is + stored in variable $secsipid(val). It also sets $secsipid(ret) to + the return value of the libsecsipid functions. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_build_identity</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_build_identity("$fU", "$rU", "A", "", + "https://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... </programlisting> </example> </section>

1 0

git:master:abbe5187: pua_json: exported KSR.pua_json.publish() to kemi
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: abbe518724d645b6f977ca526011285bc03c581c URL: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:29:33+02:00 pua_json: exported KSR.pua_json.publish() to kemi - corresponding to config pua_json_publish() - use fixup_spve_null() and fixup_free_spve_null() for pua_json_publish() config export --- Modified: src/modules/pua_json/pua_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… Patch: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… --- diff --git a/src/modules/pua_json/pua_json_mod.c b/src/modules/pua_json/pua_json_mod.c index 2c7e7f5513..2b51e5020e 100644 --- a/src/modules/pua_json/pua_json_mod.c +++ b/src/modules/pua_json/pua_json_mod.c @@ -27,31 +27,41 @@ #include "../json/api.h" #include "../presence/bind_presence.h" +#include "../../core/mod_fix.h" +#include "../../core/kemi.h" + #include "pua_json_mod.h" MODULE_VERSION +static int w_pua_json_publish(sip_msg_t *msg, char *p1pjson, char *p2); + +/* clang-format off */ static param_export_t params[] = { - {"pua_include_entity", INT_PARAM, &pua_include_entity}, - {0, 0, 0}}; + {"pua_include_entity", PARAM_INT, &pua_include_entity}, + {0, 0, 0} +}; static cmd_export_t cmds[] = { - {"pua_json_publish", (cmd_function)pua_json_publish, 1, 0, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"pua_json_publish", (cmd_function)w_pua_json_publish, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + + {0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "pua_json", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "pua_json", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ static int mod_init(void) { @@ -66,3 +76,50 @@ static int mod_init(void) return 0; } + +/** + * + */ +static int ki_pua_json_publish(sip_msg_t* msg, str* pjson) +{ + return pua_json_publish(msg, pjson->s); +} + +/** + * + */ +static int w_pua_json_publish(sip_msg_t *msg, char *p1pjson, char *p2) +{ + str pjson = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)p1pjson, &pjson)<0) { + LM_ERR("failed to get p1 value\n"); + return -1; + } + + return pua_json_publish(msg, pjson.s); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_pua_json_exports[] = { + { str_init("pua_json"), str_init("publish"), + SR_KEMIP_INT, ki_pua_json_publish, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_pua_json_exports); + return 0; +}

1 0

git:master:f34f9456: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: f34f9456c68d25bcdd49d670d95f16649e14e8d5 URL: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-16T12:16:28+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… Patch: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 453179d5a1..411d7428cf 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -102,6 +102,7 @@ Gabriel Vasile 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 5. Exported pseudo-variables @@ -160,6 +161,7 @@ Gabriel Vasile 1.45. contact_param_decode usage 1.46. contact_param_decode_ruri usage 1.47. contact_param_rm usage + 1.48. hdr_date_check usage Chapter 1. Admin Guide @@ -223,6 +225,7 @@ Chapter 1. Admin Guide 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 5. Exported pseudo-variables @@ -444,6 +447,7 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 4.1. ring_insert_callid() @@ -1112,6 +1116,25 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { } ... +4.39. hdr_date_check(tdiff) + + Returns true if sip message has Date header and its value is lower than + 'NOW() - tdiff'. + + Meaning of the parameters is as follows: + * tdiff - time difference in seconds, it can be a variable or static + integer value. + + This function can be used from ANY_ROUTE. + + Example 1.48. hdr_date_check usage +... +if (!hdr_date_check("10")) { + sl_send_reply("403", "Outdated date"); + exit; +} +... + 5. Exported pseudo-variables 5.1. $pcv(all)

1 0

git:master:6a2a1dfb: siputils: docs for hdr_date_check()
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: 6a2a1dfb8a6718f7ecb7cc2f28cf471bdcf0fec3 URL: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:09:36+02:00 siputils: docs for hdr_date_check() --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… Patch: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 8e7140385d..b1dffa1c3e 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1354,6 +1354,37 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { contact_param_rm("myparam"); } ... +</programlisting> + </example> + </section> + <section id="siputils.f.hdr_date_check"> + <title> + <function moreinfo="none">hdr_date_check(tdiff)</function> + </title> + <para> + Returns true if sip message has Date header and its value is lower + than 'NOW() - tdiff'. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>tdiff</emphasis> - time difference in seconds, + it can be a variable or static integer value. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hdr_date_check</function> usage</title> + <programlisting format="linespecific"> +... +if (!hdr_date_check("10")) { + sl_send_reply("403", "Outdated date"); + exit; +} +... </programlisting> </example> </section>

1 0

git:master:466e5f46: siputils: added hdr_date_check(tdiff)
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: 466e5f469f5b6b9f5d1b30139c2b854e62f4f50b URL: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:03:38+02:00 siputils: added hdr_date_check(tdiff) - returns true if sip message has Date header and its value is lower than NOW() - tdiff --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… Patch: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 57ae9fb262..3dc7188fa8 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -66,6 +66,7 @@ #include "../../core/kemi.h" #include "../../core/parser/parse_option_tags.h" #include "../../core/parser/parse_uri.h" +#include "../../core/parser/parse_date.h" #include "ring.h" #include "options.h" @@ -113,6 +114,8 @@ static int w_contact_param_decode(sip_msg_t *msg, char *pnparam, char *p2); static int w_contact_param_decode_ruri(sip_msg_t *msg, char *pnparam, char *p2); static int w_contact_param_rm(sip_msg_t *msg, char *pnparam, char *p2); +static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2); + /* Fixup functions to be defined later */ static int fixup_set_uri(void** param, int param_no); static int fixup_free_set_uri(void** param, int param_no); @@ -205,6 +208,8 @@ static cmd_export_t cmds[]={ fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"contact_param_rm", (cmd_function)w_contact_param_rm, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + {"hdr_date_check", (cmd_function)w_hdr_date_check, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, {"bind_siputils", (cmd_function)bind_siputils, 1, 0, 0, 0}, @@ -548,6 +553,66 @@ static int ki_is_uri(sip_msg_t* msg, str* suri) return 1; } +/* + * Check date header value with time difference + */ +static int ki_hdr_date_check(sip_msg_t* msg, int tdiff) +{ + time_t tnow, tmsg; + + if ((!msg->date) && (parse_headers(msg, HDR_DATE_F, 0) == -1)) { + LM_ERR("failed parsing Date header\n"); + return -1; + } + if (!msg->date) { + LM_ERR("Date header field is not found\n"); + return -1; + } + if ((!(msg->date)->parsed) && (parse_date_header(msg) < 0)) { + LM_ERR("failed parsing DATE body\n"); + return -1; + } + +#ifdef HAVE_TIMEGM + tmsg=timegm(&get_date(msg)->date); +#else + tmsg=_timegm(&get_date(msg)->date); +#endif + if (tmsg < 0) { + LM_ERR("timegm error\n"); + return -2; + } + + if ((tnow=time(0)) < 0) { + LM_ERR("time error %s\n", strerror(errno)); + return -3; + } + + if (tnow > tmsg + tdiff) { + LM_ERR("autdated date header value (%ld sec)\n", tnow - tmsg + tdiff); + return -4; + } else { + LM_ERR("Date header value OK\n"); + } + + return 1; + +} + +/** + * + */ +static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2) +{ + int tdiff = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)ptdiff, &tdiff)<0) { + LM_ERR("failed to get time diff parameter\n"); + return -1; + } + return ki_hdr_date_check(msg, tdiff); +} + /** * */ @@ -668,6 +733,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("hdr_date_check"), + SR_KEMIP_INT, ki_hdr_date_check, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

Kamailio v5.5.1 Released
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Hello, Kamailio SIP Server v5.5.1 stable release is out. This is a maintenance release of the latest stable branch, 5.5, that includes fixes since the release of v5.5.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.1. For more details about version 5.5.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/06/kamailio-v5-5-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 3

[kamailio/kamailio] Typo in htable.seti example (#2782)
by arkadiam 16 Jun '21

16 Jun '21

https://github.com/kamailio/kamailio/blob/30467037a7d97def6fbb40cad14e6f101… It should be `htable.seti` to set as an integer -- 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/2782

3 2

git:master:f22a09da: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: f22a09dacf85e6489005a634eb6d907c4b8ef782 URL: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-15T19:16:14+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… Patch: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 85f19c7102..25d6769065 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -1065,7 +1065,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 ... 6.5. htable.dump htable

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev