sr-dev

sr-dev@lists.kamailio.org

20 participants
45161 discussions

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

16 Jun '22

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

1 0

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

16 Jun '22

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

1 0

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

16 Jun '22

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

1 0

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

16 Jun '22

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

1 0

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

16 Jun '22

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

1 0

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

16 Jun '22

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

1 0

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

16 Jun '22

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

1 0

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

16 Jun '22

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

1 0

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

16 Jun '22

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

1 0

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

16 Jun '22

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

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev