- gerrit-log - lists.osmocom.org

[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_asp_peer private
by pespin 05 Nov '24

05 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38647?usp=email ) Change subject: sigtran: Make osmo_ss7_asp_peer private ...................................................................... sigtran: Make osmo_ss7_asp_peer private This struct object is only used internally so far, there's no need to make it public. Change-Id: I6729cc599af3a799d89bc0514d223c84f2233a4b --- M include/osmocom/sigtran/osmo_ss7.h M src/Makefile.am M src/osmo_ss7_asp.c M src/osmo_ss7_asp_peer.c M src/osmo_ss7_vty.c M src/osmo_ss7_xua_srv.c M src/sccp_user.c M src/ss7_asp.h A src/ss7_asp_peer.h M src/ss7_internal.h 10 files changed, 67 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/47/38647/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 2d45733..67f4e99 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -250,14 +250,6 @@ * SS7 Application Server Processes ***********************************************************************/ -struct osmo_ss7_asp_peer { - char *host[OSMO_SOCK_MAX_ADDRS]; - size_t host_cnt; - uint16_t port; - /* index in "hosts" array marking the SCTP Primary Address, -1 if no explicit Primary Address set */ - int idx_primary; -}; - enum osmo_ss7_asp_admin_state { /*! no SCTP association with peer */ OSMO_SS7_ASP_ADM_S_SHUTDOWN, @@ -284,16 +276,6 @@ /*! Accept SSNM even if ASP is in AS-INACTIVE state */ #define OSMO_SS7_ASP_QUIRK_SNM_INACTIVE 0x00000004 -int osmo_ss7_asp_peer_snprintf(char* buf, size_t buf_len, struct osmo_ss7_asp_peer *peer); -void osmo_ss7_asp_peer_init(struct osmo_ss7_asp_peer *peer); -int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, - const char *const*hosts, size_t host_cnt); -int osmo_ss7_asp_peer_set_hosts2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, - const char *const*hosts, size_t host_cnt, int idx_primary); -int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host); -int osmo_ss7_asp_peer_add_host2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host, bool is_primary_addr); -int osmo_ss7_asp_peer_del_host(struct osmo_ss7_asp_peer *peer, const char *host); - struct osmo_ss7_asp * osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name); diff --git a/src/Makefile.am b/src/Makefile.am index 8071be8..1d09c0e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,6 +5,7 @@ noinst_HEADERS = \ sccp_internal.h \ ss7_asp.h \ + ss7_asp_peer.h \ ss7_internal.h \ ss7_link.h \ ss7_linkset.h \ diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 1ee0f76..12a5d5f 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -410,16 +410,16 @@ * address are set on the remote side, IPv4 on the local * side must be set too */ if (ss7_ipv6_sctp_supported("::", true) && !(rem_has_v4 && !rem_has_v6)) - osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "::"); + ss7_asp_peer_add_host(&asp->cfg.local, asp, "::"); else - osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0"); + ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0"); changed = true; } /* If no remote addr was set */ if (!asp->cfg.remote.host_cnt) { - osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1"); + ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1"); if (ss7_ipv6_sctp_supported("::1", false)) - osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "::1"); + ss7_asp_peer_add_host(&asp->cfg.remote, asp, "::1"); changed = true; } return changed; @@ -552,9 +552,9 @@ } rate_ctr_group_set_name(asp->ctrg, name); asp->inst = inst; - osmo_ss7_asp_peer_init(&asp->cfg.remote); + ss7_asp_peer_init(&asp->cfg.remote); asp->cfg.remote.port = remote_port; - osmo_ss7_asp_peer_init(&asp->cfg.local); + ss7_asp_peer_init(&asp->cfg.local); asp->cfg.local.port = local_port; asp->cfg.trans_proto = trans_proto; asp->cfg.proto = proto; @@ -617,8 +617,8 @@ uint8_t byte; OSMO_ASSERT(ss7_initialized); - osmo_ss7_asp_peer_snprintf(bufloc, sizeof(bufloc), &asp->cfg.local); - osmo_ss7_asp_peer_snprintf(bufrem, sizeof(bufrem), &asp->cfg.remote); + ss7_asp_peer_snprintf(bufloc, sizeof(bufloc), &asp->cfg.local); + ss7_asp_peer_snprintf(bufrem, sizeof(bufrem), &asp->cfg.remote); LOGPASP(asp, DLSS7, LOGL_INFO, "Restarting ASP %s, r=%s<->l=%s\n", asp->cfg.name, bufrem, bufloc); diff --git a/src/osmo_ss7_asp_peer.c b/src/osmo_ss7_asp_peer.c index 39a92b1..c31cdd9 100644 --- a/src/osmo_ss7_asp_peer.c +++ b/src/osmo_ss7_asp_peer.c @@ -37,6 +37,7 @@ #include <osmocom/sigtran/osmo_ss7.h> +#include "ss7_asp_peer.h" #include "ss7_internal.h" @@ -44,13 +45,13 @@ * SS7 Application Server Process peer ***********************************************************************/ -void osmo_ss7_asp_peer_init(struct osmo_ss7_asp_peer *peer) +void ss7_asp_peer_init(struct osmo_ss7_asp_peer *peer) { memset(peer, 0, sizeof(*peer)); peer->idx_primary = -1; } -int osmo_ss7_asp_peer_snprintf(char *buf, size_t buf_len, struct osmo_ss7_asp_peer *peer) +int ss7_asp_peer_snprintf(char *buf, size_t buf_len, struct osmo_ss7_asp_peer *peer) { int len = 0, offset = 0, rem = buf_len; int ret, i; @@ -90,7 +91,7 @@ * \param[in] host_cnt Number of strings in hosts * \param[in] idx_primary Index in "hosts" array marking the SCTP Primary Address, -1 if no explicit Primary Address set * \returns 0 on success; negative otherwise */ -int osmo_ss7_asp_peer_set_hosts2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *const*hosts, size_t host_cnt, int idx_primary) +int ss7_asp_peer_set_hosts2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *const*hosts, size_t host_cnt, int idx_primary) { int i = 0; @@ -118,9 +119,9 @@ * \param[in] hosts Array of strings containing IP addresses. * \param[in] host_cnt Number of strings in hosts * \returns 0 on success; negative otherwise */ -int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *const*hosts, size_t host_cnt) +int ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *const*hosts, size_t host_cnt) { - return osmo_ss7_asp_peer_set_hosts2(peer, talloc_ctx, hosts, host_cnt, -1); + return ss7_asp_peer_set_hosts2(peer, talloc_ctx, hosts, host_cnt, -1); } /* Is string formatted IPv4/v6 addr considered IN(6)ADDR_ANY? */ @@ -139,7 +140,7 @@ * \param[in] host string containing an IP address. * \param[in] is_primary_addr whether this IP address is to be added as SCTP Primary Address * \returns 0 on success; negative otherwise */ -int osmo_ss7_asp_peer_add_host2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, +int ss7_asp_peer_add_host2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host, bool is_primary_addr) { int i; @@ -212,7 +213,7 @@ * \param[in] peer Application Server Process peer the address is removed from. * \param[in] host string containing an IP address. * \returns 0 on success; negative otherwise */ -int osmo_ss7_asp_peer_del_host(struct osmo_ss7_asp_peer *peer, const char *host) +int ss7_asp_peer_del_host(struct osmo_ss7_asp_peer *peer, const char *host) { int i; struct osmo_sockaddr_str addr_str; @@ -257,10 +258,10 @@ * \param[in] talloc_ctx talloc context used to allocate new address. * \param[in] host string containing an IP address. * \returns 0 on success; negative otherwise */ -int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, +int ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host) { - return osmo_ss7_asp_peer_add_host2(peer, talloc_ctx, host, false); + return ss7_asp_peer_add_host2(peer, talloc_ctx, host, false); } bool ss7_asp_peer_match_host(const struct osmo_ss7_asp_peer *peer, const char *host, bool host_is_v6) diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 8dd9a4f..482e2f8 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -751,7 +751,7 @@ int fd = xs->server ? osmo_stream_srv_link_get_fd(xs->server) : -1; if (fd < 0) { - if (osmo_ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local) < 0) + if (ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local) < 0) snprintf(buf, sizeof(buf), "<error>"); } else { char hostbuf[OSMO_SOCK_MAX_ADDRS][INET6_ADDRSTRLEN]; @@ -965,7 +965,7 @@ int old_host_count = asp->cfg.local.host_cnt; int rc; - if (osmo_ss7_asp_peer_add_host2(&asp->cfg.local, asp, argv[0], is_primary) != 0) { + if (ss7_asp_peer_add_host2(&asp->cfg.local, asp, argv[0], is_primary) != 0) { vty_out(vty, "%% Failed adding host '%s' to set%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } @@ -1027,7 +1027,7 @@ } } - if (osmo_ss7_asp_peer_del_host(&asp->cfg.local, argv[0]) != 0) { + if (ss7_asp_peer_del_host(&asp->cfg.local, argv[0]) != 0) { vty_out(vty, "%% Failed deleting local address '%s' from set%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } @@ -1047,7 +1047,7 @@ int old_idx_primary = asp->cfg.remote.idx_primary; int rc; - if (osmo_ss7_asp_peer_add_host2(&asp->cfg.remote, asp, argv[0], is_primary) != 0) { + if (ss7_asp_peer_add_host2(&asp->cfg.remote, asp, argv[0], is_primary) != 0) { vty_out(vty, "%% Failed adding host '%s' to set%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } @@ -1084,7 +1084,7 @@ return CMD_WARNING; } - if (osmo_ss7_asp_peer_del_host(&asp->cfg.remote, argv[0]) != 0) { + if (ss7_asp_peer_del_host(&asp->cfg.remote, argv[0]) != 0) { vty_out(vty, "%% Failed deleting remote address '%s' from set%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } @@ -1390,8 +1390,8 @@ if (!get_sockname_buf(buf_rem, sizeof(buf_rem), fd, trans_proto, false)) OSMO_STRLCPY_ARRAY(buf_rem, "<sockname-error>"); } else { - osmo_ss7_asp_peer_snprintf(buf_loc, sizeof(buf_loc), &asp->cfg.local); - osmo_ss7_asp_peer_snprintf(buf_rem, sizeof(buf_rem), &asp->cfg.remote); + ss7_asp_peer_snprintf(buf_loc, sizeof(buf_loc), &asp->cfg.local); + ss7_asp_peer_snprintf(buf_rem, sizeof(buf_rem), &asp->cfg.remote); } vty_out(vty, "%-12s %-12s %-13s %-4s %-4s %-9s %-23s %-23s%s", diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index db1481b..4962bfd 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -148,10 +148,10 @@ asp->cfg.remote.port = atoi(portbuf); asp->dyn_allocated = true; asp->server = srv; - osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, + ss7_asp_peer_set_hosts(&asp->cfg.local, asp, (const char * const*)oxs->cfg.local.host, oxs->cfg.local.host_cnt); - osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, + ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &hostbuf_ptr, 1); osmo_ss7_asp_restart(asp); } @@ -279,7 +279,7 @@ uint8_t byte; const char *proto = get_value_string(osmo_ss7_asp_protocol_vals, xs->cfg.proto); - rc = osmo_ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local); + rc = ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local); if (rc < 0) { LOGP(DLSS7, LOGL_INFO, "Failed parsing %s Server osmo_ss7_asp_peer\n", proto); } else { @@ -316,7 +316,7 @@ int rc; OSMO_ASSERT(ss7_initialized); - rc = osmo_ss7_asp_peer_set_hosts(&xs->cfg.local, xs, local_hosts, local_host_cnt); + rc = ss7_asp_peer_set_hosts(&xs->cfg.local, xs, local_hosts, local_host_cnt); if (rc < 0) return rc; return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); @@ -327,7 +327,7 @@ { int rc; - rc = osmo_ss7_asp_peer_add_host(&xs->cfg.local, xs, local_host); + rc = ss7_asp_peer_add_host(&xs->cfg.local, xs, local_host); if (rc < 0) return rc; return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); @@ -338,7 +338,7 @@ { int rc; - rc = osmo_ss7_asp_peer_del_host(&xs->cfg.local, local_host); + rc = ss7_asp_peer_del_host(&xs->cfg.local, local_host); if (rc < 0) return rc; return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); diff --git a/src/sccp_user.c b/src/sccp_user.c index 3604883..d364eb5 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -645,9 +645,9 @@ /* Ensure that the ASP we use is set to role ASP. */ asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP; if (default_local_ip) - osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1); + ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1); if (default_remote_ip) - osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); + ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); /* Make sure proper defaults are applied if app didn't provide specific default values */ ss7_asp_set_default_peer_hosts(asp); asp->simple_client_allocated = true; @@ -853,11 +853,11 @@ oxs = ss7_xua_server_find2(ss7, asp->cfg.trans_proto, prot, local_port); if (!oxs) goto out_asp; - if (osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, + if (ss7_asp_peer_set_hosts(&asp->cfg.local, asp, (const char* const*)oxs->cfg.local.host, oxs->cfg.local.host_cnt) < 0) goto out_asp; - if (osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, remote_ip) < 0) + if (ss7_asp_peer_add_host(&asp->cfg.remote, asp, remote_ip) < 0) goto out_asp; asp->cfg.is_server = true; asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 170482a..374cce8 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -9,6 +9,7 @@ #include <osmocom/sigtran/osmo_ss7.h> +#include "ss7_asp_peer.h" #include "ss7_internal.h" /*********************************************************************** diff --git a/src/ss7_asp_peer.h b/src/ss7_asp_peer.h new file mode 100644 index 0000000..bdd9b56 --- /dev/null +++ b/src/ss7_asp_peer.h @@ -0,0 +1,30 @@ +#pragma once + +#include <stdint.h> +#include <stdbool.h> +#include <unistd.h> + +/*********************************************************************** + * SS7 ASP Peer + ***********************************************************************/ + +struct osmo_ss7_asp_peer { + char *host[OSMO_SOCK_MAX_ADDRS]; + size_t host_cnt; + uint16_t port; + /* index in "hosts" array marking the SCTP Primary Address, -1 if no explicit Primary Address set */ + int idx_primary; +}; + +int ss7_asp_peer_snprintf(char *buf, size_t buf_len, struct osmo_ss7_asp_peer *peer); +void ss7_asp_peer_init(struct osmo_ss7_asp_peer *peer); +int ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, + const char *const*hosts, size_t host_cnt); +int ss7_asp_peer_set_hosts2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, + const char *const*hosts, size_t host_cnt, int idx_primary); +int ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host); +int ss7_asp_peer_add_host2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host, bool is_primary_addr); +int ss7_asp_peer_del_host(struct osmo_ss7_asp_peer *peer, const char *host); + +bool ss7_asp_peer_match_host(const struct osmo_ss7_asp_peer *peer, const char *host, bool host_is_v6); +int ss7_asp_peer_find_host(const struct osmo_ss7_asp_peer *peer, const char *host); diff --git a/src/ss7_internal.h b/src/ss7_internal.h index f326896..33d18a6 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -24,9 +24,6 @@ int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg); int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv); -bool ss7_asp_peer_match_host(const struct osmo_ss7_asp_peer *peer, const char *host, bool host_is_v6); -int ss7_asp_peer_find_host(const struct osmo_ss7_asp_peer *peer, const char *host); - int xua_tcp_segmentation_cb(struct msgb *msg); enum ss7_as_ctr { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38647?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: I6729cc599af3a799d89bc0514d223c84f2233a4b Gerrit-Change-Number: 38647 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: more tweaks for container shutdown logic
by fixeria 05 Nov '24

05 Nov '24

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38644?usp=email ) Change subject: testenv: more tweaks for container shutdown logic ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38644?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I71721fd41f044817e4021aea045a288f88506f76 Gerrit-Change-Number: 38644 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-Comment-Date: Tue, 05 Nov 2024 15:50:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: show testsuite results at the end
by fixeria 05 Nov '24

05 Nov '24

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38643?usp=email ) Change subject: testenv: show testsuite results at the end ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38643?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie4b70724a33932cd98ba0972db37bf72dc8affb8 Gerrit-Change-Number: 38643 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Nov 2024 15:50:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_asp struct private
by pespin 05 Nov '24

05 Nov '24

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: sigtran: Make osmo_ss7_asp struct private ...................................................................... sigtran: Make osmo_ss7_asp struct private The object should only (and currently is only) be used throuh public APIs using a pointer. Change-Id: I5839b4dd04468af20d1836386dcc722e7a83ac5f --- M include/osmocom/sigtran/osmo_ss7.h M src/Makefile.am M src/ipa.c M src/m3ua.c M src/osmo_ss7.c M src/osmo_ss7_as.c M src/osmo_ss7_asp.c M src/osmo_ss7_hmrt.c M src/osmo_ss7_vty.c M src/osmo_ss7_xua_srv.c M src/sccp_user.c A src/ss7_asp.h M src/ss7_internal.h M src/sua.c M src/xua_as_fsm.c M src/xua_asp_fsm.c M src/xua_default_lm_fsm.c M src/xua_rkm.c M src/xua_shared.c M src/xua_snm.c M tests/ss7/ss7_test.c 21 files changed, 126 insertions(+), 83 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/45/38645/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5839b4dd04468af20d1836386dcc722e7a83ac5f Gerrit-Change-Number: 38645 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: tests: Fix missing LIBOSMONETIF_CFLAGS
by pespin 05 Nov '24

05 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38646?usp=email ) Change subject: tests: Fix missing LIBOSMONETIF_CFLAGS ...................................................................... tests: Fix missing LIBOSMONETIF_CFLAGS Change-Id: Ica2d3c487779a1e7c79a5fbcea43c92a1ff08df7 --- M tests/ss7/Makefile.am M tests/xua/Makefile.am 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/46/38646/1 diff --git a/tests/ss7/Makefile.am b/tests/ss7/Makefile.am index ecc69e0..236e846 100644 --- a/tests/ss7/Makefile.am +++ b/tests/ss7/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CFLAGS=-Wall $(LIBOSMONETIF_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) AM_LDFLAGS = -static -no-install LDADD = $(top_builddir)/src/libosmo-sigtran.la \ diff --git a/tests/xua/Makefile.am b/tests/xua/Makefile.am index 546039c..edff329 100644 --- a/tests/xua/Makefile.am +++ b/tests/xua/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CFLAGS=-Wall $(LIBOSMONETIF_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) AM_LDFLAGS = -static -no-install LDADD = $(top_builddir)/src/libosmo-sigtran.la \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38646?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: Ica2d3c487779a1e7c79a5fbcea43c92a1ff08df7 Gerrit-Change-Number: 38646 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: Make osmo_ss7_asp struct private
by pespin 05 Nov '24

05 Nov '24

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?usp=email ) Change subject: Make osmo_ss7_asp struct private ...................................................................... Make osmo_ss7_asp struct private The object should only (and currently is only) be used throuh public APIs using a pointer. Change-Id: I5839b4dd04468af20d1836386dcc722e7a83ac5f --- M include/osmocom/sigtran/osmo_ss7.h M src/Makefile.am M src/ipa.c M src/m3ua.c M src/osmo_ss7.c M src/osmo_ss7_as.c M src/osmo_ss7_asp.c M src/osmo_ss7_hmrt.c M src/osmo_ss7_vty.c M src/osmo_ss7_xua_srv.c M src/sccp_user.c A src/ss7_asp.h M src/ss7_internal.h M src/sua.c M src/xua_as_fsm.c M src/xua_asp_fsm.c M src/xua_default_lm_fsm.c M src/xua_rkm.c M src/xua_shared.c M src/xua_snm.c M tests/ss7/ss7_test.c 21 files changed, 126 insertions(+), 83 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/45/38645/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5839b4dd04468af20d1836386dcc722e7a83ac5f Gerrit-Change-Number: 38645 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

1 0

[M] Change in libosmo-sigtran[master]: WIP
by pespin 05 Nov '24

05 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?usp=email ) Change subject: WIP ...................................................................... WIP Change-Id: I5839b4dd04468af20d1836386dcc722e7a83ac5f --- M include/osmocom/sigtran/osmo_ss7.h M src/Makefile.am M src/ipa.c M src/m3ua.c M src/osmo_ss7.c M src/osmo_ss7_as.c M src/osmo_ss7_asp.c M src/osmo_ss7_hmrt.c M src/osmo_ss7_vty.c M src/osmo_ss7_xua_srv.c M src/sccp_user.c A src/ss7_asp.h M src/ss7_internal.h M src/sua.c M src/xua_as_fsm.c M src/xua_asp_fsm.c M src/xua_default_lm_fsm.c M src/xua_rkm.c M src/xua_shared.c M src/xua_snm.c M tests/ss7/ss7_test.c 21 files changed, 126 insertions(+), 83 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/45/38645/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 0027426..2d45733 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -275,77 +275,7 @@ extern const struct value_string osmo_ss7_asp_role_names[]; -struct osmo_ss7_asp { - /*! entry in \ref osmo_ss7_instance.asp_list */ - struct llist_head list; - struct osmo_ss7_instance *inst; - - /*! ASP FSM */ - struct osmo_fsm_inst *fi; - - /*! \ref osmo_xua_server over which we were established */ - struct osmo_xua_server *xua_server; - struct llist_head siblings; - - /*! osmo_stream / libosmo-netif handles */ - struct osmo_stream_cli *client; - struct osmo_stream_srv *server; - /*! pre-formatted human readable local/remote socket name */ - char *sock_name; - - /* ASP Identifier for ASP-UP + NTFY */ - uint32_t asp_id; - bool asp_id_present; - - /* Layer Manager to which we talk */ - const struct osmo_xua_layer_manager *lm; - void *lm_priv; - - /*! Were we dynamically allocated */ - bool dyn_allocated; - - /*! Were we allocated by "simple client" support? */ - bool simple_client_allocated; - - /*! Rate Counter Group */ - struct rate_ctr_group *ctrg; - - /*! Pending message for non-blocking IPA read */ - struct msgb *pending_msg; - - struct { - char *name; - char *description; - enum osmo_ss7_asp_protocol proto; - enum osmo_ss7_asp_admin_state adm_state; - bool is_server; - enum osmo_ss7_asp_role role; - bool role_set_by_vty; - bool trans_role_set_by_vty; - - struct osmo_ss7_asp_peer local; - struct osmo_ss7_asp_peer remote; - uint8_t qos_class; - uint32_t quirks; - - /* T_defs used by the default_lm: */ - struct osmo_tdef *T_defs_lm; - - struct { - bool num_ostreams_present; - bool max_instreams_present; - bool max_attempts_present; - bool max_init_timeo_present; - uint16_t num_ostreams_value; - uint16_t max_instreams_value; - uint16_t max_attempts_value; - uint16_t max_init_timeo_value; /* ms */ - } sctp_init; - - /*! The underlaying transport protocol (one of IPPROTO_*) */ - int trans_proto; - } cfg; -}; +struct osmo_ss7_asp; /*! Peer SG doesn't send NTFY(AS-INACTIVE) after ASP-UP procedure */ #define OSMO_SS7_ASP_QUIRK_NO_NOTIFY 0x00000001 diff --git a/src/Makefile.am b/src/Makefile.am index 8f848de..8071be8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,6 +4,7 @@ noinst_HEADERS = \ sccp_internal.h \ + ss7_asp.h \ ss7_internal.h \ ss7_link.h \ ss7_linkset.h \ diff --git a/src/ipa.c b/src/ipa.c index 64eb4d4..ce44262 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -47,6 +47,7 @@ #include <osmocom/sigtran/protocol/mtp.h> #include "xua_internal.h" +#include "ss7_asp.h" #include "ss7_internal.h" #include "xua_asp_fsm.h" diff --git a/src/m3ua.c b/src/m3ua.c index 05680ea..a4db7f6 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -44,6 +44,7 @@ #include "xua_as_fsm.h" #include "xua_asp_fsm.h" #include "xua_internal.h" +#include "ss7_asp.h" #include "ss7_internal.h" #define M3UA_MSGB_SIZE 1500 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 0402038..40bf0b1 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -50,6 +50,7 @@ #include "sccp_internal.h" #include "xua_internal.h" +#include "ss7_asp.h" #include "ss7_internal.h" #include "ss7_linkset.h" #include "ss7_route.h" diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c index cc61b12..f4e5853 100644 --- a/src/osmo_ss7_as.c +++ b/src/osmo_ss7_as.c @@ -33,6 +33,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> +#include "ss7_asp.h" #include "ss7_route.h" #include "ss7_route_table.h" #include "ss7_internal.h" diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 6058304..1ee0f76 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -51,6 +51,7 @@ #include "sccp_internal.h" #include "xua_internal.h" +#include "ss7_asp.h" #include "ss7_internal.h" #include "ss7_xua_srv.h" #include "xua_asp_fsm.h" diff --git a/src/osmo_ss7_hmrt.c b/src/osmo_ss7_hmrt.c index e504cb1..9aaa1df 100644 --- a/src/osmo_ss7_hmrt.c +++ b/src/osmo_ss7_hmrt.c @@ -35,6 +35,7 @@ #include <osmocom/sigtran/protocol/m3ua.h> #include "xua_internal.h" +#include "ss7_asp.h" #include "ss7_linkset.h" #include "ss7_route.h" #include "ss7_route_table.h" diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 7f9aa39..8dd9a4f 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -46,6 +46,7 @@ #include "xua_internal.h" #include <osmocom/sigtran/sccp_sap.h> #include "sccp_internal.h" +#include "ss7_asp.h" #include "ss7_route.h" #include "ss7_route_table.h" #include "ss7_internal.h" diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 4fb2115..db1481b 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -51,6 +51,7 @@ #include "sccp_internal.h" #include "xua_internal.h" +#include "ss7_asp.h" #include "ss7_internal.h" #include "xua_asp_fsm.h" #include "xua_as_fsm.h" diff --git a/src/sccp_user.c b/src/sccp_user.c index 84e57da..3604883 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -39,6 +39,7 @@ #include "sccp_internal.h" #include "xua_internal.h" +#include "ss7_asp.h" #include "ss7_route.h" #include "ss7_route_table.h" #include "ss7_internal.h" diff --git a/src/ss7_asp.h b/src/ss7_asp.h new file mode 100644 index 0000000..dc15078 --- /dev/null +++ b/src/ss7_asp.h @@ -0,0 +1,106 @@ +#pragma once + +#include <stdint.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/fsm.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/tdef.h> +#include <osmocom/netif/stream.h> + +#include <osmocom/sigtran/osmo_ss7.h> + +#include "ss7_internal.h" + +/*********************************************************************** + * SS7 Linksets + ***********************************************************************/ + +struct osmo_ss7_instance; +struct osmo_xua_layer_manager; + +struct osmo_ss7_asp { + /*! entry in \ref osmo_ss7_instance.asp_list */ + struct llist_head list; + struct osmo_ss7_instance *inst; + + /*! ASP FSM */ + struct osmo_fsm_inst *fi; + + /*! \ref osmo_xua_server over which we were established */ + struct osmo_xua_server *xua_server; + struct llist_head siblings; + + /*! osmo_stream / libosmo-netif handles */ + struct osmo_stream_cli *client; + struct osmo_stream_srv *server; + /*! pre-formatted human readable local/remote socket name */ + char *sock_name; + + /* ASP Identifier for ASP-UP + NTFY */ + uint32_t asp_id; + bool asp_id_present; + + /* Layer Manager to which we talk */ + const struct osmo_xua_layer_manager *lm; + void *lm_priv; + + /*! Were we dynamically allocated */ + bool dyn_allocated; + + /*! Were we allocated by "simple client" support? */ + bool simple_client_allocated; + + /*! Rate Counter Group */ + struct rate_ctr_group *ctrg; + + /*! Pending message for non-blocking IPA read */ + struct msgb *pending_msg; + + struct { + char *name; + char *description; + enum osmo_ss7_asp_protocol proto; + enum osmo_ss7_asp_admin_state adm_state; + bool is_server; + enum osmo_ss7_asp_role role; + bool role_set_by_vty; + bool trans_role_set_by_vty; + + struct osmo_ss7_asp_peer local; + struct osmo_ss7_asp_peer remote; + uint8_t qos_class; + uint32_t quirks; + + /* T_defs used by the default_lm: */ + struct osmo_tdef *T_defs_lm; + + struct { + bool num_ostreams_present; + bool max_instreams_present; + bool max_attempts_present; + bool max_init_timeo_present; + uint16_t num_ostreams_value; + uint16_t max_instreams_value; + uint16_t max_attempts_value; + uint16_t max_init_timeo_value; /* ms */ + } sctp_init; + + /*! The underlaying transport protocol (one of IPPROTO_*) */ + int trans_proto; + } cfg; +}; + +struct osmo_ss7_asp *ss7_asp_alloc(struct osmo_ss7_instance *inst, const char *name, + uint16_t remote_port, uint16_t local_port, + int trans_proto, enum osmo_ss7_asp_protocol proto); +bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp); +bool ss7_asp_is_started(const struct osmo_ss7_asp *asp); +int ss7_asp_get_fd(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); +int ss7_asp_apply_drop_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx); + +#define LOGPASP(asp, subsys, level, fmt, args ...) \ + _LOGSS7((asp)->inst, subsys, level, "asp-%s: " fmt, (asp)->cfg.name, ## args) diff --git a/src/ss7_internal.h b/src/ss7_internal.h index 5d576c5..f326896 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -4,6 +4,7 @@ #include <stdbool.h> #include <stdint.h> +#include <osmocom/netif/stream.h> #include <osmocom/sigtran/osmo_ss7.h> extern bool ss7_initialized; @@ -14,12 +15,6 @@ struct osmo_ss7_as *ss7_as_alloc(struct osmo_ss7_instance *inst, const char *name, enum osmo_ss7_asp_protocol proto); -struct osmo_ss7_asp *ss7_asp_alloc(struct osmo_ss7_instance *inst, const char *name, - uint16_t remote_port, uint16_t local_port, - int trans_proto, enum osmo_ss7_asp_protocol proto); -bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp); -bool ss7_asp_is_started(const struct osmo_ss7_asp *asp); -int ss7_asp_get_fd(const struct osmo_ss7_asp *asp); struct osmo_ss7_asp *ss7_asp_find_by_socket_addr(int fd, int trans_proto); bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto); @@ -28,10 +23,6 @@ int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg); int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg); int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv); -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); -int ss7_asp_apply_drop_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx); bool ss7_asp_peer_match_host(const struct osmo_ss7_asp_peer *peer, const char *host, bool host_is_v6); int ss7_asp_peer_find_host(const struct osmo_ss7_asp_peer *peer, const char *host); @@ -54,7 +45,5 @@ #define LOGSS7(inst, level, fmt, args ...) \ _LOGSS7(inst, DLSS7, level, fmt, ## args) -#define LOGPASP(asp, subsys, level, fmt, args ...) \ - _LOGSS7((asp)->inst, subsys, level, "asp-%s: " fmt, (asp)->cfg.name, ## args) #define LOGPAS(as, subsys, level, fmt, args ...) \ _LOGSS7((as)->inst, subsys, level, "as-%s: " fmt, (as)->cfg.name, ## args) diff --git a/src/sua.c b/src/sua.c index a69f3b5..b7c70bb 100644 --- a/src/sua.c +++ b/src/sua.c @@ -47,6 +47,7 @@ #include "xua_asp_fsm.h" #include "xua_internal.h" #include "sccp_internal.h" +#include "ss7_asp.h" #include "ss7_internal.h" /* Appendix C.4 of Q.714 (all in milliseconds) */ diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index dff0d06..702be2b 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -23,6 +23,7 @@ #include <osmocom/sigtran/protocol/sua.h> #include <osmocom/sigtran/protocol/m3ua.h> +#include "ss7_asp.h" #include "ss7_route.h" #include "ss7_route_table.h" #include "xua_asp_fsm.h" diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 9e9f8ac..37932a7 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -27,6 +27,7 @@ #include "xua_msg.h" #include <osmocom/sigtran/protocol/sua.h> +#include "ss7_asp.h" #include "ss7_internal.h" #include "ss7_xua_srv.h" #include "xua_asp_fsm.h" diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index b55f982..dd8e505 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -37,6 +37,7 @@ #include "xua_internal.h" #include "xua_asp_fsm.h" +#include "ss7_asp.h" #include "ss7_xua_srv.h" #define S(x) (1 << (x)) diff --git a/src/xua_rkm.c b/src/xua_rkm.c index 5a7bc2e..0a05cdc 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -28,6 +28,7 @@ #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/protocol/m3ua.h> +#include "ss7_asp.h" #include "ss7_internal.h" #include "ss7_route.h" #include "ss7_route_table.h" diff --git a/src/xua_shared.c b/src/xua_shared.c index 15b9b52..6fd0369 100644 --- a/src/xua_shared.c +++ b/src/xua_shared.c @@ -34,6 +34,7 @@ #include <osmocom/sigtran/protocol/m3ua.h> #include <osmocom/sigtran/protocol/sua.h> +#include "ss7_asp.h" #include "ss7_internal.h" #include "xua_internal.h" diff --git a/src/xua_snm.c b/src/xua_snm.c index b5737cd..78720cc 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -31,6 +31,7 @@ #include <osmocom/sigtran/protocol/sua.h> #include <osmocom/sigtran/protocol/mtp.h> +#include "ss7_asp.h" #include "ss7_internal.h" #include "xua_internal.h" #include "sccp_internal.h" diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c index 6fd21d7..98d4680 100644 --- a/tests/ss7/ss7_test.c +++ b/tests/ss7/ss7_test.c @@ -1,3 +1,4 @@ +#include "../src/ss7_asp.h" #include "../src/ss7_link.h" #include "../src/ss7_linkset.h" #include "../src/ss7_route.h" -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?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: I5839b4dd04468af20d1836386dcc722e7a83ac5f Gerrit-Change-Number: 38645 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: more tweaks for container shutdown logic
by pespin 05 Nov '24

05 Nov '24

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38644?usp=email ) Change subject: testenv: more tweaks for container shutdown logic ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38644?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I71721fd41f044817e4021aea045a288f88506f76 Gerrit-Change-Number: 38644 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: Tue, 05 Nov 2024 15:01:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: show testsuite results at the end
by pespin 05 Nov '24

05 Nov '24

Attention is currently required from: fixeria, osmith, pespin. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38643?usp=email ) Change subject: testenv: show testsuite results at the end ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38643?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie4b70724a33932cd98ba0972db37bf72dc8affb8 Gerrit-Change-Number: 38643 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Nov 2024 15:00:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: more tweaks for container shutdown logic
by osmith 05 Nov '24

05 Nov '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38644?usp=email ) Change subject: testenv: more tweaks for container shutdown logic ...................................................................... testenv: more tweaks for container shutdown logic * Don't do "podman wait" when restarting the container. The idea was to really wait before the current container was shutdown before restarting one with the same name. But even with the wait we got "the container name ... is already in use" errors and so we use different names when restarting the container since 6fe837de ("testenv: podman: restart_count in container_name"). This means "podman wait" is not needed anymore. * feed_watchdog_loop: change sleep from 5s to 2s, as we wait up to that long after the container was shutdown, before testenv stops. 5s is quite noticable compared to 2s when running the script locally. * feed_watchdog_loop: hide stderr of "podman exec" since it will print "Error: container ... does not exist in database: no such container" during shutdown. This is expected as we stop the container, but it looks like an actual error. We already have a more userfriendly message "feed_watchdog_loop: podman container has stopped" that will appear when the "podman exec" fails during shutdown. Change-Id: I71721fd41f044817e4021aea045a288f88506f76 --- M _testenv/testenv/podman.py 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/38644/1 diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index dc1b333..16db400 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -176,8 +176,8 @@ # container will terminate after a few seconds. try: while True: - time.sleep(5) - p = subprocess.run(["podman", "exec", container_name, "touch", "/tmp/watchdog"]) + time.sleep(2) + p = subprocess.run(["podman", "exec", container_name, "touch", "/tmp/watchdog"], stderr=subprocess.DEVNULL) if p.returncode: logging.debug("feed_watchdog_loop: podman container has stopped") return @@ -340,9 +340,6 @@ testenv.cmd.run(["podman", "kill", container_name], no_podman=True, check=False) - if restart: - testenv.cmd.run(["podman", "wait", container_name], no_podman=True, check=False) - container_name = None if restart: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38644?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: I71721fd41f044817e4021aea045a288f88506f76 Gerrit-Change-Number: 38644 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log