June 2025 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites: add email parameter

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40483?usp=email ) Change subject: jobs/ttcn3-testsuites: add email parameter ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9385f553196ac8d1ac1bfb05735ed937da67b7b4 Gerrit-Change-Number: 40483 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: Wed, 18 Jun 2025 11:12:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

5 days, 15 hours

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3-…-testenv: add TESTENV ARGS parameter

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40482?usp=email ) Change subject: jobs/ttcn3-…-testenv: add TESTENV_ARGS parameter ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40482?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2a07319ee26ac497eff2853329a002cdb09f75b4 Gerrit-Change-Number: 40482 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jun 2025 11:12:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

5 days, 15 hours

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites: add email parameter

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40483?usp=email ) Change subject: jobs/ttcn3-testsuites: add email parameter ...................................................................... jobs/ttcn3-testsuites: add email parameter Change-Id: I9385f553196ac8d1ac1bfb05735ed937da67b7b4 --- M jobs/ttcn3-testsuites.yml 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/83/40483/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 9e0d026..3202212 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -88,6 +88,10 @@ Branch of <code>docker-playground.git</code>. Only modify if you are hacking on the docker-playground scripts. default: 'master' + - string: + name: EMAIL_NOTIFICATIONS + description: For failed build notifications, set to empty to disable + default: '{obj:email}' builders: - shell: |- export REGISTRY_HOST="registry.osmocom.org" @@ -166,7 +170,7 @@ allow-empty-results: false - email: notify-every-unstable-build: false - recipients: '{obj:email}' + recipients: '$EMAIL_NOTIFICATIONS' send-to-individuals: false - archive: allow-empty: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9385f553196ac8d1ac1bfb05735ed937da67b7b4 Gerrit-Change-Number: 40483 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

5 days, 16 hours

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3-…-testenv: add TESTENV ARGS parameter

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40482?usp=email ) Change subject: jobs/ttcn3-…-testenv: add TESTENV_ARGS parameter ...................................................................... jobs/ttcn3-…-testenv: add TESTENV_ARGS parameter Change-Id: I2a07319ee26ac497eff2853329a002cdb09f75b4 --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 15 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/82/40482/1 diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index a79ded0..609a215 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -142,23 +142,23 @@ - ttcn3-ggsn-test: # ~15 min testsuite: ggsn - args: -b osmocom:nightly -c 'osmo_ggsn_*' + args: -b osmocom:nightly -c osmo_ggsn_* timer: H 10 * * * - ttcn3-ggsn-test-kernel: # ~10 min testsuite: ggsn - args: -b osmocom:nightly -c 'osmo_ggsn_v*_only' --debian-kernel + args: -b osmocom:nightly -c osmo_ggsn_v*_only --debian-kernel timer: H 10 * * * - ttcn3-ggsn-test-kernel-net-next: # ~10 min testsuite: ggsn - args: -b osmocom:nightly -c 'osmo_ggsn_v*_only' --custom-kernel + args: -b osmocom:nightly -c osmo_ggsn_v*_only --custom-kernel kernel: net-next timer: H 10 * * * - ttcn3-ggsn-test-kernel-torvalds: # ~10 min testsuite: ggsn - args: -b osmocom:nightly -c 'osmo_ggsn_v*_only' --custom-kernel + args: -b osmocom:nightly -c osmo_ggsn_v*_only --custom-kernel kernel: torvalds timer: H 10 * * * @@ -309,23 +309,23 @@ - ttcn3-ggsn-test-latest: # ~15 min testsuite: ggsn - args: -b osmocom:latest -c 'osmo_ggsn_*' + args: -b osmocom:latest -c osmo_ggsn_* timer: H 12 * * * - ttcn3-ggsn-test-kernel-latest: # ~10 min testsuite: ggsn - args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --debian-kernel + args: -b osmocom:latest -c osmo_ggsn_v*_only --debian-kernel timer: H 12 * * * - ttcn3-ggsn-test-kernel-latest-net-next: # ~10 min testsuite: ggsn - args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --custom-kernel + args: -b osmocom:latest -c osmo_ggsn_v*_only --custom-kernel kernel: net-next timer: H 12 * * * - ttcn3-ggsn-test-kernel-latest-torvalds: # ~10 min testsuite: ggsn - args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --custom-kernel + args: -b osmocom:latest -c osmo_ggsn_v*_only --custom-kernel kernel: torvalds timer: H 12 * * * @@ -479,7 +479,7 @@ - ttcn3-ggsn-test-asan: # ~15 min testsuite: ggsn - args: -b osmocom:nightly:asan -c 'osmo_ggsn_*' + args: -b osmocom:nightly:asan -c osmo_ggsn_* timer: H 16 * * * - ttcn3-stp-test-asan: # ~10 min @@ -566,6 +566,11 @@ Branch of <code>osmo-ttcn3-hacks.git</code> default: 'master' - string: + name: TESTENV_ARGS + description: | + Additional arguments to <code>./testenv.py --podman</code> + default: '{obj:args}' + - string: name: EMAIL_NOTIFICATIONS description: For failed build notifications, set to empty to disable default: '{obj:email}' @@ -610,7 +615,7 @@ --cache "$PWD"/_cache \ --ccache ~/ccache/testenv \ --log-dir "$PWD"/logs \ - {args}; then + $TESTENV_ARGS; then RC=1 fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40482?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2a07319ee26ac497eff2853329a002cdb09f75b4 Gerrit-Change-Number: 40482 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

5 days, 16 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp: Introduce support to configure and enable TCP keep-alive

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?usp=email ) Change subject: asp: Introduce support to configure and enable TCP keep-alive ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I2a9338053e741fb6dab94492c6bdc2badaf7afb1 Gerrit-Change-Number: 40481 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: Wed, 18 Jun 2025 08:40:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

5 days, 18 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp,xua_srv: Apply SCTP sockopts only on SCTP osckets

by osmith

Attention is currently required from: daniel, fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40480?usp=email ) Change subject: asp,xua_srv: Apply SCTP sockopts only on SCTP osckets ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/ss7_xua_srv.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40480/comment/cddbdd65_f912b… : PS1, Line 328: applyng ```suggestion LOGP(DLSS7, LOGL_NOTICE, "Failed applying %s Server SCTP INIT parameters\n", proto); ``` And maybe LOGL_ERROR? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I013c51efd03a3f5561bf9849c8841b1c7e66c172 Gerrit-Change-Number: 40480 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jun 2025 08:30:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

5 days, 18 hours

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Support configuring TCP_USER_TIMEOUT parameter

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40479?usp=email ) Change subject: stream: Support configuring TCP_USER_TIMEOUT parameter ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I22c7df92b463cf4ca82854a12ec24337d53e8b20 Gerrit-Change-Number: 40479 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: Wed, 18 Jun 2025 08:23:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

5 days, 18 hours

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Support configuring TCP keep-alive pars

by osmith

Attention is currently required from: daniel, fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40478?usp=email ) Change subject: stream: Support configuring TCP keep-alive pars ...................................................................... Patch Set 1: Code-Review+1 (3 comments) File src/stream_cli.c: https://gerrit.osmocom.org/c/libosmo-netif/+/40478/comment/5b9d1dbf_5b7166e… : PS1, Line 1542: keelapive ```suggestion /* TCP keepalive params: */ ``` File src/stream_srv.c: https://gerrit.osmocom.org/c/libosmo-netif/+/40478/comment/7289fcf7_86774ff… : PS1, Line 685: keelapive ```suggestion /* TCP keepalive params: */ ``` https://gerrit.osmocom.org/c/libosmo-netif/+/40478/comment/6bae1e40_ab1ccb0… : PS1, Line 1454: keelapive ```suggestion /* TCP keepalive params: */ ``` -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40478?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie748ad581c1c42f4c24f9409ce7d34d419cbca8b Gerrit-Change-Number: 40478 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Jun 2025 08:21:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

5 days, 18 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp: Introduce support to configure and enable TCP keep-alive

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?usp=email ) Change subject: asp: Introduce support to configure and enable TCP keep-alive ...................................................................... asp: Introduce support to configure and enable TCP keep-alive Depends: libosmo-netif.git Change-Id Ie748ad581c1c42f4c24f9409ce7d34d419cbca8b Change-Id: I2a9338053e741fb6dab94492c6bdc2badaf7afb1 --- M TODO-RELEASE M src/ss7_asp.c M src/ss7_asp.h M src/ss7_asp_vty.c M src/ss7_xua_srv.c M tests/vty/osmo_stp_test.vty 6 files changed, 197 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/81/40481/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..2d94ad1 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-netif >1.6.0 stream OSMO_STREAM_{CLI,SRV}_TCP_SOCKOPT_KEEP* diff --git a/src/ss7_asp.c b/src/ss7_asp.c index d7e9b12..1383f32 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -227,6 +227,77 @@ }; static unsigned int g_ss7_asp_rcg_idx; +int ss7_asp_apply_tcp_keepalive(const struct osmo_ss7_asp *asp) +{ + uint8_t byte = 1; + int val; + int rc; + + if (!asp->cfg.tcp.keepalive_enable) + return 0; + + LOGPASP(asp, DLSS7, LOGL_DEBUG, "Enabling TCP keep-alive\n"); + + if (asp->server) { + rc = osmo_stream_srv_set_param(asp->server, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPALIVE, + &byte, sizeof(byte)); + if (rc < 0) + return rc; + + if (asp->cfg.tcp.keepalive_time_present) { + val = asp->cfg.tcp.keepalive_time_value; + rc = osmo_stream_srv_set_param(asp->server, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPIDLE, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + if (asp->cfg.tcp.keepalive_intvl_present) { + val = asp->cfg.tcp.keepalive_intvl_value; + rc = osmo_stream_srv_set_param(asp->server, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPINTVL, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + if (asp->cfg.tcp.keepalive_probes_present) { + val = asp->cfg.tcp.keepalive_probes_value; + rc = osmo_stream_srv_set_param(asp->server, OSMO_STREAM_SRV_PAR_TCP_SOCKOPT_KEEPCNT, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + + } else if (asp->client) { + rc = osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPALIVE, + &byte, sizeof(byte)); + if (rc < 0) + return rc; + + if (asp->cfg.tcp.keepalive_time_present) { + val = asp->cfg.tcp.keepalive_time_value; + rc = osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPIDLE, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + if (asp->cfg.tcp.keepalive_intvl_present) { + val = asp->cfg.tcp.keepalive_intvl_value; + rc = osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPINTVL, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + if (asp->cfg.tcp.keepalive_probes_present) { + val = asp->cfg.tcp.keepalive_probes_value; + rc = osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_TCP_SOCKOPT_KEEPCNT, + &val, sizeof(val)); + if (rc < 0) + return rc; + } + } + + return 0; +} + int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx) { const char *new_loc_addr; @@ -721,8 +792,16 @@ } osmo_stream_cli_set_data(asp->client, asp); - if (asp->cfg.trans_proto == IPPROTO_SCTP) - asp_client_apply_sctp_init_pars(asp); + switch (asp->cfg.trans_proto) { + case IPPROTO_TCP: + rc = ss7_asp_apply_tcp_keepalive(asp); + break; + case IPPROTO_SCTP: + rc = asp_client_apply_sctp_init_pars(asp); + break; + default: + OSMO_ASSERT(0); + } rc = osmo_stream_cli_open(asp->client); return rc; diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 889b5c9..00c6825 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -130,6 +130,16 @@ uint16_t max_init_timeo_value; /* ms */ } sctp_init; + struct { + bool keepalive_enable; + bool keepalive_time_present; + bool keepalive_intvl_present; + bool keepalive_probes_present; + int keepalive_time_value; /* seconds */ + int keepalive_intvl_value; /* seconds */ + int keepalive_probes_value; + } tcp; + /*! The underlaying transport protocol (one of IPPROTO_*) */ int trans_proto; } cfg; @@ -143,6 +153,7 @@ int ss7_asp_get_fd(const struct osmo_ss7_asp *asp); int ss7_asp_disconnect_stream(struct osmo_ss7_asp *asp); +int ss7_asp_apply_tcp_keepalive(const struct osmo_ss7_asp *asp); int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx); diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 3e22465..572b31d 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -445,6 +445,81 @@ return CMD_SUCCESS; } +#define ASP_TCP_PARAM_KEEPALIVE_DESC \ + "Configure TCP parameters\n" \ + "Configure TCP keep-alive related parameters\n" \ + +DEFUN_ATTR(asp_tcp_param_keepalive_enabled, asp_tcp_param_keepalive_enabled_cmd, + "tcp-param keepalive enabled", + ASP_TCP_PARAM_KEEPALIVE_DESC + "Enable TCP keep-alive\n", + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + asp->cfg.tcp.keepalive_enable = true; + return CMD_SUCCESS; +} + +DEFUN_ATTR(asp_no_tcp_param_keepalive, asp_no_tcp_param_keepalive_cmd, + "no tcp-param keepalive", + NO_STR ASP_TCP_PARAM_KEEPALIVE_DESC, + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + asp->cfg.tcp.keepalive_enable = false; + return CMD_SUCCESS; +} + +#define ASP_TCP_PARAM_KEEPALIVE_CFG_DESC \ + ASP_TCP_PARAM_KEEPALIVE_DESC \ + "Configure number of seconds a connection needs to be idle before beggining to send probes\n" \ + "Configure number of seconds between probes\n" \ + "Configure max number of probes to send before giving up if no response is obtained\n" +#define ASP_TCP_PARAM_KEEPALIVE_CFG_FIELDS "(time|intvl|probes)" + +DEFUN_ATTR(asp_tcp_param_keepalive_cfg, asp_tcp_param_keepalive_cfg_cmd, + "tcp-param keepalive " ASP_TCP_PARAM_KEEPALIVE_CFG_FIELDS " <0-65535>", + ASP_TCP_PARAM_KEEPALIVE_CFG_DESC + "Value of the parameter\n", + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + + uint16_t val = atoi(argv[1]); + + if (strcmp(argv[0], "time") == 0) { + asp->cfg.tcp.keepalive_time_present = true; + asp->cfg.tcp.keepalive_time_value = val; + } else if (strcmp(argv[0], "intvl") == 0) { + asp->cfg.tcp.keepalive_intvl_present = true; + asp->cfg.tcp.keepalive_intvl_value = val; + } else if (strcmp(argv[0], "probes") == 0) { + asp->cfg.tcp.keepalive_probes_present = true; + asp->cfg.tcp.keepalive_probes_value = val; + } else { + OSMO_ASSERT(0); + } + return CMD_SUCCESS; +} + +DEFUN_ATTR(asp_no_tcp_param_keepalive_cfg, asp_no_tcp_param_keepalive_cfg_cmd, + "no tcp-param keepalive " ASP_TCP_PARAM_KEEPALIVE_CFG_FIELDS, + NO_STR ASP_TCP_PARAM_KEEPALIVE_CFG_DESC, + CMD_ATTR_NODE_EXIT) +{ + struct osmo_ss7_asp *asp = vty->index; + + if (strcmp(argv[0], "num-ostreams") == 0) + asp->cfg.tcp.keepalive_time_present = false; + else if (strcmp(argv[0], "max-instreams") == 0) + asp->cfg.tcp.keepalive_intvl_present = false; + else if (strcmp(argv[0], "max-attempts") == 0) + asp->cfg.tcp.keepalive_probes_present = false; + else + OSMO_ASSERT(0); + return CMD_SUCCESS; +} + DEFUN_ATTR(asp_block, asp_block_cmd, "block", "Allows a SCTP Association with ASP, but doesn't let it become active\n", @@ -1141,6 +1216,19 @@ vty_out(vty, " sctp-param init max-attempts %u%s", asp->cfg.sctp_init.max_attempts_value, VTY_NEWLINE); if (asp->cfg.sctp_init.max_init_timeo_present) vty_out(vty, " sctp-param init timeout %u%s", asp->cfg.sctp_init.max_init_timeo_value, VTY_NEWLINE); + + if (asp->cfg.tcp.keepalive_enable) { + vty_out(vty, " tcp-param keepalive enabled%s", VTY_NEWLINE); + if (asp->cfg.tcp.keepalive_time_present) + vty_out(vty, " tcp-param keepalive time %d%s", asp->cfg.tcp.keepalive_time_value, VTY_NEWLINE); + if (asp->cfg.tcp.keepalive_intvl_present) + vty_out(vty, " tcp-param keepalive intvl %d%s", asp->cfg.tcp.keepalive_intvl_value, VTY_NEWLINE); + if (asp->cfg.tcp.keepalive_probes_present) + vty_out(vty, " tcp-param keepalive probes %d%s", asp->cfg.tcp.keepalive_probes_value, VTY_NEWLINE); + } else if (asp->cfg.trans_proto == IPPROTO_TCP) { + vty_out(vty, " no tcp-param keepalive%s", VTY_NEWLINE); + } + for (i = 0; i < sizeof(uint32_t) * 8; i++) { if (!(asp->cfg.quirks & ((uint32_t) 1 << i))) continue; @@ -1226,6 +1314,10 @@ install_lib_element(L_CS7_ASP_NODE, &asp_sctp_role_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_sctp_param_init_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_sctp_param_init_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_tcp_param_keepalive_enabled_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_tcp_param_keepalive_cfg_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_no_tcp_param_keepalive_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_no_tcp_param_keepalive_cfg_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_quirk_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_quirk_cmd); gen_asp_timer_xua_cmd_strs(&asp_timer_xua_cmd); diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index cd937d2..d7806aa 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -191,9 +191,14 @@ * data */ osmo_stream_srv_set_data(srv, asp); - if (asp->cfg.trans_proto == IPPROTO_SCTP) { + switch (asp->cfg.trans_proto) { + case IPPROTO_TCP: + rc = ss7_asp_apply_tcp_keepalive(asp); + break; + case IPPROTO_SCTP: rc = ss7_asp_apply_peer_primary_address(asp); rc = ss7_asp_apply_primary_address(asp); + break; } /* send M-SCTP_ESTABLISH.ind to Layer Manager */ diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index be2beb5..b89bb30 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -283,6 +283,10 @@ transport-role (client|server) sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) <0-65535> no sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) + tcp-param keepalive enabled + tcp-param keepalive (time|intvl|probes) <0-65535> + no tcp-param keepalive + no tcp-param keepalive (time|intvl|probes) quirk (no_notify|daud_in_asp|snm_inactive) no quirk (no_notify|daud_in_asp|snm_inactive) timer xua (ack|beat) <1-999999> @@ -302,6 +306,7 @@ role Specify the xUA role for this ASP transport-role Specify the transport layer role for this ASP sctp-param Configure SCTP parameters + tcp-param Configure TCP parameters quirk Enable quirk to work around interop issues timer Configure ASP default timer values block Allows a SCTP Association with ASP, but doesn't let it become active @@ -311,6 +316,7 @@ OsmoSTP(config-cs7-asp)# no ? ... sctp-param Configure SCTP parameters + tcp-param Configure TCP parameters quirk Disable quirk to work around interop issues shutdown Terminates SCTP association; New associations will be rejected ... -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I2a9338053e741fb6dab94492c6bdc2badaf7afb1 Gerrit-Change-Number: 40481 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 days, 10 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp,xua_srv: Apply SCTP sockopts only on SCTP osckets

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40480?usp=email ) Change subject: asp,xua_srv: Apply SCTP sockopts only on SCTP osckets ...................................................................... asp,xua_srv: Apply SCTP sockopts only on SCTP osckets Otherwise if user somehow configured those paremeters over VTY, they would end up trying to be applied and most probably fail. Take the chance to split that really specific code to helper functions to sanitize a bit some lifecycle code paths. Change-Id: I013c51efd03a3f5561bf9849c8841b1c7e66c172 --- M src/ss7_asp.c M src/ss7_xua_srv.c 2 files changed, 58 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/80/40480/1 diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 71e5627..d7e9b12 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -416,6 +416,34 @@ } } +static int asp_client_apply_sctp_init_pars(struct osmo_ss7_asp *asp) +{ + uint8_t byte; + + OSMO_ASSERT(asp->client); + byte = 1; /*AUTH is needed by ASCONF. enable, don't abort socket creation if AUTH can't be enabled */ + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, &byte, sizeof(byte)); + byte = 1; /* enable, don't abort socket creation if ASCONF can't be enabled */ + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, &byte, sizeof(byte)); + if (asp->cfg.sctp_init.num_ostreams_present) + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_NUM_OSTREAMS, + &asp->cfg.sctp_init.num_ostreams_value, + sizeof(asp->cfg.sctp_init.num_ostreams_value)); + if (asp->cfg.sctp_init.max_instreams_present) + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_INSTREAMS, + &asp->cfg.sctp_init.max_instreams_value, + sizeof(asp->cfg.sctp_init.max_instreams_value)); + if (asp->cfg.sctp_init.max_attempts_present) + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_ATTEMPTS, + &asp->cfg.sctp_init.max_attempts_value, + sizeof(asp->cfg.sctp_init.max_attempts_value)); + if (asp->cfg.sctp_init.max_init_timeo_present) + osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_TIMEOUT, + &asp->cfg.sctp_init.max_init_timeo_value, + sizeof(asp->cfg.sctp_init.max_init_timeo_value)); + return 0; +} + /* Set default values for local and remote peer hosts if they are not yet set. * \param[in] asp ASP for which to set default hosts. * \returns true if values where changed, false otherwise. @@ -650,7 +678,6 @@ static int ss7_asp_start_client(struct osmo_ss7_asp *asp) { - uint8_t byte; int rc; if (!asp->client) @@ -693,26 +720,10 @@ break; } osmo_stream_cli_set_data(asp->client, asp); - byte = 1; /*AUTH is needed by ASCONF. enable, don't abort socket creation if AUTH can't be enabled */ - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, &byte, sizeof(byte)); - byte = 1; /* enable, don't abort socket creation if ASCONF can't be enabled */ - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, &byte, sizeof(byte)); - if (asp->cfg.sctp_init.num_ostreams_present) - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_NUM_OSTREAMS, - &asp->cfg.sctp_init.num_ostreams_value, - sizeof(asp->cfg.sctp_init.num_ostreams_value)); - if (asp->cfg.sctp_init.max_instreams_present) - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_INSTREAMS, - &asp->cfg.sctp_init.max_instreams_value, - sizeof(asp->cfg.sctp_init.max_instreams_value)); - if (asp->cfg.sctp_init.max_attempts_present) - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_ATTEMPTS, - &asp->cfg.sctp_init.max_attempts_value, - sizeof(asp->cfg.sctp_init.max_attempts_value)); - if (asp->cfg.sctp_init.max_init_timeo_present) - osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_INIT_TIMEOUT, - &asp->cfg.sctp_init.max_init_timeo_value, - sizeof(asp->cfg.sctp_init.max_init_timeo_value)); + + if (asp->cfg.trans_proto == IPPROTO_SCTP) + asp_client_apply_sctp_init_pars(asp); + rc = osmo_stream_cli_open(asp->client); return rc; } diff --git a/src/ss7_xua_srv.c b/src/ss7_xua_srv.c index 893797a..cd937d2 100644 --- a/src/ss7_xua_srv.c +++ b/src/ss7_xua_srv.c @@ -281,6 +281,28 @@ local_port, local_host); } +static int ss7_xua_srv_apply_sctp_init_pars(struct osmo_xua_server *xs) +{ + uint8_t byte; + OSMO_ASSERT(xs->server); + + byte = 1; /*AUTH is needed by ASCONF. enable, don't abort socket creation if AUTH can't be enabled */ + osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, + &byte, sizeof(byte)); + byte = 1; /* enable, don't abort socket creation if ASCONF can't be enabled */ + osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, + &byte, sizeof(byte)); + if (xs->cfg.sctp_init.num_ostreams_present) + osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_NUM_OSTREAMS, + &xs->cfg.sctp_init.num_ostreams_value, + sizeof(xs->cfg.sctp_init.num_ostreams_value)); + if (xs->cfg.sctp_init.max_instreams_present) + osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_MAX_INSTREAMS, + &xs->cfg.sctp_init.max_instreams_value, + sizeof(xs->cfg.sctp_init.max_instreams_value)); + return 0; +} + /*! \brief Set the xUA server to bind/listen to the currently configured ip/port * \param[in] xs xUA server to operate * \returns 0 on success, negative value on error. @@ -290,7 +312,6 @@ { char buf[512]; int rc; - uint8_t byte; const char *proto = get_value_string(osmo_ss7_asp_protocol_vals, xs->cfg.proto); rc = ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local); @@ -302,18 +323,10 @@ } /* Applying xUA Server config which may have changed through VTY on the srv_link before opening it: */ - byte = 1; /*AUTH is needed by ASCONF. enable, don't abort socket creation if AUTH can't be enabled */ - osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, &byte, sizeof(byte)); - byte = 1; /* enable, don't abort socket creation if ASCONF can't be enabled */ - osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, &byte, sizeof(byte)); - if (xs->cfg.sctp_init.num_ostreams_present) - osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_NUM_OSTREAMS, - &xs->cfg.sctp_init.num_ostreams_value, - sizeof(xs->cfg.sctp_init.num_ostreams_value)); - if (xs->cfg.sctp_init.max_instreams_present) - osmo_stream_srv_link_set_param(xs->server, OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_MAX_INSTREAMS, - &xs->cfg.sctp_init.max_instreams_value, - sizeof(xs->cfg.sctp_init.max_instreams_value)); + if (xs->cfg.trans_proto == IPPROTO_SCTP) { + if ((rc = ss7_xua_srv_apply_sctp_init_pars(xs)) < 0) + LOGP(DLSS7, LOGL_NOTICE, "Failed applyng %s Server SCTP INIT parameters\n", proto); + } return osmo_stream_srv_link_open(xs->server); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I013c51efd03a3f5561bf9849c8841b1c7e66c172 Gerrit-Change-Number: 40480 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 days, 10 hours

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025