March 2024 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-abis[rel-1.5.2]: Fix critical bug in default TCP keepalive user timeout

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36282?usp=email ) Change subject: Fix critical bug in default TCP keepalive user timeout ...................................................................... Fix critical bug in default TCP keepalive user timeout It turns out that our calculation of the TCP_USER_TIMEOUT value was flawed in several ways: * there should have been parenthesis around the + operator (line->keepalive_probe_interval + line->keepalive_idle_timeout) as the keepalive_idle_timeout is in seconds, not milli-seconds. * in the default case, all those values are configured to -1 (E1INP_USE_DEFAULT). This means we're using 1000 * -1 * -1 + -1 = 999 i.e. just below a second which clearly is not enough for a lossy satellite or wifi back-haul. This fixes a regression introduced in Ia7659c209aea0d26eb37d31e771adc91b17ae668 (libosmo-abis >= 1.4.0) when TCP keepalive user timeouts became enabled by default. The initial support for TCP_USER_TIMEOUT was merged in I5e7425958472aa5d758e09bfbefc7d7d37bf6f5f (libosmo-abis >= 0.7.0) but since TCP keepalives were not yet enabled by default, only users with explicit TCP keepalive configuration in their config files would be affected - and then only of the second part of the bug (operator precedence). In addition, let's print the actually-used values to the log, helping to spot unintended values. Change-Id: Idca24d3e676a45d860d9eec60dc2097d8d87f3bf Related: OS#5785, OS#6375, SYS#6801 Fixes: Ia7659c209aea0d26eb37d31e771adc91b17ae668 (cherry picked from commit 12fae9aeebd86e242abd5c682a12fd1c9da68497) --- M src/input/ipaccess.c 1 file changed, 57 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/82/36282/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index acbeda1..015407d 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -599,7 +599,7 @@ static void update_fd_settings(struct e1inp_line *line, int fd) { int ret; - int val; + int val, idle_val, interval_val, retry_count_val, user_timeout_val; if (line->keepalive_num_probes) { /* Enable TCP keepalive to find out if the connection is gone */ @@ -611,42 +611,39 @@ else LOGP(DLINP, LOGL_NOTICE, "TCP Keepalive is enabled\n"); + idle_val = line->keepalive_idle_timeout > 0 ? + line->keepalive_idle_timeout : + DEFAULT_TCP_KEEPALIVE_IDLE_TIMEOUT; + interval_val = line->keepalive_probe_interval > -1 ? + line->keepalive_probe_interval : + DEFAULT_TCP_KEEPALIVE_INTERVAL; + retry_count_val = line->keepalive_num_probes > 0 ? + line->keepalive_num_probes : + DEFAULT_TCP_KEEPALIVE_RETRY_COUNT; + user_timeout_val = 1000 * retry_count_val * (interval_val + idle_val); + LOGP(DLINP, LOGL_NOTICE, + "TCP keepalive idle_timeout=%us, interval=%us, retry_count=%u user_timeout=%ums\n", + idle_val, interval_val, retry_count_val, user_timeout_val); /* The following options are not portable! */ - val = line->keepalive_idle_timeout > 0 ? - line->keepalive_idle_timeout : - DEFAULT_TCP_KEEPALIVE_IDLE_TIMEOUT; - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, - &val, sizeof(val)); + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle_val, sizeof(idle_val)); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "Failed to set TCP keepalive idle time: %s\n", strerror(errno)); } - val = line->keepalive_probe_interval > -1 ? - line->keepalive_probe_interval : - DEFAULT_TCP_KEEPALIVE_INTERVAL; - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, - &val, sizeof(val)); + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &interval_val, sizeof(interval_val)); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "Failed to set TCP keepalive interval: %s\n", strerror(errno)); } - val = line->keepalive_num_probes > 0 ? - line->keepalive_num_probes : - DEFAULT_TCP_KEEPALIVE_RETRY_COUNT; - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, - &val, sizeof(val)); + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &retry_count_val, sizeof(retry_count_val)); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "Failed to set TCP keepalive count: %s\n", strerror(errno)); } - val = 1000 * line->keepalive_num_probes * - line->keepalive_probe_interval + - line->keepalive_idle_timeout; - ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, - &val, sizeof(val)); + ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &user_timeout_val, sizeof(user_timeout_val)); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "Failed to set TCP user timeout: %s\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36282?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.5.2 Gerrit-Change-Id: Idca24d3e676a45d860d9eec60dc2097d8d87f3bf Gerrit-Change-Number: 36282 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in libosmo-abis[rel-1.5.2]: input/ipaccess: Make sure to say "TCP keepalive"

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36281?usp=email ) Change subject: input/ipaccess: Make sure to say "TCP keepalive" ...................................................................... input/ipaccess: Make sure to say "TCP keepalive" We have TCP and IPA keepalive. Reading a message like "input/ipaccess.c:612 Keepalive is set: 0" is misleading, as one might assume it relates to IPA. Be explicit. Related: SYS#6801, OS#6375 Change-Id: I01cbda27eb7826eb11f44e034d746b7c39b399a4 (cherry picked from commit 715653778c33e31980452de86029720735cdcf4a) --- M src/input/ipaccess.c 1 file changed, 32 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/81/36281/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index d63c0d2..acbeda1 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -606,10 +606,10 @@ val = 1; ret = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)); if (ret < 0) - LOGP(DLINP, LOGL_ERROR, "Failed to set keepalive: %s\n", + LOGP(DLINP, LOGL_ERROR, "Failed to enable TCP keepalive: %s\n", strerror(errno)); else - LOGP(DLINP, LOGL_NOTICE, "Keepalive is set: %i\n", ret); + LOGP(DLINP, LOGL_NOTICE, "TCP Keepalive is enabled\n"); /* The following options are not portable! */ val = line->keepalive_idle_timeout > 0 ? @@ -617,37 +617,41 @@ DEFAULT_TCP_KEEPALIVE_IDLE_TIMEOUT; ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)); - if (ret < 0) + if (ret < 0) { LOGP(DLINP, LOGL_ERROR, - "Failed to set keepalive idle time: %s\n", + "Failed to set TCP keepalive idle time: %s\n", strerror(errno)); + } val = line->keepalive_probe_interval > -1 ? line->keepalive_probe_interval : DEFAULT_TCP_KEEPALIVE_INTERVAL; ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)); - if (ret < 0) + if (ret < 0) { LOGP(DLINP, LOGL_ERROR, - "Failed to set keepalive interval: %s\n", + "Failed to set TCP keepalive interval: %s\n", strerror(errno)); + } val = line->keepalive_num_probes > 0 ? line->keepalive_num_probes : DEFAULT_TCP_KEEPALIVE_RETRY_COUNT; ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)); - if (ret < 0) + if (ret < 0) { LOGP(DLINP, LOGL_ERROR, - "Failed to set keepalive count: %s\n", + "Failed to set TCP keepalive count: %s\n", strerror(errno)); + } val = 1000 * line->keepalive_num_probes * line->keepalive_probe_interval + line->keepalive_idle_timeout; ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &val, sizeof(val)); - if (ret < 0) + if (ret < 0) { LOGP(DLINP, LOGL_ERROR, - "Failed to set user timoeut: %s\n", + "Failed to set TCP user timeout: %s\n", strerror(errno)); + } } val = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.5.2 Gerrit-Change-Id: I01cbda27eb7826eb11f44e034d746b7c39b399a4 Gerrit-Change-Number: 36281 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in libosmo-abis[rel-1.4.2]: input/ipaccess: Make sure to say "TCP keepalive"

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36277?usp=email ) Change subject: input/ipaccess: Make sure to say "TCP keepalive" ...................................................................... Patch Set 1: (4 comments) File src/input/ipaccess.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15104): https://gerrit.osmocom.org/c/libosmo-abis/+/36277/comment/9c068a5a_74423f2f PS1, Line 650: if (ret < 0) { code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15104): https://gerrit.osmocom.org/c/libosmo-abis/+/36277/comment/cbd9e4b6_ccbcb37f PS1, Line 650: if (ret < 0) { please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15104): https://gerrit.osmocom.org/c/libosmo-abis/+/36277/comment/18633243_14cdac52 PS1, Line 652: "Failed to set TCP user timoeut: %s\n", code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15104): https://gerrit.osmocom.org/c/libosmo-abis/+/36277/comment/8ce2f52b_c29a6a15 PS1, Line 652: "Failed to set TCP user timoeut: %s\n", please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36277?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.4.2 Gerrit-Change-Id: I01cbda27eb7826eb11f44e034d746b7c39b399a4 Gerrit-Change-Number: 36277 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 14 Mar 2024 17:14:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in libosmo-abis[rel-1.4.2]: input/ipaccess: Make sure to say "TCP keepalive"

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36277?usp=email ) Change subject: input/ipaccess: Make sure to say "TCP keepalive" ...................................................................... input/ipaccess: Make sure to say "TCP keepalive" We have TCP and IPA keepalive. Reading a message like "input/ipaccess.c:612 Keepalive is set: 0" is misleading, as one might assume it relates to IPA. Be explicit. Related: SYS#6801, OS#6375 Change-Id: I01cbda27eb7826eb11f44e034d746b7c39b399a4 (cherry picked from commit 715653778c33e31980452de86029720735cdcf4a) --- M src/input/ipaccess.c 1 file changed, 32 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/77/36277/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 418606e..2383265 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -606,10 +606,10 @@ val = 1; ret = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)); if (ret < 0) - LOGP(DLINP, LOGL_ERROR, "Failed to set keepalive: %s\n", + LOGP(DLINP, LOGL_ERROR, "Failed to enable TCP keepalive: %s\n", strerror(errno)); else - LOGP(DLINP, LOGL_NOTICE, "Keepalive is set: %i\n", ret); + LOGP(DLINP, LOGL_NOTICE, "TCP Keepalive is enabled\n"); /* The following options are not portable! */ val = line->keepalive_idle_timeout > 0 ? @@ -617,37 +617,41 @@ DEFAULT_TCP_KEEPALIVE_IDLE_TIMEOUT; ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)); - if (ret < 0) + if (ret < 0) { LOGP(DLINP, LOGL_ERROR, - "Failed to set keepalive idle time: %s\n", + "Failed to set TCP keepalive idle time: %s\n", strerror(errno)); + } val = line->keepalive_probe_interval > -1 ? line->keepalive_probe_interval : DEFAULT_TCP_KEEPALIVE_INTERVAL; ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)); - if (ret < 0) + if (ret < 0) { LOGP(DLINP, LOGL_ERROR, - "Failed to set keepalive interval: %s\n", + "Failed to set TCP keepalive interval: %s\n", strerror(errno)); + } val = line->keepalive_num_probes > 0 ? line->keepalive_num_probes : DEFAULT_TCP_KEEPALIVE_RETRY_COUNT; ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)); - if (ret < 0) + if (ret < 0) { LOGP(DLINP, LOGL_ERROR, - "Failed to set keepalive count: %s\n", + "Failed to set TCP keepalive count: %s\n", strerror(errno)); + } val = 1000 * line->keepalive_num_probes * line->keepalive_probe_interval + line->keepalive_idle_timeout; ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &val, sizeof(val)); - if (ret < 0) + if (ret < 0) { LOGP(DLINP, LOGL_ERROR, - "Failed to set user timoeut: %s\n", + "Failed to set TCP user timoeut: %s\n", strerror(errno)); + } } val = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36277?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.4.2 Gerrit-Change-Id: I01cbda27eb7826eb11f44e034d746b7c39b399a4 Gerrit-Change-Number: 36277 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in libosmo-abis[rel-1.4.2]: Fix critical bug in default TCP keepalive user timeout

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36278?usp=email ) Change subject: Fix critical bug in default TCP keepalive user timeout ...................................................................... Fix critical bug in default TCP keepalive user timeout It turns out that our calculation of the TCP_USER_TIMEOUT value was flawed in several ways: * there should have been parenthesis around the + operator (line->keepalive_probe_interval + line->keepalive_idle_timeout) as the keepalive_idle_timeout is in seconds, not milli-seconds. * in the default case, all those values are configured to -1 (E1INP_USE_DEFAULT). This means we're using 1000 * -1 * -1 + -1 = 999 i.e. just below a second which clearly is not enough for a lossy satellite or wifi back-haul. This fixes a regression introduced in Ia7659c209aea0d26eb37d31e771adc91b17ae668 (libosmo-abis >= 1.4.0) when TCP keepalive user timeouts became enabled by default. The initial support for TCP_USER_TIMEOUT was merged in I5e7425958472aa5d758e09bfbefc7d7d37bf6f5f (libosmo-abis >= 0.7.0) but since TCP keepalives were not yet enabled by default, only users with explicit TCP keepalive configuration in their config files would be affected - and then only of the second part of the bug (operator precedence). In addition, let's print the actually-used values to the log, helping to spot unintended values. Change-Id: Idca24d3e676a45d860d9eec60dc2097d8d87f3bf Related: OS#5785, OS#6375, SYS#6801 Fixes: Ia7659c209aea0d26eb37d31e771adc91b17ae668 (cherry picked from commit 12fae9aeebd86e242abd5c682a12fd1c9da68497) --- M src/input/ipaccess.c 1 file changed, 60 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/78/36278/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 2383265..88b5ac0 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -599,7 +599,7 @@ static void update_fd_settings(struct e1inp_line *line, int fd) { int ret; - int val; + int val, idle_val, interval_val, retry_count_val, user_timeout_val; if (line->keepalive_num_probes) { /* Enable TCP keepalive to find out if the connection is gone */ @@ -611,46 +611,43 @@ else LOGP(DLINP, LOGL_NOTICE, "TCP Keepalive is enabled\n"); + idle_val = line->keepalive_idle_timeout > 0 ? + line->keepalive_idle_timeout : + DEFAULT_TCP_KEEPALIVE_IDLE_TIMEOUT; + interval_val = line->keepalive_probe_interval > -1 ? + line->keepalive_probe_interval : + DEFAULT_TCP_KEEPALIVE_INTERVAL; + retry_count_val = line->keepalive_num_probes > 0 ? + line->keepalive_num_probes : + DEFAULT_TCP_KEEPALIVE_RETRY_COUNT; + user_timeout_val = 1000 * retry_count_val * (interval_val + idle_val); + LOGP(DLINP, LOGL_NOTICE, + "TCP keepalive idle_timeout=%us, interval=%us, retry_count=%u user_timeout=%ums\n", + idle_val, interval_val, retry_count_val, user_timeout_val); /* The following options are not portable! */ - val = line->keepalive_idle_timeout > 0 ? - line->keepalive_idle_timeout : - DEFAULT_TCP_KEEPALIVE_IDLE_TIMEOUT; - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, - &val, sizeof(val)); + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle_val, sizeof(idle_val)); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "Failed to set TCP keepalive idle time: %s\n", strerror(errno)); } - val = line->keepalive_probe_interval > -1 ? - line->keepalive_probe_interval : - DEFAULT_TCP_KEEPALIVE_INTERVAL; - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, - &val, sizeof(val)); + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &interval_val, sizeof(interval_val)); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "Failed to set TCP keepalive interval: %s\n", strerror(errno)); } - val = line->keepalive_num_probes > 0 ? - line->keepalive_num_probes : - DEFAULT_TCP_KEEPALIVE_RETRY_COUNT; - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, - &val, sizeof(val)); + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &retry_count_val, sizeof(retry_count_val)); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "Failed to set TCP keepalive count: %s\n", strerror(errno)); } - val = 1000 * line->keepalive_num_probes * - line->keepalive_probe_interval + - line->keepalive_idle_timeout; - ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, - &val, sizeof(val)); - if (ret < 0) { + ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &user_timeout_val, sizeof(user_timeout_val)); + if (ret < 0) { LOGP(DLINP, LOGL_ERROR, - "Failed to set TCP user timoeut: %s\n", - strerror(errno)); + "Failed to set TCP user timeout: %s\n", + strerror(errno)); } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36278?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.4.2 Gerrit-Change-Id: Idca24d3e676a45d860d9eec60dc2097d8d87f3bf Gerrit-Change-Number: 36278 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in libosmo-abis[rel-1.4.2]: Bump version: 1.4.1.2-a5ac → 1.4.2

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36279?usp=email ) Change subject: Bump version: 1.4.1.2-a5ac → 1.4.2 ...................................................................... Bump version: 1.4.1.2-a5ac → 1.4.2 Change-Id: I9072cd5c89d2deb0eb75f47c8fd04ad175549e41 --- M debian/changelog M src/Makefile.am 2 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/79/36279/1 diff --git a/debian/changelog b/debian/changelog index 01a7089..f2eae12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libosmo-abis (1.4.2) unstable; urgency=medium + + [ Harald Welte ] + * input/ipaccess: Make sure to say "TCP keepalive" + * Fix critical bug in default TCP keepalive user timeout + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Fri, 15 Mar 2024 00:11:56 +0700 + libosmo-abis (1.4.1) unstable; urgency=medium [ Oliver Smith ] diff --git a/src/Makefile.am b/src/Makefile.am index 2c99150..6f94c9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -ABIS_LIBVERSION=12:0:2 +ABIS_LIBVERSION=12:1:2 TRAU_LIBVERSION=8:0:6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36279?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.4.2 Gerrit-Change-Id: I9072cd5c89d2deb0eb75f47c8fd04ad175549e41 Gerrit-Change-Number: 36279 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: run io_uring tests on specific nodes

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36272?usp=email ) Change subject: jobs/ttcn3: run io_uring tests on specific nodes ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: which nodes specifically? hard to investigate without details. In general, debian11 also already supports io_uring and has liburing. Maybe it is related to using the debian12-liburing on a debian11 system? OS#6357 also contains no related info -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If917806f9056fdf99863f4132f44659b2bfd44c3 Gerrit-Change-Number: 36272 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 16:49:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36275?usp=email ) Change subject: epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination ...................................................................... epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination I forgot to submit some fixes before merging. Fixes: a7823b96cb566dd9ce6a9f640803833c9f6c6a9f Change-Id: Ic4d0d649221d669dee32edeb94b89e95ec1b1c08 --- M epdg/EPDG_Tests.ttcn 1 file changed, 25 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 71b65c0..bc4219b 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -473,7 +473,8 @@ /* Send RTR as HSS to AAA server, expect back RTA */ private function f_DIA_SWx_RT(template (value) CxDx_3GPP_Reason_Code reason_code, - template (present) GenericAVP exp_result_tmpl := tr_AVP_ResultCode(DIAMETER_SUCCESS)) runs on EPDG_ConnHdlr { + template (present) GenericAVP exp_result_tmpl := tr_AVP_ResultCode(DIAMETER_SUCCESS), + boolean exp_aaa_proc := true) runs on EPDG_ConnHdlr { var PDU_DIAMETER rx_dia; var UINT32 hbh_id := f_rnd_octstring(4); var UINT32 ete_id := f_rnd_octstring(4); @@ -489,12 +490,14 @@ hbh_id := hbh_id, ete_id := ete_id)); - if (match(reason_code_permanent_termination, reason_code)) { + if (match(reason_code_permanent_termination, reason_code) and exp_aaa_proc) { /* Expect Abort-Session procedure (ASR + ASA) in the S6b interface: */ as_DIA_S6b_AS_success(); /* Here AAA-Server starts an ASR + ASA procedure towards ePDG, which forwards it to strongswan: */ as_GSUP_rx_CL_REQ(OSMO_GSUP_CANCEL_TYPE_WITHDRAW); f_GSUP_tx_CL_RES(); + /* No need to so STR+STA, since the session was already aborted above during ASR+ASA: */ + as_GTP2C_DeleteSession_success(do_s6b_st_proc := false); } alt { @@ -566,7 +569,7 @@ [] S6b.receive(tr_DIA_S6b_ASR(f_nai())) -> value rx_dia { avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - SWx.send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS, + S6b.send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS, sess_id := sess_id, hbh_id := rx_dia.hop_by_hop_id, ete_id := rx_dia.end_to_end_id)); @@ -702,7 +705,7 @@ } /* ePDG Deletes session at the PGW. PGW sends Diameter s6b AAR + AAA. */ -private altstep as_GTP2C_DeleteSession_success() runs on EPDG_ConnHdlr { +private altstep as_GTP2C_DeleteSession_success(boolean do_s6b_st_proc := true) runs on EPDG_ConnHdlr { var PDU_GTPCv2 rx_msg; var BearerContextIEs rx_bctx_ies; var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; @@ -710,8 +713,10 @@ var template (value) BearerContextIEs bctx_ies; [] GTP2.receive(tr_GTP2C_DeleteSessionReq(g_pars.teic_local)) -> value rx_msg { - /* Upon rx of DeleteSession, emulate PGW requesting the AAA server for Sesssion Termination. */ - f_S6b_ST_success(); + if (do_s6b_st_proc) { + /* Upon rx of DeleteSession, emulate PGW requesting the AAA server for Sesssion Termination. */ + f_S6b_ST_success(); + } GTP2.send(ts_GTP2C_DeleteSessionResp(g_pars.teic_remote, rx_msg.sequenceNumber, @@ -1121,7 +1126,8 @@ f_DIA_SWx_RT(PERMANENT_TERMINATION, tr_AVP_ResultCode(DIAMETER_SUCCESS)); /* Subscriber was already removed, it should fail if requested again: */ var DIAMETER_ts29_229_ExperimentalResultcode erc := DIAMETER_ERROR_USER_UNKNOWN; - f_DIA_SWx_RT(PERMANENT_TERMINATION, tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4))); + f_DIA_SWx_RT(PERMANENT_TERMINATION, tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4)), + exp_aaa_proc := false); } testcase TC_hss_initiated_deregister_permanent_termination() runs on MTC_CT { var EPDG_ConnHdlrPars pars := f_init_pars(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36275?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic4d0d649221d669dee32edeb94b89e95ec1b1c08 Gerrit-Change-Number: 36275 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36275?usp=email ) Change subject: epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36275?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic4d0d649221d669dee32edeb94b89e95ec1b1c08 Gerrit-Change-Number: 36275 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 16:44:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-gsm-manuals[master]: gsup: Document ePDG Tunnel Req/Res/Err

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36276?usp=email ) Change subject: gsup: Document ePDG Tunnel Req/Res/Err ...................................................................... gsup: Document ePDG Tunnel Req/Res/Err Related: OS#6091 Change-Id: I9d98d0fbb2d4d006bc980b40828ea38f358d7108 --- M common/chapters/gsup.adoc 1 file changed, 60 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/76/36276/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index d88c579..f5cce14 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -1088,6 +1088,53 @@ |31|Session State|<<gsup-ie-session-state>>|O|TLV|3 |=== +[[gsup-msg-epdg-tunnel-req]] +==== ePDG Tunnel Request + +Direction: GSUP Client (strongswan) => GSUP Server (ePDG) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<<gsup-ie-msgtype>>|M|V|1 +|01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 +|0a|Message Class|<<gsup-ie-message-class>>|M|TLV|3 +|15|PCO|<<gsup-ie-pco>>|O|TLV|1-... +|28|CN Domain|<<gsup-ie-cndomain>>|O|TLV|3 +|60|Source Name|<<gsup-ie-source-name>>|O|TLV|2-... +|=== + +[[gsup-msg-epdg-tunnel-err]] +==== ePDG Tunnel Error + +Direction: GSUP Server (ePDG) => GSUP Client (strongswan) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<<gsup-ie-msgtype>>|M|V|1 +|01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 +|0a|Message Class|<<gsup-ie-message-class>>|M|TLV|3 +|02|Cause|<<gsup-ie-cause>>|M|TLV|3 +|=== + +[[gsup-msg-epdg-tunnel-res]] +==== ePDG Tunnel Result + +Direction: GSUP Server (ePDG) => GSUP Client (strongswan) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<<gsup-ie-msgtype>>|M|V|1 +|01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 +|0a|Message Class|<<gsup-ie-message-class>>|M|TLV|3 +|04|PDP info complete|<<gsup-ie-empty>>|M|TLV|2 +|05|PDP info|<<gsup-ie-pdpinfo>>|M|TLV|2-N +|15|PCO|<<gsup-ie-pco>>|O|TLV|1-... +|28|CN Domain|<<gsup-ie-cndomain>>|O|TLV|3 +|60|Source Name|<<gsup-ie-source-name>>|O|TLV|2-... +|=== === Information Elements @@ -1145,6 +1192,9 @@ |0x47|E Close|<<gsup-msg-e-close>> |0x4B|E Abort|<<gsup-msg-e-abort>> |0x4E|E Routing Error|<<gsup-msg-e-routing-err>> +|0x50|ePDG Tunnel Request|<<gsup-msg-epdg-tunnel-req>> +|0x51|ePDG Tunnel Error|<<gsup-msg-epdg-tunnel-err>> +|0x52|ePDG Tunnel Result|<<gsup-msg-epdg-tunnel-res>> |=== The category of the message is indicated by the last two bits of the type. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36276?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9d98d0fbb2d4d006bc980b40828ea38f358d7108 Gerrit-Change-Number: 36276 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024