sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
319 discussions

git:master:2a79d77f: Revert "tls_wolfssl: use wolfssl lib from system if available"

by Victor Seva

Module: kamailio Branch: master Commit: 2a79d77faa107b73e22717649776430524d9e597 URL: https://github.com/kamailio/kamailio/commit/2a79d77faa107b73e22717649776430… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-15T22:34:59+02:00 Revert "tls_wolfssl: use wolfssl lib from system if available" This reverts commit 14b1f79c29f317c74bbcbba75853ce45c353a865. --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2a79d77faa107b73e22717649776430… Patch: https://github.com/kamailio/kamailio/commit/2a79d77faa107b73e22717649776430… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 0eaa83c615f..75ec31b204d 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,12 +8,6 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so -WOLF_BUILDER = $(shell \ - if pkg-config --exists wolfssl; then \ - echo 'pkg-config wolfssl'; \ - fi) - -ifeq ($(WOLF_BUILDER),) WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl @@ -39,12 +33,6 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: @$(MAKE) -C $(WOLFSSL_SRC) install $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a -else - DEFS += $(shell $(WOLF_BUILDER) --cflags) - LIBS += $(shell $(WOLF_BUILDER) --libs) - - include ../../Makefile.modules -endif clean-wolfssl: @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \

11 months, 2 weeks

git:master:d8a244c6: Revert "pkg/kamailio/deb: introduce wolftls package"

by Victor Seva

Module: kamailio Branch: master Commit: d8a244c6286ea0b96f5466c281aeca37d86bb17f URL: https://github.com/kamailio/kamailio/commit/d8a244c6286ea0b96f5466c281aeca3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-15T22:34:47+02:00 Revert "pkg/kamailio/deb: introduce wolftls package" This reverts commit 13430c2e8b9fccf7565ddcf38dcab8e516cebef0. --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/bullseye Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/d8a244c6286ea0b96f5466c281aeca3… Patch: https://github.com/kamailio/kamailio/commit/d8a244c6286ea0b96f5466c281aeca3…

11 months, 2 weeks

git:5.7:87aebe3b: Revert "tls_wolfssl: use wolfssl lib from system if available"

by Victor Seva

Module: kamailio Branch: 5.7 Commit: 87aebe3be58a757843d3846174bc3b6224cf36c8 URL: https://github.com/kamailio/kamailio/commit/87aebe3be58a757843d3846174bc3b6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-15T22:33:33+02:00 Revert "tls_wolfssl: use wolfssl lib from system if available" This reverts commit 8ed9cf81c045d7946b07d8c98686acf92cd68776. --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/87aebe3be58a757843d3846174bc3b6… Patch: https://github.com/kamailio/kamailio/commit/87aebe3be58a757843d3846174bc3b6… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 0eaa83c615f..75ec31b204d 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,12 +8,6 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so -WOLF_BUILDER = $(shell \ - if pkg-config --exists wolfssl; then \ - echo 'pkg-config wolfssl'; \ - fi) - -ifeq ($(WOLF_BUILDER),) WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl @@ -39,12 +33,6 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: @$(MAKE) -C $(WOLFSSL_SRC) install $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a -else - DEFS += $(shell $(WOLF_BUILDER) --cflags) - LIBS += $(shell $(WOLF_BUILDER) --libs) - - include ../../Makefile.modules -endif clean-wolfssl: @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \

11 months, 2 weeks

git:5.7:8c18824c: Revert "pkg/kamailio/deb: introduce wolftls package"

by Victor Seva

Module: kamailio Branch: 5.7 Commit: 8c18824c8f754f2e4ef2cef44c32f124fb088ffe URL: https://github.com/kamailio/kamailio/commit/8c18824c8f754f2e4ef2cef44c32f12… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-15T22:33:23+02:00 Revert "pkg/kamailio/deb: introduce wolftls package" This reverts commit c9de94ede7e6127b824c7d0667b306eef5c11127. --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/bullseye Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/8c18824c8f754f2e4ef2cef44c32f12… Patch: https://github.com/kamailio/kamailio/commit/8c18824c8f754f2e4ef2cef44c32f12…

11 months, 2 weeks

Re: [kamailio/kamailio] tls_wolfssl: use wolfssl lib from system if available (14b1f79)

by Victor Seva

So according to https://github.com/wolfSSL/wolfssl/issues/5264 ``-DWOLFSSL_USE_ALIGN`` will make the module unusable And Debian's version was [built](https://buildd.debian.org/status/fetch.php?pkg=wolfssl&arch=amd64&ve… using it Thanks @space88man for the info -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce4… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce45c353a865/113454690(a)github.com>

11 months, 2 weeks

Re: [kamailio/kamailio] tls_wolfssl: use wolfssl lib from system if available (14b1f79)

by space88man

Yes. The default Makefile will build and link a static libwolfssl.a from a git submodule (which you will need to check out - git submodule update). If attempting to use an external wolfSSL ensure it does not expect 16 byte aligned memory blocks. On Mon, 15 May 2023, 13:36 Victor Seva, ***(a)***.***> wrote: > @space88man <https://github.com/space88man> do we need to build wolfssl > because we can't use wolfssl coming from distributions? > > — > Reply to this email directly, view it on GitHub > <https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce4…>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/AHEUE5YMU7IPU7Z4G5VKQBTXG…> > . > You are receiving this because you were mentioned.Message ID: > <kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce45c353a865/113383355 > @github.com> > -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce4… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce45c353a865/113419869(a)github.com>

11 months, 2 weeks

git:5.5:deae6788: topos: fix early-dialog b-side UPDATE requests routing (GH #3437)

by Henning Westerholt

Module: kamailio Branch: 5.5 Commit: deae678810d138d0cb4086c1472e5a4736d209f6 URL: https://github.com/kamailio/kamailio/commit/deae678810d138d0cb4086c1472e5a4… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-05-15T15:41:56Z topos: fix early-dialog b-side UPDATE requests routing (GH #3437) (cherry picked from commit 091dc9a76bcec5c8a4bc73e863ed10b1b9d76c92) (cherry picked from commit 1b55a80b71bf9a7edfe29eb40627b472565ace69) (cherry picked from commit 0a4d8819b1dccf4404be557278dbd5350eacd156) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/deae678810d138d0cb4086c1472e5a4… Patch: https://github.com/kamailio/kamailio/commit/deae678810d138d0cb4086c1472e5a4… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 83d5f5fddff..20548d16da2 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -883,14 +883,22 @@ int tps_request_received(sip_msg_t *msg, int dialog) } } - if(use_branch && direction == TPS_DIR_DOWNSTREAM) { + if(use_branch) { + LM_DBG("use branch for routing information, request from direction %d\n", direction); if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { LM_ERR("failed to reappend s-route\n"); return -1; } - if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1) < 0) { - LM_ERR("failed to reappend b-route\n"); - return -1; + if (direction == TPS_DIR_UPSTREAM) { + if(tps_reappend_route(msg, &stsd, &stsd.x_rr, 0) < 0) { + LM_ERR("failed to reappend a-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1) < 0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } } } else { if(tps_reappend_route(msg, &stsd, &stsd.s_rr,

11 months, 2 weeks

git:5.6:0a4d8819: topos: fix early-dialog b-side UPDATE requests routing (GH #3437)

by Henning Westerholt

Module: kamailio Branch: 5.6 Commit: 0a4d8819b1dccf4404be557278dbd5350eacd156 URL: https://github.com/kamailio/kamailio/commit/0a4d8819b1dccf4404be557278dbd53… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-05-15T13:30:06Z topos: fix early-dialog b-side UPDATE requests routing (GH #3437) (cherry picked from commit 091dc9a76bcec5c8a4bc73e863ed10b1b9d76c92) (cherry picked from commit 1b55a80b71bf9a7edfe29eb40627b472565ace69) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/0a4d8819b1dccf4404be557278dbd53… Patch: https://github.com/kamailio/kamailio/commit/0a4d8819b1dccf4404be557278dbd53… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index a3f123b593b..45d8aaa39e7 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -889,14 +889,22 @@ int tps_request_received(sip_msg_t *msg, int dialog) } } - if(use_branch && direction == TPS_DIR_DOWNSTREAM) { + if(use_branch) { + LM_DBG("use branch for routing information, request from direction %d\n", direction); if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { LM_ERR("failed to reappend s-route\n"); return -1; } - if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1) < 0) { - LM_ERR("failed to reappend b-route\n"); - return -1; + if (direction == TPS_DIR_UPSTREAM) { + if(tps_reappend_route(msg, &stsd, &stsd.x_rr, 0) < 0) { + LM_ERR("failed to reappend a-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1) < 0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } } } else { if(tps_reappend_route(msg, &stsd, &stsd.s_rr,

11 months, 2 weeks

git:5.7:1b55a80b: topos: fix early-dialog b-side UPDATE requests routing (GH #3437)

by Henning Westerholt

Module: kamailio Branch: 5.7 Commit: 1b55a80b71bf9a7edfe29eb40627b472565ace69 URL: https://github.com/kamailio/kamailio/commit/1b55a80b71bf9a7edfe29eb40627b47… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-05-15T13:28:51Z topos: fix early-dialog b-side UPDATE requests routing (GH #3437) (cherry picked from commit 091dc9a76bcec5c8a4bc73e863ed10b1b9d76c92) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1b55a80b71bf9a7edfe29eb40627b47… Patch: https://github.com/kamailio/kamailio/commit/1b55a80b71bf9a7edfe29eb40627b47… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index a19b30dcfc4..a11d544f777 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -946,14 +946,22 @@ int tps_request_received(sip_msg_t *msg, int dialog) } } - if(use_branch && direction == TPS_DIR_DOWNSTREAM) { + if(use_branch) { + LM_DBG("use branch for routing information, request from direction %d\n", direction); if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { LM_ERR("failed to reappend s-route\n"); return -1; } - if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1) < 0) { - LM_ERR("failed to reappend b-route\n"); - return -1; + if (direction == TPS_DIR_UPSTREAM) { + if(tps_reappend_route(msg, &stsd, &stsd.x_rr, 0) < 0) { + LM_ERR("failed to reappend a-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1) < 0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } } } else { if(tps_reappend_route(msg, &stsd, &stsd.s_rr,

11 months, 2 weeks

git:master:091dc9a7: topos: fix early-dialog b-side UPDATE requests routing (GH #3437)

by Henning Westerholt

Module: kamailio Branch: master Commit: 091dc9a76bcec5c8a4bc73e863ed10b1b9d76c92 URL: https://github.com/kamailio/kamailio/commit/091dc9a76bcec5c8a4bc73e863ed10b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-05-15T13:22:09Z topos: fix early-dialog b-side UPDATE requests routing (GH #3437) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/091dc9a76bcec5c8a4bc73e863ed10b… Patch: https://github.com/kamailio/kamailio/commit/091dc9a76bcec5c8a4bc73e863ed10b… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index a19b30dcfc..a11d544f77 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -946,14 +946,22 @@ int tps_request_received(sip_msg_t *msg, int dialog) } } - if(use_branch && direction == TPS_DIR_DOWNSTREAM) { + if(use_branch) { + LM_DBG("use branch for routing information, request from direction %d\n", direction); if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { LM_ERR("failed to reappend s-route\n"); return -1; } - if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1) < 0) { - LM_ERR("failed to reappend b-route\n"); - return -1; + if (direction == TPS_DIR_UPSTREAM) { + if(tps_reappend_route(msg, &stsd, &stsd.x_rr, 0) < 0) { + LM_ERR("failed to reappend a-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1) < 0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } } } else { if(tps_reappend_route(msg, &stsd, &stsd.s_rr,

11 months, 2 weeks

← Newer
1
...
20
21
22
23
24
25
26
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2023