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

[L] Change in pysim[master]: smdpp: add proper tls support, cert generation FOR TESTING

by Hoernchen

Attention is currently required from: Hoernchen, dexter, laforge. Hello Jenkins Builder, dexter, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40464?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by dexter, Code-Review+1 by laforge, Verified+1 by Jenkins Builder, Verified+1 by dexter Change subject: smdpp: add proper tls support, cert generation FOR TESTING ...................................................................... smdpp: add proper tls support, cert generation FOR TESTING If TLS is enabled (default) it will automagically generate missing pem files + dh params. A faithful reproduction of the certs found in SGP.26_v1.5_Certificates_18_07_2024.zip available at https://www.gsma.com/solutions-and-impact/technologies/esim/gsma_resources/… can be generated by running contrib/generate_certs.py. This allows adjusting the expiry dates, CA flag, and other parameters FOR TESTING. Certs can be used by the smdpp by running $ python -u osmo-smdpp.py -c generated Change-Id: I84b2666422b8ff565620f3827ef4d4d7635a21be --- M .gitignore A contrib/generate_smdpp_certs.py M osmo-smdpp.py A smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_BRP.pem A smdpp-data/sm-dp-sessions-BRP A smdpp-data/sm-dp-sessions-NIST 6 files changed, 719 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/40464/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40464?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I84b2666422b8ff565620f3827ef4d4d7635a21be Gerrit-Change-Number: 40464 Gerrit-PatchSet: 6 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: smdpp: verify cert chain

by Hoernchen

Attention is currently required from: Hoernchen, dexter. Hello Jenkins Builder, dexter, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40469?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder, Verified+1 by dexter The change is no longer submittable: Verified is unsatisfied now. Change subject: smdpp: verify cert chain ...................................................................... smdpp: verify cert chain Change-Id: I1e4e4b1b032dc6a8b7d15bd80d533a50fe0cff15 --- M osmo-smdpp.py 1 file changed, 20 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/69/40469/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40469?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1e4e4b1b032dc6a8b7d15bd80d533a50fe0cff15 Gerrit-Change-Number: 40469 Gerrit-PatchSet: 6 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[M] Change in pysim[master]: smdpp: less verbose by default

by Hoernchen

Attention is currently required from: Hoernchen, dexter, laforge. Hello Jenkins Builder, dexter, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40468?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+2 by dexter, Code-Review+2 by laforge, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: smdpp: less verbose by default ...................................................................... smdpp: less verbose by default Those data blobs are huge. Change-Id: I04a72b8f52417862d4dcba1f0743700dd942ef49 --- M osmo-smdpp.py M pySim/esim/bsp.py M pySim/esim/es8p.py 3 files changed, 61 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/68/40468/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40468?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I04a72b8f52417862d4dcba1f0743700dd942ef49 Gerrit-Change-Number: 40468 Gerrit-PatchSet: 6 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv/podman_install: fix regex warning

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40522?usp=email ) Change subject: testenv/podman_install: fix regex warning ...................................................................... testenv/podman_install: fix regex warning Fix for the following warning with Python 3.12.3: …/testenv/podman_install.py:120: SyntaxWarning: invalid escape sequence '\d' pattern = re.compile("^\d+\.\d+\.\d+$") Change-Id: I33ef4e16f3d3e4fa627f726d6fddd950b7826620 --- M _testenv/testenv/podman_install.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/40522/1 diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index adc2d70..9f40388 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -117,7 +117,7 @@ if testenv.args.binary_repo.endswith(":latest"): ls_remote = testenv.cmd.run(["git", "ls-remote", "--tags", url], capture_output=True, text=True, no_podman=True) tags = [] - pattern = re.compile("^\d+\.\d+\.\d+$") + pattern = re.compile("^\\d+\\.\\d+\\.\\d+$") for line in ls_remote.stdout.split("\n"): if "refs/tags/" in line: tag = line.split("refs/tags/")[1].split("^")[0] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40522?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I33ef4e16f3d3e4fa627f726d6fddd950b7826620 Gerrit-Change-Number: 40522 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: xua_snm.c: Fix wrong PC value passed in MTP-{PAUSE,RESUME} towards SCCP

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40487?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: xua_snm.c: Fix wrong PC value passed in MTP-{PAUSE,RESUME} towards SCCP ...................................................................... xua_snm.c: Fix wrong PC value passed in MTP-{PAUSE,RESUME} towards SCCP Change-Id: I28bfb13744f2feb4adb610b341330725e2691a77 --- M src/xua_snm.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/xua_snm.c b/src/xua_snm.c index 3dd988f..079cd96 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -123,6 +123,8 @@ { int i; for (i = 0; i < num_aff_pc; i++) { + /* 32bit "Affected Point Code" consists of a 7-bit mask followed by 14/16/24-bit SS7 PC, + * see RFC 4666 3.4.1 */ uint32_t _aff_pc = ntohl(aff_pc[i]); uint32_t pc = _aff_pc & 0xffffff; uint8_t mask = _aff_pc >> 24; @@ -139,9 +141,9 @@ uint32_t fullpc; for (fullpc = (pc & ~maskbits); fullpc <= (pc | maskbits); fullpc++) { if (available) - sccp_scmg_rx_mtp_resume(sccp, pc); + sccp_scmg_rx_mtp_resume(sccp, fullpc); else - sccp_scmg_rx_mtp_pause(sccp, pc); + sccp_scmg_rx_mtp_pause(sccp, fullpc); } } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I28bfb13744f2feb4adb610b341330725e2691a77 Gerrit-Change-Number: 40487 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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, 200 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified 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..ca4a4c6 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -227,6 +227,80 @@ }; 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 time=%d intvl=%d probes=%d\n", + asp->cfg.tcp.keepalive_time_present ? asp->cfg.tcp.keepalive_time_value : -1, + asp->cfg.tcp.keepalive_intvl_present ? asp->cfg.tcp.keepalive_intvl_value : -1, + asp->cfg.tcp.keepalive_probes_present ? asp->cfg.tcp.keepalive_probes_value : -1); + + 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 +795,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: + (void)ss7_asp_apply_tcp_keepalive(asp); + break; + case IPPROTO_SCTP: + (void)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..534c1d9 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], "time") == 0) + asp->cfg.tcp.keepalive_time_present = false; + else if (strcmp(argv[0], "intvl") == 0) + asp->cfg.tcp.keepalive_intvl_present = false; + else if (strcmp(argv[0], "probes") == 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 120f165..b60acf6 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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I2a9338053e741fb6dab94492c6bdc2badaf7afb1 Gerrit-Change-Number: 40481 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

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

by pespin

Attention is currently required from: fixeria, laforge, osmith. pespin 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 4: Code-Review+2 (1 comment) Patchset: PS4: Re-adding votes after changing lines as requested. -- 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: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Jun 2025 17:26:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: Generate a version.h file

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/40514?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: I8460e85d50149f4bc58b6048e5596c5768010829 --- M .gitignore M include/osmocom/mgcp_client/Makefile.am A include/osmocom/mgcp_client/version.h.tpl 3 files changed, 35 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 3f1a890..71cd588 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ bscconfig.h bscconfig.h.in include/osmocom/mgcp_client/mgcp_common.h +include/osmocom/mgcp_client/version.h src/osmo-mgw/osmo-mgw *.*~ *.sw? diff --git a/include/osmocom/mgcp_client/Makefile.am b/include/osmocom/mgcp_client/Makefile.am index 90b1bd7..7415142 100644 --- a/include/osmocom/mgcp_client/Makefile.am +++ b/include/osmocom/mgcp_client/Makefile.am @@ -1,5 +1,6 @@ BUILT_SOURCES = \ mgcp_common.h \ + version.h \ $(NULL) noinst_HEADERS = \ @@ -11,4 +12,20 @@ echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of <osmocom/mgcp/mgcp_common.h>\n\n */" > mgcp_common.h cat $(top_srcdir)/include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h -CLEANFILES = mgcp_common.h +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + +CLEANFILES = \ + mgcp_common.h \ + version.h \ + $(NULL) diff --git a/include/osmocom/mgcp_client/version.h.tpl b/include/osmocom/mgcp_client/version.h.tpl new file mode 100644 index 0000000..db873af --- /dev/null +++ b/include/osmocom/mgcp_client/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_MGCP_CLIENT_VERSION {{VERSION}} +#define LIBOSMO_MGCP_CLIENT_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_MGCP_CLIENT_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_MGCP_CLIENT_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_MGCP_CLIENT_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_MGCP_CLIENT_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_MGCP_CLIENT_VERSION_MAJOR > (major) || \ + (LIBOSMO_MGCP_CLIENT_VERSION_MAJOR == (major) && \ + LIBOSMO_MGCP_CLIENT_VERSION_MINOR > (minor)) || \ + (LIBOSMO_MGCP_CLIENT_VERSION_MAJOR == (major) && \ + LIBOSMO_MGCP_CLIENT_VERSION_MINOR == (minor) && \ + LIBOSMO_MGCP_CLIENT_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/40514?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8460e85d50149f4bc58b6048e5596c5768010829 Gerrit-Change-Number: 40514 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in libusrp[master]: Generate a version.h file

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libusrp/+/40512?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: Ibb9a4fb34beabaca322031e9bde3646385591f3a --- M .gitignore M host/include/usrp/Makefile.am A host/include/usrp/version.h.tpl 3 files changed, 32 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 576da6d..f83ba42 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ contrib/libusrp.spec /.version +/host/include/usrp/version.h diff --git a/host/include/usrp/Makefile.am b/host/include/usrp/Makefile.am index 1950431..8657d58 100644 --- a/host/include/usrp/Makefile.am +++ b/host/include/usrp/Makefile.am @@ -23,6 +23,15 @@ usrpincludedir = $(includedir)/usrp +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + usrpinclude_HEADERS = \ db_base.h \ db_basic.h \ @@ -45,10 +54,14 @@ usrp_slots.h \ usrp_standard.h \ usrp_subdev_spec.h \ - usrp_tune_result.h + usrp_tune_result.h \ + version.h \ + $(NULL) EXTRA_DIST += \ - libusb_types.h.in + libusb_types.h.in \ + version.h.tpl \ + $(NULL) swiginclude_HEADERS = \ db_base.i diff --git a/host/include/usrp/version.h.tpl b/host/include/usrp/version.h.tpl new file mode 100644 index 0000000..7bed445 --- /dev/null +++ b/host/include/usrp/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBUSRP_VERSION {{VERSION}} +#define LIBUSRP_VERSION_STR "{{VERSION}}" + +#define LIBUSRP_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBUSRP_VERSION_MINOR {{VERSION_MINOR}} +#define LIBUSRP_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBUSRP_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBUSRP_VERSION_MAJOR > (major) || \ + (LIBUSRP_VERSION_MAJOR == (major) && \ + LIBUSRP_VERSION_MINOR > (minor)) || \ + (LIBUSRP_VERSION_MAJOR == (major) && \ + LIBUSRP_VERSION_MINOR == (minor) && \ + LIBUSRP_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/40512?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ibb9a4fb34beabaca322031e9bde3646385591f3a Gerrit-Change-Number: 40512 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-ggsn[master]: Generate a version.h file

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/40519?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: If3972eb4e56073f8faf58b09d014a811d4a5f401 --- M .gitignore M include/osmocom/gtp/Makefile.am A include/osmocom/gtp/version.h.tpl 3 files changed, 32 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 12f3c4a..7c3444d 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,5 @@ /debian/gtp-echo-responder/ /debian/osmo-ggsn-doc/ /utils/gtp-echo-responder + +include/osmocom/gtp/version.h diff --git a/include/osmocom/gtp/Makefile.am b/include/osmocom/gtp/Makefile.am index db696e5..904cbb2 100644 --- a/include/osmocom/gtp/Makefile.am +++ b/include/osmocom/gtp/Makefile.am @@ -1,8 +1,22 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + libgtp_HEADERS = \ gsn.h \ gtp.h \ gtpie.h \ pdp.h \ + version.h \ $(NULL) libgtpdir = $(includedir)/osmocom/gtp diff --git a/include/osmocom/gtp/version.h.tpl b/include/osmocom/gtp/version.h.tpl new file mode 100644 index 0000000..5b09393 --- /dev/null +++ b/include/osmocom/gtp/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBGTP_VERSION {{VERSION}} +#define LIBGTP_VERSION_STR "{{VERSION}}" + +#define LIBGTP_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBGTP_VERSION_MINOR {{VERSION_MINOR}} +#define LIBGTP_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBGTP_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBGTP_VERSION_MAJOR > (major) || \ + (LIBGTP_VERSION_MAJOR == (major) && \ + LIBGTP_VERSION_MINOR > (minor)) || \ + (LIBGTP_VERSION_MAJOR == (major) && \ + LIBGTP_VERSION_MINOR == (minor) && \ + LIBGTP_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/40519?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: If3972eb4e56073f8faf58b09d014a811d4a5f401 Gerrit-Change-Number: 40519 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025