sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
280 discussions

git:master:a1398511: tls_wolfssl: Miscellaneous cleanup

by S-P Chan

Module: kamailio Branch: master Commit: a1398511036983471f4fd1d1e33099dee8a565bf URL: https://github.com/kamailio/kamailio/commit/a1398511036983471f4fd1d1e33099d… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-06-16T15:37:17+08:00 tls_wolfssl: Miscellaneous cleanup Cleanup of OpenSSL symbols and OpenSSL-related memory warnings. --- Modified: src/modules/tls_wolfssl/tls_bio.c Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_init.c Modified: src/modules/tls_wolfssl/tls_init.h Modified: src/modules/tls_wolfssl/tls_select.c Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a1398511036983471f4fd1d1e33099d… Patch: https://github.com/kamailio/kamailio/commit/a1398511036983471f4fd1d1e33099d…

1 year, 10 months

git:5.6:87317235: tls: Makefile - link libdl dynamically

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 873172351fae24ed8d74e9d5ce55a45f19b7bb01 URL: https://github.com/kamailio/kamailio/commit/873172351fae24ed8d74e9d5ce55a45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:36:01+02:00 tls: Makefile - link libdl dynamically - libcrypto uses dlopen() and dlclose() - GH #3115 (cherry picked from commit 9529730c478aef83c9b84c98242bf8af4bf152ad) --- Modified: src/modules/tlsa/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/873172351fae24ed8d74e9d5ce55a45… Patch: https://github.com/kamailio/kamailio/commit/873172351fae24ed8d74e9d5ce55a45… --- diff --git a/src/modules/tlsa/Makefile b/src/modules/tlsa/Makefile index 9295898aadb..d97e8652137 100644 --- a/src/modules/tlsa/Makefile +++ b/src/modules/tlsa/Makefile @@ -39,7 +39,7 @@ ifneq ($(CRYPTO_BUILDER),) LIBS += $(shell $(CRYPTO_BUILDER) --libs-only-L) endif # ifneq ($(CRYPTO_BUILDER),) - LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a + LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -ldl # TODO: explore use of LIBS += -Wl,-Bstatic $(shell $(SSL_BUILDER) --libs-only-l) else @@ -53,7 +53,7 @@ else # ifneq ($(SSL_BUILDER),) DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ - -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a + -l:libssl.a -l:libcrypto.a -l:libz.a -ldl endif # ifneq ($(SSL_BUILDER),) include ../../Makefile.modules

1 year, 10 months

git:5.6:aa759c12: db_cluster: docs - more suggestive db url examples

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: aa759c12aca3c8cdee11fcd383a2e565baef23be URL: https://github.com/kamailio/kamailio/commit/aa759c12aca3c8cdee11fcd383a2e56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:35:49+02:00 db_cluster: docs - more suggestive db url examples (cherry picked from commit 9b1a3a6b9a3e6a24d646e62ba74811cfdf553dae) --- Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aa759c12aca3c8cdee11fcd383a2e56… Patch: https://github.com/kamailio/kamailio/commit/aa759c12aca3c8cdee11fcd383a2e56… --- diff --git a/src/modules/db_cluster/doc/db_cluster_admin.xml b/src/modules/db_cluster/doc/db_cluster_admin.xml index 17e812f18f2..247ac178d48 100644 --- a/src/modules/db_cluster/doc/db_cluster_admin.xml +++ b/src/modules/db_cluster/doc/db_cluster_admin.xml @@ -204,9 +204,10 @@ modparam("db_cluster", "max_query_length", 5) <programlisting format="linespecific"> ... modparam("db_cluster", "connection", - "c1=>&defaultdb;1") + "c1=>mysql://kamailio:kamailiorw@localhost/kamailio1") modparam("db_cluster", "connection", - "c2=>&defaultdb;2") + "c2=>mysql://kamailio:kamailiorw@remotehost/kamailio2") + modparam("db_cluster", "cluster", "k1=>c1=9r9p;c2=9r9p") modparam("acc", "db_url", "cluster://k1")

1 year, 10 months

git:5.6:f2bad782: sipdump: docs - sync example with description

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: f2bad782198ae2c0f25713d93312bfb0b204d94b URL: https://github.com/kamailio/kamailio/commit/f2bad782198ae2c0f25713d93312bfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:34:38+02:00 sipdump: docs - sync example with description (cherry picked from commit 2a744a58c57542520e4ff4c73b1419a083b17076) --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f2bad782198ae2c0f25713d93312bfb… Patch: https://github.com/kamailio/kamailio/commit/f2bad782198ae2c0f25713d93312bfb… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index f0dd9fc1b4b..3bcdc31fc46 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -346,7 +346,7 @@ modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") ... route[TCLEAN] { - exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +1 -delete &"); + exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +2 -delete &"); } ... </programlisting>

1 year, 10 months

git:5.6:8d93720b: ims_qos: fix compilation warning

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 8d93720b363babfe8d8c8fe58bd4c5022bd64954 URL: https://github.com/kamailio/kamailio/commit/8d93720b363babfe8d8c8fe58bd4c50… Author: Atanas Bakalov <atanas(a)wgtwo.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:33:06+02:00 ims_qos: fix compilation warning (cherry picked from commit bd4cc486879616d502362dd464b04d7d3c2865c4) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/8d93720b363babfe8d8c8fe58bd4c50… Patch: https://github.com/kamailio/kamailio/commit/8d93720b363babfe8d8c8fe58bd4c50… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index b60f689e604..9ebca2ecf1e 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -53,6 +53,7 @@ #include "../cdp_avp/cdp_avp_mod.h" #include "../../modules/ims_dialog/dlg_load.h" +#include "../../modules/ims_dialog/dlg_hash.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" #include "rx_authdata.h"

1 year, 10 months

git:5.6:5b8e5d02: dispatcher: fix for checking reply code class rule

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 5b8e5d02c27b0cd3c5854012d0e0968504a6b252 URL: https://github.com/kamailio/kamailio/commit/5b8e5d02c27b0cd3c5854012d0e0968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-16T09:33:32+02:00 dispatcher: fix for checking reply code class rule (cherry picked from commit 1ac02d9f0b436602cfc8bf72037ca7f84be3d67f) --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/5b8e5d02c27b0cd3c5854012d0e0968… Patch: https://github.com/kamailio/kamailio/commit/5b8e5d02c27b0cd3c5854012d0e0968… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 827d925ed89..30620553a42 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1247,7 +1247,7 @@ int ds_ping_check_rplcode(int code) } } else { /* reply class */ - if(((*ds_ping_reply_codes)[i] / 100) == code) { + if((*ds_ping_reply_codes)[i] == code / 100) { return 1; } }

1 year, 10 months

git:5.6:46db60f1: lost: Makefile - support for FreeBSD build

by Daniel-Constantin Mierla

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 year, 10 months

git:5.6:b064a135: slack: Makefile - support for FreeBSD build

by Daniel-Constantin Mierla

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 year, 10 months

git:5.6:7f2a62ae: Makefile.groups: renamed malloc_test to misctest

by Daniel-Constantin Mierla

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 year, 10 months

git:5.6:b106b2f9: lost: URI list support in LoST response (filter for sip/sips scheme)

by Daniel-Constantin Mierla

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 year, 10 months

← Newer
1
...
18
19
20
21
22
23
24
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2022