sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
322 discussions

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,

1 year, 7 months

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,

1 year, 7 months

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,

1 year, 7 months

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

by Victor Seva

@space88man do we need to build wolfssl because we can't use wolfssl coming from distributions? -- 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/113383355(a)github.com>

1 year, 7 months

git:master:14b1f79c: tls_wolfssl: use wolfssl lib from system if available

by Victor Seva

Module: kamailio Branch: master Commit: 14b1f79c29f317c74bbcbba75853ce45c353a865 URL: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-15T13:35:48+02:00 tls_wolfssl: use wolfssl lib from system if available --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce4… Patch: https://github.com/kamailio/kamailio/commit/14b1f79c29f317c74bbcbba75853ce4… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 75ec31b204d..0eaa83c615f 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,6 +8,12 @@ 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 @@ -33,6 +39,12 @@ $(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}; \

1 year, 7 months

git:5.7:8ed9cf81: tls_wolfssl: use wolfssl lib from system if available

by Victor Seva

Module: kamailio Branch: 5.7 Commit: 8ed9cf81c045d7946b07d8c98686acf92cd68776 URL: https://github.com/kamailio/kamailio/commit/8ed9cf81c045d7946b07d8c98686acf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-15T13:42:27+02:00 tls_wolfssl: use wolfssl lib from system if available (cherry picked from commit 14b1f79c29f317c74bbcbba75853ce45c353a865) --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/8ed9cf81c045d7946b07d8c98686acf… Patch: https://github.com/kamailio/kamailio/commit/8ed9cf81c045d7946b07d8c98686acf… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 75ec31b204d..0eaa83c615f 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,6 +8,12 @@ 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 @@ -33,6 +39,12 @@ $(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}; \

1 year, 7 months

git:master:d858378b: github: refresh branches [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: d858378b722da6a44d937250e0985eddd31663b3 URL: https://github.com/kamailio/kamailio/commit/d858378b722da6a44d937250e0985ed… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-15T12:18:49+02:00 github: refresh branches [skip ci] --- Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/d858378b722da6a44d937250e0985ed… Patch: https://github.com/kamailio/kamailio/commit/d858378b722da6a44d937250e0985ed… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 71b9d6c5480..ddec775816c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,8 +4,6 @@ name: build push: branches: - master - - '5.6' - - '5.5' # Allows you to run this workflow manually from the Actions tab workflow_dispatch: permissions:

1 year, 7 months

git:5.7:5e8ea292: github: refresh branch [skip ci]

by Victor Seva

Module: kamailio Branch: 5.7 Commit: 5e8ea292e4d5e403509f75016f1685d793912a1f URL: https://github.com/kamailio/kamailio/commit/5e8ea292e4d5e403509f75016f1685d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-15T12:17:59+02:00 github: refresh branch [skip ci] --- Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/5e8ea292e4d5e403509f75016f1685d… Patch: https://github.com/kamailio/kamailio/commit/5e8ea292e4d5e403509f75016f1685d… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 71b9d6c548..0b8894a937 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,9 +3,7 @@ name: build 'on': push: branches: - - master - - '5.6' - - '5.5' + - '5.7' # Allows you to run this workflow manually from the Actions tab workflow_dispatch: permissions:

1 year, 7 months

git:5.7:c9de94ed: pkg/kamailio/deb: introduce wolftls package

by Victor Seva

Module: kamailio Branch: 5.7 Commit: c9de94ede7e6127b824c7d0667b306eef5c11127 URL: https://github.com/kamailio/kamailio/commit/c9de94ede7e6127b824c7d0667b306e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-15T11:27:05+02:00 pkg/kamailio/deb: introduce wolftls package (cherry picked from 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/c9de94ede7e6127b824c7d0667b306e… Patch: https://github.com/kamailio/kamailio/commit/c9de94ede7e6127b824c7d0667b306e…

1 year, 7 months

git:master:13430c2e: pkg/kamailio/deb: introduce wolftls package

by Victor Seva

Module: kamailio Branch: master Commit: 13430c2e8b9fccf7565ddcf38dcab8e516cebef0 URL: https://github.com/kamailio/kamailio/commit/13430c2e8b9fccf7565ddcf38dcab8e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-15T11:26:34+02:00 pkg/kamailio/deb: introduce wolftls package --- 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/13430c2e8b9fccf7565ddcf38dcab8e… Patch: https://github.com/kamailio/kamailio/commit/13430c2e8b9fccf7565ddcf38dcab8e…

1 year, 7 months

← Newer
1
...
21
22
23
24
25
26
27
...
33
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