- gerrit-log - lists.osmocom.org

[M] Change in osmo-upf[master]: drop unused copy of up_peer.c: up_peer_fsm.c
by laforge 26 Jun '25

26 Jun '25

Attention is currently required from: neels. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-upf/+/40539?usp=email ) Change subject: drop unused copy of up_peer.c: up_peer_fsm.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/40539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I90e37581748e73d89d38581174ec209a72fc6535 Gerrit-Change-Number: 40539 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 14:29:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-upf[master]: drop unused copy of up_peer.c: up_peer_fsm.c
by pespin 26 Jun '25

26 Jun '25

Attention is currently required from: neels. pespin has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-upf/+/40539?usp=email ) Change subject: drop unused copy of up_peer.c: up_peer_fsm.c ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/40539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I90e37581748e73d89d38581174ec209a72fc6535 Gerrit-Change-Number: 40539 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 14:14:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-upf[master]: drop unused copy of up_peer.c: up_peer_fsm.c
by neels 26 Jun '25

26 Jun '25

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/40539?usp=email ) Change subject: drop unused copy of up_peer.c: up_peer_fsm.c ...................................................................... drop unused copy of up_peer.c: up_peer_fsm.c Change-Id: I90e37581748e73d89d38581174ec209a72fc6535 --- D src/osmo-upf/up_peer_fsm.c 1 file changed, 0 insertions(+), 196 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/39/40539/1 diff --git a/src/osmo-upf/up_peer_fsm.c b/src/osmo-upf/up_peer_fsm.c deleted file mode 100644 index ec37c0b..0000000 --- a/src/osmo-upf/up_peer_fsm.c +++ /dev/null @@ -1,196 +0,0 @@ -/* - * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> - * All Rights Reserved. - * - * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> - * - * SPDX-License-Identifier: GPL-2.0+ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -#include <osmocom/core/utils.h> -#include <osmocom/core/fsm.h> - -#include <osmocom/upf/up_peer.h> - -enum up_peer_fsm_state { - UP_PEER_ST_NOT_ASSOCIATED, - UP_PEER_ST_ASSOCIATED, - UP_PEER_ST_GRACEFUL_RELEASE, -}; - -static const struct value_string up_peer_fsm_event_names[] = { - OSMO_VALUE_STRING(UP_PEER_EV_RX_ASSOC_SETUP_REQ), - OSMO_VALUE_STRING(UP_PEER_EV_RX_ASSOC_UPD_REQ), - OSMO_VALUE_STRING(UP_PEER_EV_RX_SESSION_EST_REQ), - OSMO_VALUE_STRING(UP_PEER_EV_HEARTBEAT_FAILURE), - {} -}; - -static struct osmo_fsm up_peer_fsm; - -static const struct osmo_tdef_state_timeout up_peer_fsm_timeouts[32] = { - [UP_PEER_ST_GRACEFUL_RELEASE] = { .T = -21 }, -}; - -/* Transition to a state, using the T timer defined in up_peer_fsm_timeouts. - * Assumes local variable fi exists. */ -#define up_peer_fsm_state_chg(state) \ - osmo_tdef_fsm_inst_state_chg(fi, state, \ - up_peer_fsm_timeouts, \ - g_upf_tdefs, \ - 5) - -struct up_peer *up_peer_alloc(struct osmo_fsm_inst *parent_fi, uint32_t parent_event_term) -{ - struct up_peer *up_peer; - - struct osmo_fsm_inst *fi = osmo_fsm_inst_alloc_child(&up_peer_fsm, parent_fi, parent_event_term); - OSMO_ASSERT(fi); - - up_peer = talloc(fi, struct up_peer); - OSMO_ASSERT(up_peer); - fi->priv = up_peer; - *up_peer = (struct up_peer){ - .fi = fi, - }; - - return up_peer; -} - -static int up_peer_fsm_timer_cb(struct osmo_fsm_inst *fi) -{ - //struct up_peer *up_peer = fi->priv; - /* Return 1 to terminate FSM instance, 0 to keep running */ - return 1; -} - -static void up_peer_not_associated_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - //struct up_peer *up_peer = fi->priv; - - switch (event) { - - case UP_PEER_EV_RX_ASSOC_SETUP_REQ: - // FIXME - break; - - default: - OSMO_ASSERT(false); - } -} - -static void up_peer_associated_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - //struct up_peer *up_peer = fi->priv; - // FIXME -} - -static void up_peer_associated_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - //struct up_peer *up_peer = fi->priv; - - switch (event) { - - case UP_PEER_EV_RX_ASSOC_UPD_REQ: - // FIXME - break; - - case UP_PEER_EV_RX_SESSION_EST_REQ: - // FIXME - break; - - case UP_PEER_EV_HEARTBEAT_FAILURE: - // FIXME - break; - - default: - OSMO_ASSERT(false); - } -} - -static void up_peer_graceful_release_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - //struct up_peer *up_peer = fi->priv; - // FIXME -} - -static void up_peer_graceful_release_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - //struct up_peer *up_peer = fi->priv; - - switch (event) { - - case UP_PEER_EV_HEARTBEAT_FAILURE: - // FIXME - break; - - default: - OSMO_ASSERT(false); - } -} - -#define S(x) (1 << (x)) - -static const struct osmo_fsm_state up_peer_fsm_states[] = { - [UP_PEER_ST_NOT_ASSOCIATED] = { - .name = "not_associated", - .in_event_mask = 0 - | S(UP_PEER_EV_RX_ASSOC_SETUP_REQ) - , - .out_state_mask = 0 - | S(UP_PEER_ST_ASSOCIATED) - , - .action = up_peer_not_associated_action, - }, - [UP_PEER_ST_ASSOCIATED] = { - .name = "associated", - .in_event_mask = 0 - | S(UP_PEER_EV_RX_ASSOC_UPD_REQ) - | S(UP_PEER_EV_RX_SESSION_EST_REQ) - | S(UP_PEER_EV_HEARTBEAT_FAILURE) - , - .out_state_mask = 0 - | S(UP_PEER_ST_GRACEFUL_RELEASE) - , - .onenter = up_peer_associated_onenter, - .action = up_peer_associated_action, - }, - [UP_PEER_ST_GRACEFUL_RELEASE] = { - .name = "graceful_release", - .in_event_mask = 0 - | S(UP_PEER_EV_HEARTBEAT_FAILURE) - , - .out_state_mask = 0 - , - .onenter = up_peer_graceful_release_onenter, - .action = up_peer_graceful_release_action, - }, -}; - -static struct osmo_fsm up_peer_fsm = { - .name = "up_peer", - .states = up_peer_fsm_states, - .num_states = ARRAY_SIZE(up_peer_fsm_states), - .log_subsys = DSESSION, - .event_names = up_peer_fsm_event_names, - .timer_cb = up_peer_fsm_timer_cb, -}; - -static __attribute__((constructor)) void up_peer_fsm_register(void) -{ - OSMO_ASSERT(osmo_fsm_register(&up_peer_fsm) == 0); -} -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/40539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I90e37581748e73d89d38581174ec209a72fc6535 Gerrit-Change-Number: 40539 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 0

[M] Change in libosmo-abis[master]: ipaccess: Use osmo_stream APIs to set TCP keepalive pars
by osmith 26 Jun '25

26 Jun '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40537?usp=email ) Change subject: ipaccess: Use osmo_stream APIs to set TCP keepalive pars ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40537?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I91deef49563bcec51e1e1eaceec6c1eedc708529 Gerrit-Change-Number: 40537 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 13:27:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-abis[master]: ipaccess: No need to apply TCP_NODELAY manually
by osmith 26 Jun '25

26 Jun '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40536?usp=email ) Change subject: ipaccess: No need to apply TCP_NODELAY manually ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40536?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic6cb1457998ad0c131859be04e86cc7935217361 Gerrit-Change-Number: 40536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 13:22:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in docker-playground[master]: ttcn3-gbproxy-test: run with titan 9.0.0
by osmith 26 Jun '25

26 Jun '25

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/40538?usp=email ) Change subject: ttcn3-gbproxy-test: run with titan 9.0.0 ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: https://jenkins.osmocom.org/jenkins/job/ttcn3-gbproxy-test-fr/1669/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40538?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e66104e48470eb96848ae6b9b64cb26563d2744 Gerrit-Change-Number: 40538 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 13:10:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in ...osmo-s1gw[master]: enft_kpi: flush the table on init
by fixeria 26 Jun '25

26 Jun '25

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?usp=email ) Change subject: enft_kpi: flush the table on init ...................................................................... Patch Set 1: (1 comment) File src/enft_kpi.erl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532/comment/104f1540_5057… : PS1, Line 515: nft_exec(Cmds). > you should probably be deleting the rules filtering the traffic towards table TName too? […] The rules, just like anything else (e.g. counters), are pare of that table. Thus by deleting the table we delete everything. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I96bf4f7b6d5c9104fad0d6f98eda56e7a4e4fa7d Gerrit-Change-Number: 40532 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 12:39:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in docker-playground[master]: ttcn3-gbproxy-test: run with titan 9.0.0
by pespin 26 Jun '25

26 Jun '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/40538?usp=email ) Change subject: ttcn3-gbproxy-test: run with titan 9.0.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40538?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e66104e48470eb96848ae6b9b64cb26563d2744 Gerrit-Change-Number: 40538 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 12:36:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in docker-playground[master]: ttcn3-gbproxy-test: run with titan 9.0.0
by osmith 26 Jun '25

26 Jun '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/40538?usp=email ) Change subject: ttcn3-gbproxy-test: run with titan 9.0.0 ...................................................................... ttcn3-gbproxy-test: run with titan 9.0.0 Some of the tests don't work with titan 11.1.0. Run the testsuite with the previous titan version 9.0.0 for now. The ttcn3-gbproxy-test-fr is still running with docker-playground, using the ttcn3-gbproxy-test container. Related: OS#6800 Change-Id: I1e66104e48470eb96848ae6b9b64cb26563d2744 --- M common/ttcn3-docker-prepare.sh M common/ttcn3-docker-run.sh M debian-bookworm-titan/Dockerfile M ttcn3-gbproxy-test/Dockerfile 4 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/38/40538/1 diff --git a/common/ttcn3-docker-prepare.sh b/common/ttcn3-docker-prepare.sh index ef684be..1da1c58 100755 --- a/common/ttcn3-docker-prepare.sh +++ b/common/ttcn3-docker-prepare.sh @@ -1,4 +1,9 @@ #!/bin/sh -e +if [ -n "$TITAN_VERSION" ]; then + export TTCN3_DIR="/opt/eclipse-titan-$TITAN_VERSION" + export PATH="$TTCN3_DIR/bin:$PATH" +fi + if [ $# -lt 2 ]; then echo echo "usage: ttcn3-docker-prepare OSMO_TTCN3_BRANCH PROJECT [PROJECT ...]" diff --git a/common/ttcn3-docker-run.sh b/common/ttcn3-docker-run.sh index c8c871e..d22290d 100755 --- a/common/ttcn3-docker-run.sh +++ b/common/ttcn3-docker-run.sh @@ -1,4 +1,9 @@ #!/bin/bash +if [ -n "$TITAN_VERSION" ]; then + export TTCN3_DIR="/opt/eclipse-titan-$TITAN_VERSION" + export PATH="$TTCN3_DIR/bin:$PATH" +fi + if [ $# -lt 2 ]; then echo echo "usage: ttcn3-docker-run SUBDIR SUITE" diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile index 0ce6c43..62514b7 100644 --- a/debian-bookworm-titan/Dockerfile +++ b/debian-bookworm-titan/Dockerfile @@ -59,7 +59,9 @@ RUN git config --global user.email docker(a)dock.er && \ git config --global user.name "Dock Er" -# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes +# Add eclipse-titan (latest version we use) from osmocom:latest, as well as +# version 9.0.0 for testsuites that still need it (OS#6800). Invalidate cache +# when :latest changes. RUN echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc] $OSMOCOM_REPO ./" \ > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release @@ -67,6 +69,7 @@ apt-get update && \ apt-get install -y --no-install-recommends \ eclipse-titan \ + eclipse-titan-optdir-9.0.0 \ && \ apt-get clean diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 1026180..be79ae7 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -3,6 +3,9 @@ FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" +# Some tests fail with titan 11.1.0 (OS#6800) +ENV TITAN_VERSION=9.0.0 + ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" gbproxy -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40538?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e66104e48470eb96848ae6b9b64cb26563d2744 Gerrit-Change-Number: 40538 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in libosmo-abis[master]: ipaccess: No need to apply TCP_NODELAY manually
by pespin 26 Jun '25

26 Jun '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40536?usp=email ) Change subject: ipaccess: No need to apply TCP_NODELAY manually ...................................................................... ipaccess: No need to apply TCP_NODELAY manually This is already done by osmo_stream_srv_link_set_nodelay() and osmo_stream_cli_set_nodelay() APIs during stream creation. Related: OS#6637 Change-Id: Ic6cb1457998ad0c131859be04e86cc7935217361 --- M src/input/ipaccess.c 1 file changed, 37 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/36/40536/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 44ec719..10dec22 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -624,50 +624,46 @@ int ret; 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 */ - val = 1; - ret = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)); - if (ret < 0) - LOGPIL(line, DLINP, LOGL_ERROR, "Failed to enable TCP keepalive: %s\n", strerror(errno)); - else - LOGPIL(line, DLINP, LOGL_NOTICE, "TCP Keepalive is enabled\n"); + if (line->keepalive_num_probes == 0) + return; - 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); - LOGPIL(line, 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! */ - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle_val, sizeof(idle_val)); - if (ret < 0) { - LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive idle time: %s\n", - strerror(errno)); - } - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &interval_val, sizeof(interval_val)); - if (ret < 0) { - LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive interval: %s\n", - strerror(errno)); - } - ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &retry_count_val, sizeof(retry_count_val)); - if (ret < 0) - LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive count: %s\n", strerror(errno)); - ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &user_timeout_val, sizeof(user_timeout_val)); - if (ret < 0) - LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP user timeout: %s\n", strerror(errno)); - } - + /* Enable TCP keepalive to find out if the connection is gone */ val = 1; - ret = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)); + ret = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)); if (ret < 0) - LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP_NODELAY: %s\n", strerror(errno)); + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to enable TCP keepalive: %s\n", strerror(errno)); + else + LOGPIL(line, 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); + LOGPIL(line, 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! */ + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle_val, sizeof(idle_val)); + if (ret < 0) { + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive idle time: %s\n", + strerror(errno)); + } + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &interval_val, sizeof(interval_val)); + if (ret < 0) { + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive interval: %s\n", + strerror(errno)); + } + ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &retry_count_val, sizeof(retry_count_val)); + if (ret < 0) + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive count: %s\n", strerror(errno)); + ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &user_timeout_val, sizeof(user_timeout_val)); + if (ret < 0) + LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP user timeout: %s\n", strerror(errno)); } /* callback of the OML listening filedescriptor */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40536?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic6cb1457998ad0c131859be04e86cc7935217361 Gerrit-Change-Number: 40536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log