- gerrit-log - lists.osmocom.org

[S] Change in ...osmo-epdg[master]: aaa_diameter_s6b.erl: Get rid of unused code
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36234?usp=email ) Change subject: aaa_diameter_s6b.erl: Get rid of unused code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36234?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I9e94fe26073ddb1740c3ae1d761d359c3f1b7439 Gerrit-Change-Number: 36234 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:32:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in ...osmo-epdg[master]: AAA: Swx: Answer RTR with RTA
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36232?usp=email ) Change subject: AAA: Swx: Answer RTR with RTA ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36232?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Iba49fe8565d2303f975003ed2a79de25a4b23832 Gerrit-Change-Number: 36232 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:32:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: rebar.config: Update required OTP version 25.2.3
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36263?usp=email ) Change subject: rebar.config: Update required OTP version 25.2.3 ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36263?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I0ac7c93adbe88e1b738f1319cf1280c119ed59d1 Gerrit-Change-Number: 36263 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:32:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in libosmo-sccp[master]: xua + ipa: Add support for I/O in OSMO_IO mode
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36259?usp=email ) Change subject: xua + ipa: Add support for I/O in OSMO_IO mode ...................................................................... xua + ipa: Add support for I/O in OSMO_IO mode This switches osmo_stream_{cli,srv} over to using the OSMO_IO mode instead of the classic OSMO_FD mode. The difference is that we no longer read/write directly to a file descriptor, but we pass message buffers to/from the library. This in turn allows the library to use more efficient I/O mechanisms as osmo_io backend, for example the Linux kernel io_uring. This re-introduces Change-Id: I7d02037990f4af405839309510dc6c04e36c3369 which was previously reverted due to regressions caused by a missing change in libosmo-netif. Depends: libosmo-netif.git I6cf5bad5f618e71c80017960c38009b089dbd6a1 Depends: libosmocore.git I89eb519b22d21011d61a7855b2364bc3c295df82 Closes: OS#5752 Change-Id: Ia1910f3b99d918ec2a34d5304c3f40ba015c25c9 --- M TODO-RELEASE M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/ss7_internal.h 4 files changed, 96 insertions(+), 232 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 7785711..0c3e87e 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -17,3 +17,4 @@ libosmo-sigtran API added osmo_ss7_asp_get_trans_proto() libosmo-sigtran API added osmo_ss7_asp_{find2,find_or_create2}() libosmo-sigtran API added osmo_ss7_xua_server_{find2,create2}() +libosmo-netif >1.4.0 osmo_io SCTP support diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 5bab5ff..c5a2fc5 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -601,10 +601,11 @@ talloc_free(asp); } -static int xua_cli_read_cb(struct osmo_stream_cli *conn); -static int ipa_cli_read_cb(struct osmo_stream_cli *conn); -static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn); +static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); +static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); +static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); static int xua_cli_connect_cb(struct osmo_stream_cli *cli); +static int xua_cli_close_and_reconnect(struct osmo_stream_cli *cli); int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp) { @@ -642,22 +643,27 @@ osmo_stream_cli_set_proto(asp->client, asp->cfg.trans_proto); osmo_stream_cli_set_reconnect_timeout(asp->client, 5); osmo_stream_cli_set_connect_cb(asp->client, xua_cli_connect_cb); + osmo_stream_cli_set_disconnect_cb(asp->client, xua_cli_close_and_reconnect); switch (asp->cfg.proto) { case OSMO_SS7_ASP_PROT_IPA: OSMO_ASSERT(asp->cfg.trans_proto == IPPROTO_TCP); - osmo_stream_cli_set_read_cb(asp->client, ipa_cli_read_cb); + osmo_stream_cli_set_read_cb2(asp->client, ipa_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, osmo_ipa_segmentation_cb); break; case OSMO_SS7_ASP_PROT_M3UA: - if (asp->cfg.trans_proto == IPPROTO_SCTP) - osmo_stream_cli_set_read_cb(asp->client, xua_cli_read_cb); - else if (asp->cfg.trans_proto == IPPROTO_TCP) - osmo_stream_cli_set_read_cb(asp->client, m3ua_tcp_cli_read_cb); - else + if (asp->cfg.trans_proto == IPPROTO_SCTP) { + osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, NULL); + } else if (asp->cfg.trans_proto == IPPROTO_TCP) { + osmo_stream_cli_set_read_cb2(asp->client, m3ua_tcp_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, xua_tcp_segmentation_cb); + } else OSMO_ASSERT(0); break; default: OSMO_ASSERT(asp->cfg.trans_proto == IPPROTO_SCTP); - osmo_stream_cli_set_read_cb(asp->client, xua_cli_read_cb); + osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, NULL); break; } osmo_stream_cli_set_data(asp->client, asp); @@ -789,33 +795,11 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn) +int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) { int fd = osmo_stream_srv_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - struct msgb *msg = NULL; - int rc; - OSMO_ASSERT(fd >= 0); - - /* read IPA message from socket and process it */ - rc = ipa_msg_recv_buffered(fd, &msg, &asp->pending_msg); - LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): ipa_msg_recv_buffered() returned %d\n", - __func__, rc); - if (rc <= 0) { - if (rc == -EAGAIN) { - /* more data needed */ - return 0; - } - osmo_stream_srv_destroy(conn); - return rc; - } - if (osmo_ipa_process_msg(msg) < 0) { - LOGPASP(asp, DLSS7, LOGL_ERROR, "Bad IPA message\n"); - osmo_stream_srv_destroy(conn); - msgb_free(msg); - return -1; - } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* we can use the 'fd' return value of osmo_stream_srv_get_fd() here unverified as all we do @@ -824,19 +808,14 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn) +int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - struct msgb *msg = m3ua_msgb_alloc("xUA Server Rx"); unsigned int ppid; int flags; - int rc; + int rc = 0; - if (!msg) - return -ENOMEM; - - /* read xUA message from socket and process it */ - rc = osmo_stream_srv_recv(conn, msg); + /* process the received xUA message */ flags = msgb_sctp_msg_flags(msg); LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", @@ -855,22 +834,6 @@ default: break; } - - if (rc == 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; - } else { - rc = 0; - } - goto out; - } - if (rc < 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; - } else if (rc == 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; goto out; } @@ -890,73 +853,38 @@ return rc; } -/* netif code tells us we can read something from the socket */ -int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn) +int xua_tcp_segmentation_cb(struct msgb *msg) { - struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - int fd = osmo_stream_srv_get_fd(conn); - struct msgb *msg = asp->pending_msg; const struct xua_common_hdr *hdr; size_t msg_length; - int rc; - OSMO_ASSERT(fd >= 0); + if (msgb_length(msg) < sizeof(*hdr)) + return -EAGAIN; - if (msg == NULL) { - msg = m3ua_msgb_alloc(__func__); - asp->pending_msg = msg; - } - - /* read message header first */ - if (msg->len < sizeof(*hdr)) { - errno = 0; - rc = recv(fd, msg->tail, sizeof(*hdr) - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - osmo_stream_srv_destroy(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } - - msgb_put(msg, rc); - if (msg->len < sizeof(*hdr)) - return 0; /* need more data */ - } - - hdr = (const struct xua_common_hdr *)msg->data; + hdr = (const struct xua_common_hdr *) msg->data; msg_length = ntohl(hdr->msg_length); /* includes sizeof(*hdr) */ - /* read the rest of the message */ - if (msg->len < msg_length) { - errno = 0; - rc = recv(fd, msg->tail, msg_length - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - osmo_stream_srv_destroy(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } + return msg_length; +} - msgb_put(msg, rc); - if (msg->len < msg_length) - return 0; /* need more data */ - } +/* netif code tells us we can read something from the socket */ +int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) +{ + struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + const struct xua_common_hdr *hdr; + int rc; msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* spoof SCTP Stream ID */ + hdr = (const struct xua_common_hdr *)msg->data; if (hdr->msg_class == M3UA_MSGC_XFER) msgb_sctp_stream(msg) = 1; else msgb_sctp_stream(msg) = 0; rc = m3ua_rx_msg(asp, msg); - asp->pending_msg = NULL; msgb_free(msg); return rc; @@ -1009,40 +937,19 @@ xua_asp_send_xlm_prim_simple(asp, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_INDICATION); } -static void xua_cli_close_and_reconnect(struct osmo_stream_cli *cli) +static int xua_cli_close_and_reconnect(struct osmo_stream_cli *cli) { xua_cli_close(cli); osmo_stream_cli_reconnect(cli); + return 0; } /* read call-back for IPA/SCCPlite socket */ -static int ipa_cli_read_cb(struct osmo_stream_cli *conn) +static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { int fd = osmo_stream_cli_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - struct msgb *msg = NULL; - int rc; - OSMO_ASSERT(fd >= 0); - - /* read IPA message from socket and process it */ - rc = ipa_msg_recv_buffered(fd, &msg, &asp->pending_msg); - LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): ipa_msg_recv_buffered() returned %d\n", - __func__, rc); - if (rc <= 0) { - if (rc == -EAGAIN) { - /* more data needed */ - return 0; - } - xua_cli_close_and_reconnect(conn); - return rc; - } - if (osmo_ipa_process_msg(msg) < 0) { - LOGPASP(asp, DLSS7, LOGL_ERROR, "Bad IPA message\n"); - xua_cli_close_and_reconnect(conn); - msgb_free(msg); - return -1; - } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* we can use the 'fd' return value of osmo_stream_srv_get_fd() here unverified as all we do @@ -1051,94 +958,34 @@ } /* read call-back for M3UA-over-TCP socket */ -static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn) +static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { - struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - int fd = osmo_stream_cli_get_fd(conn); - struct msgb *msg = asp->pending_msg; const struct xua_common_hdr *hdr; - size_t msg_length; - int rc; - OSMO_ASSERT(fd >= 0); - - if (msg == NULL) { - msg = m3ua_msgb_alloc(__func__); - asp->pending_msg = msg; - } - - /* read message header first */ - if (msg->len < sizeof(*hdr)) { - errno = 0; - rc = recv(fd, msg->tail, sizeof(*hdr) - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - xua_cli_close_and_reconnect(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } - - msgb_put(msg, rc); - if (msg->len < sizeof(*hdr)) - return 0; /* need more data */ - } - - hdr = (const struct xua_common_hdr *)msg->data; - msg_length = ntohl(hdr->msg_length); /* includes sizeof(*hdr) */ - - /* read the rest of the message */ - if (msg->len < msg_length) { - errno = 0; - rc = recv(fd, msg->tail, msg_length - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - xua_cli_close_and_reconnect(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } - - msgb_put(msg, rc); - if (msg->len < msg_length) - return 0; /* need more data */ - } - - msg->dst = asp; - rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); + /* spoof SCTP PPID */ + msgb_sctp_ppid(msg) = M3UA_PPID; /* spoof SCTP Stream ID */ + hdr = (const struct xua_common_hdr *) msg->data; if (hdr->msg_class == M3UA_MSGC_XFER) msgb_sctp_stream(msg) = 1; else msgb_sctp_stream(msg) = 0; - rc = m3ua_rx_msg(asp, msg); - asp->pending_msg = NULL; - msgb_free(msg); - - return rc; + return xua_cli_read_cb(conn, msg); } -static int xua_cli_read_cb(struct osmo_stream_cli *conn) +static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - struct msgb *msg = m3ua_msgb_alloc("xUA Client Rx"); unsigned int ppid; int flags; int rc; - if (!msg) - return -ENOMEM; - - /* read xUA message from socket and process it */ - rc = osmo_stream_cli_recv(conn, msg); flags = msgb_sctp_msg_flags(msg); LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", - __func__, rc, flags); + __func__, msgb_length(msg), flags); if (flags & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); @@ -1153,17 +1000,6 @@ default: break; } - - if (rc == 0) - xua_cli_close_and_reconnect(conn); - rc = 0; - goto out; - } - if (rc < 0) { - xua_cli_close_and_reconnect(conn); - goto out; - } else if (rc == 0) { - xua_cli_close_and_reconnect(conn); goto out; } diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 6da7b7a..e8e01b3 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -67,32 +67,11 @@ struct osmo_ss7_asp *asp; char *sock_name = osmo_sock_get_name(link, fd); const char *proto_name = get_value_string(osmo_ss7_asp_protocol_vals, oxs->cfg.proto); - int (*read_cb)(struct osmo_stream_srv *conn) = NULL; int rc = 0; LOGP(DLSS7, LOGL_INFO, "%s: New %s connection accepted\n", sock_name, proto_name); - switch (oxs->cfg.proto) { - case OSMO_SS7_ASP_PROT_IPA: - OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_TCP); - read_cb = &ss7_asp_ipa_srv_conn_cb; - break; - case OSMO_SS7_ASP_PROT_M3UA: - if (oxs->cfg.trans_proto == IPPROTO_SCTP) - read_cb = &ss7_asp_xua_srv_conn_cb; - else if (oxs->cfg.trans_proto == IPPROTO_TCP) - read_cb = &ss7_asp_m3ua_tcp_srv_conn_cb; - else - OSMO_ASSERT(0); - break; - default: - OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_SCTP); - read_cb = &ss7_asp_xua_srv_conn_cb; - break; - } - - srv = osmo_stream_srv_create(oxs, link, fd, read_cb, - &ss7_asp_xua_srv_conn_closed_cb, NULL); + srv = osmo_stream_srv_create2(oxs, link, fd, NULL); if (!srv) { LOGP(DLSS7, LOGL_ERROR, "%s: Unable to create stream server " "for connection\n", sock_name); @@ -101,6 +80,28 @@ return -1; } + switch (oxs->cfg.proto) { + case OSMO_SS7_ASP_PROT_IPA: + osmo_stream_srv_set_read_cb(srv, ss7_asp_ipa_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, osmo_ipa_segmentation_cb); + break; + case OSMO_SS7_ASP_PROT_M3UA: + if (oxs->cfg.trans_proto == IPPROTO_SCTP) + osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_cb); + else if (oxs->cfg.trans_proto == IPPROTO_TCP) { + osmo_stream_srv_set_read_cb(srv, &ss7_asp_m3ua_tcp_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, xua_tcp_segmentation_cb); + } else + OSMO_ASSERT(0); + break; + default: + OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_SCTP); + osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, NULL); + break; + } + osmo_stream_srv_set_closed_cb(srv, ss7_asp_xua_srv_conn_closed_cb); + asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto); if (asp) { LOGP(DLSS7, LOGL_INFO, "%s: matched connection to ASP %s\n", diff --git a/src/ss7_internal.h b/src/ss7_internal.h index 758da90..67c0ee3 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -24,9 +24,9 @@ bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto); int ss7_default_trans_proto_for_asp_proto(enum osmo_ss7_asp_protocol proto); -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn); -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn); -int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn); +int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, 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); @@ -38,6 +38,8 @@ bool ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs); +int xua_tcp_segmentation_cb(struct msgb *msg); + enum ss7_as_ctr { SS7_AS_CTR_RX_MSU_TOTAL, SS7_AS_CTR_TX_MSU_TOTAL, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36259?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia1910f3b99d918ec2a34d5304c3f40ba015c25c9 Gerrit-Change-Number: 36259 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[L] Change in libosmo-sccp[master]: xua + ipa: Add support for I/O in OSMO_IO mode
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36259?usp=email ) Change subject: xua + ipa: Add support for I/O in OSMO_IO mode ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File src/osmo_ss7_asp.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/36259/comment/7db0bff2_ad03ad00 PS1, Line 645: switch (asp->cfg.proto) { > I wonder why the patchset 9 was missing when merged: […] because I was using an old patch; my general point remains: I shouldn't be needing to do this as I was expecting you to take care of it. If you tell me you re-tested something and it works in all your tests, then I would assume you should also make sure the respective patch is in gerrit . Let's have a call at some point to try to prevent such situations again. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36259?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia1910f3b99d918ec2a34d5304c3f40ba015c25c9 Gerrit-Change-Number: 36259 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:20:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[L] Change in libosmo-sccp[master]: xua + ipa: Add support for I/O in OSMO_IO mode
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: laforge. Hello Jenkins Builder, jolly, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36259?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: xua + ipa: Add support for I/O in OSMO_IO mode ...................................................................... xua + ipa: Add support for I/O in OSMO_IO mode This switches osmo_stream_{cli,srv} over to using the OSMO_IO mode instead of the classic OSMO_FD mode. The difference is that we no longer read/write directly to a file descriptor, but we pass message buffers to/from the library. This in turn allows the library to use more efficient I/O mechanisms as osmo_io backend, for example the Linux kernel io_uring. This re-introduces Change-Id: I7d02037990f4af405839309510dc6c04e36c3369 which was previously reverted due to regressions caused by a missing change in libosmo-netif. Depends: libosmo-netif.git I6cf5bad5f618e71c80017960c38009b089dbd6a1 Depends: libosmocore.git I89eb519b22d21011d61a7855b2364bc3c295df82 Closes: OS#5752 Change-Id: Ia1910f3b99d918ec2a34d5304c3f40ba015c25c9 --- M TODO-RELEASE M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/ss7_internal.h 4 files changed, 96 insertions(+), 232 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/59/36259/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36259?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia1910f3b99d918ec2a34d5304c3f40ba015c25c9 Gerrit-Change-Number: 36259 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: docs/shell: Give users some hints on what to do if encoding/decoding ...
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/36223?usp=email ) Change subject: docs/shell: Give users some hints on what to do if encoding/decoding fails ...................................................................... docs/shell: Give users some hints on what to do if encoding/decoding fails Change-Id: I557991da748126f3585b88b27706b29e0264635b Related: OS#6385 --- M docs/shell.rst 1 file changed, 37 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/docs/shell.rst b/docs/shell.rst index 487d22e..a27c450 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -505,6 +505,9 @@ :module: pySim.filesystem :func: LinFixedEF.ShellCommands.read_rec_dec_parser +If this command fails, it means that the record is not decodable, and you should use the :ref:`read_record` +command and proceed with manual decoding of the contents. + read_records ~~~~~~~~~~~~ @@ -519,6 +522,9 @@ :module: pySim.filesystem :func: LinFixedEF.ShellCommands.read_recs_dec_parser +If this command fails, it means that the record[s] are not decodable, and you should use the :ref:`read_records` +command and proceed with manual decoding of the contents. + update_record ~~~~~~~~~~~~~ @@ -533,6 +539,9 @@ :module: pySim.filesystem :func: LinFixedEF.ShellCommands.upd_rec_dec_parser +If this command fails, it means that the record is not encodable; please check your input and/or use the raw +:ref:`update_record` command. + edit_record_decoded ~~~~~~~~~~~~~~~~~~~ @@ -551,6 +560,12 @@ This allows for easy interactive modification of records. +If this command fails before the editor is spawned, it means that the current record contents is not decodable, +and you should use the :ref:`update_record_decoded` or :ref:`update_record` command. + +If this command fails after making your modificatiosn in the editor, it means that the new file contents is not +encodable; please check your input and/or us the raw :ref:`update_record` comamdn. + decode_hex ~~~~~~~~~~ @@ -579,6 +594,8 @@ :module: pySim.filesystem :func: TransparentEF.ShellCommands.read_bin_dec_parser +If this command fails, it means that the file is not decodable, and you should use the :ref:`read_binary` +command and proceed with manual decoding of the contents. update_binary ~~~~~~~~~~~~~ @@ -632,6 +649,10 @@ "extensions": "ff" } +If this command fails, it means that the file is not encodable; please check your input and/or use the raw +:ref:`update_binary` command. + + edit_binary_decoded ~~~~~~~~~~~~~~~~~~~ This command will read the selected binary EF, decode it to its JSON representation, save @@ -645,6 +666,12 @@ This allows for easy interactive modification of file contents. +If this command fails before the editor is spawned, it means that the current file contents is not decodable, +and you should use the :ref:`update_binary_decoded` or :ref:`update_binary` command. + +If this command fails after making your modificatiosn in the editor, it means that the new file contents is not +encodable; please check your input and/or us the raw :ref:`update_binary` comamdn. + decode_hex ~~~~~~~~~~ -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36223?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I557991da748126f3585b88b27706b29e0264635b Gerrit-Change-Number: 36223 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: docs/shell: Give users some hints on what to do if encoding/decoding ...
by laforge 13 Mar '24

13 Mar '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36223?usp=email ) Change subject: docs/shell: Give users some hints on what to do if encoding/decoding fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36223?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I557991da748126f3585b88b27706b29e0264635b Gerrit-Change-Number: 36223 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:05:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: rebar.config: Update required OTP version 25.2.3
by pespin 13 Mar '24

13 Mar '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36263?usp=email to look at the new patch set (#4). Change subject: rebar.config: Update required OTP version 25.2.3 ...................................................................... rebar.config: Update required OTP version 25.2.3 Since anyway we need debian12 for other reasons, like newer kernel, then also require OTP from debian12 which is the one being tested and we want to support. At the moment, debian12 OTP package version is 25.2.3. I am personally building with Archlinux's package version 26.2.2. Change-Id: I0ac7c93adbe88e1b738f1319cf1280c119ed59d1 --- M rebar.config 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/63/36263/4 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36263?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I0ac7c93adbe88e1b738f1319cf1280c119ed59d1 Gerrit-Change-Number: 36263 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[L] Change in ...osmo-epdg[master]: Implement RTR Deregistration-Reason PERMANENT_TERMINATION
by pespin 13 Mar '24

13 Mar '24

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email ) Change subject: Implement RTR Deregistration-Reason PERMANENT_TERMINATION ...................................................................... Patch Set 5: (1 comment) File src/aaa_diameter_swx_cb.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262/comment/a85227d6_0c97… PS2, Line 85: #'Deregistration-Reason'{'Reason-Code' = ?'REASON-CODE_PERMANENT_TERMINATION'} -> > Ah it's building in debian11, so again probably that's the culprit. […] In the end the problem was that the diameter files had to be forced to be rebuilt, which jenkins.sh was not doing before. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I57f2e02dc4034b63c118e4a4139b2830e38a2138 Gerrit-Change-Number: 36262 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 13 Mar 2024 19:20:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log