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

[XS] Change in osmo-hnbgw[master]: Remove unused field iuh_cs_mux_port
by pespin 17 Nov '25

17 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41437?usp=email ) Change subject: Remove unused field iuh_cs_mux_port ...................................................................... Remove unused field iuh_cs_mux_port Change-Id: Id7afe002c427c27168160f375444c61cb8cc401e --- M include/osmocom/hnbgw/hnbgw.h 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/37/41437/1 diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index f4ec21c..e26ae2d 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -88,9 +88,6 @@ const char *iuh_local_ip; /*! SCTP port for Iuh listening */ uint16_t iuh_local_port; - /*! The UDP port where we receive multiplexed CS user - * plane traffic from HNBs */ - uint16_t iuh_cs_mux_port; struct osmo_plmn_id plmn; uint16_t rnc_id; bool hnbap_allow_tmsi; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id7afe002c427c27168160f375444c61cb8cc401e Gerrit-Change-Number: 41437 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-hnbgw[master]: iuh: Allow setting tx-queue-max-length for all HNBs
by pespin 17 Nov '25

17 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41436?usp=email ) Change subject: iuh: Allow setting tx-queue-max-length for all HNBs ...................................................................... iuh: Allow setting tx-queue-max-length for all HNBs Related: SYS#7693 Change-Id: I8bc9e8bae7a4815dc2f2bc9e15401e01948d1748 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_vty.c M src/osmo-hnbgw/osmo_hnbgw_main.c M tests/osmo-hnbgw.vty 5 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/36/41436/1 diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index f4ec21c..b34e93e 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -71,6 +71,8 @@ #define IUH_MSGB_SIZE 2048 +#define IUH_TX_QUEUE_MAX_LENGTH 1024 + struct hnbgw_context_map; static inline bool cnlink_is_cs(const struct hnbgw_cnlink *cnlink) @@ -99,6 +101,9 @@ bool accept_all_hnb; struct mgcp_client_conf *mgcp_client; struct { + unsigned int tx_queue_max_length; + } iuh; + struct { char *local_addr; uint16_t local_port; char *remote_addr; diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index d237928..a8f827c 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -216,6 +216,7 @@ g_hnbgw->config.hnbap_allow_tmsi = true; g_hnbgw->config.log_prefix_hnb_id = true; g_hnbgw->config.accept_all_hnb = true; + g_hnbgw->config.iuh.tx_queue_max_length = IUH_TX_QUEUE_MAX_LENGTH; /* Set zero PLMN to detect a missing PLMN when transmitting RESET */ g_hnbgw->config.plmn = (struct osmo_plmn_id){ 0, 0, false }; diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index f463522..d98405b 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -321,6 +321,18 @@ return CMD_SUCCESS; } +DEFUN(cfg_hnbgw_iuh_tx_queue_max_length, cfg_hnbgw_iuh_tx_queue_max_length_cmd, + "tx-queue-max-length <0-65535>", + "Maximum transmit queue length, in msgbs\n" + "Amount of msgbs which can be queued at maximum in the tramist queue\n") +{ + g_hnbgw->config.iuh.tx_queue_max_length = atoi(argv[0]); + if (g_hnbgw->iuh) + osmo_stream_srv_link_set_tx_queue_max_length(g_hnbgw->iuh, + g_hnbgw->config.iuh.tx_queue_max_length); + return CMD_SUCCESS; +} + DEFUN(cfg_hnbgw_iuh_hnbap_allow_tmsi, cfg_hnbgw_iuh_hnbap_allow_tmsi_cmd, "hnbap-allow-tmsi (0|1)", "Allow HNBAP UE Register messages with TMSI or PTMSI identity\n" @@ -1042,6 +1054,9 @@ if (port && port != IUH_DEFAULT_SCTP_PORT) vty_out(vty, " local-port %u%s", port, VTY_NEWLINE); + if (g_hnbgw->config.iuh.tx_queue_max_length != IUH_TX_QUEUE_MAX_LENGTH) + vty_out(vty, " tx-queue-max-length %u%s", g_hnbgw->config.iuh.tx_queue_max_length, VTY_NEWLINE); + if (!g_hnbgw->config.hnbap_allow_tmsi) vty_out(vty, " hnbap-allow-tmsi 0%s", VTY_NEWLINE); @@ -1128,6 +1143,7 @@ install_element(IUH_NODE, &cfg_hnbgw_iuh_local_ip_cmd); install_element(IUH_NODE, &cfg_hnbgw_iuh_local_port_cmd); + install_element(IUH_NODE, &cfg_hnbgw_iuh_tx_queue_max_length_cmd); install_element(IUH_NODE, &cfg_hnbgw_iuh_hnbap_allow_tmsi_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_iucs_cmd); diff --git a/src/osmo-hnbgw/osmo_hnbgw_main.c b/src/osmo-hnbgw/osmo_hnbgw_main.c index b8b1b0b..1664f02 100644 --- a/src/osmo-hnbgw/osmo_hnbgw_main.c +++ b/src/osmo-hnbgw/osmo_hnbgw_main.c @@ -316,6 +316,7 @@ osmo_stream_srv_link_set_port(srv, g_hnbgw->config.iuh_local_port); osmo_stream_srv_link_set_accept_cb(srv, hnbgw_rua_accept_cb); osmo_stream_srv_link_set_msgb_alloc_info(srv, IUH_MSGB_SIZE, 0); + osmo_stream_srv_link_set_tx_queue_max_length(srv, g_hnbgw->config.iuh.tx_queue_max_length); if (osmo_stream_srv_link_open(srv) < 0) { perror("Cannot open server"); diff --git a/tests/osmo-hnbgw.vty b/tests/osmo-hnbgw.vty index 391605b..c3e1f11 100644 --- a/tests/osmo-hnbgw.vty +++ b/tests/osmo-hnbgw.vty @@ -84,6 +84,25 @@ rnc-id 42 ... +OsmoHNBGW(config-hnbgw)# iuh +OsmoHNBGW(config-hnbgw-iuh)# list +... + local-ip A.B.C.D + local-port <1-65535> + tx-queue-max-length <0-65535> + hnbap-allow-tmsi (0|1) +... + +OsmoHNBGW(config-hnbgw-iuh)# tx-queue-max-length 2000 +OsmoHNBGW(config-hnbgw-iuh)# show running-config +... +hnbgw +... + iuh + tx-queue-max-length 2000 +... +OsmoHNBGW(config-hnbgw-iuh)# exit + OsmoHNBGW(config-hnbgw)# nft-kpi? nft-kpi Retrieve traffic counters from nftables OsmoHNBGW(config-hnbgw)# nft-kpi ? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I8bc9e8bae7a4815dc2f2bc9e15401e01948d1748 Gerrit-Change-Number: 41436 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-hnbgw[master]: iuh: Use osmo_stream_srv_create2 API
by pespin 17 Nov '25

17 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41435?usp=email ) Change subject: iuh: Use osmo_stream_srv_create2 API ...................................................................... iuh: Use osmo_stream_srv_create2 API Thw newer libosmo-netif API uses osmo_io under the hood and allows using iu_uring as backend as well. Related: SYS#7693 Change-Id: If981eec0e73d696a8f68ae42ceb0db5a7a549ac3 --- M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/hnb.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c M src/osmo-hnbgw/osmo_hnbgw_main.c 5 files changed, 53 insertions(+), 65 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index a70905c..35a0fef 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -127,7 +127,7 @@ hash_add(hsu->hnbgw_context_map_by_conn_id, &map->hnbgw_sccp_user_entry, new_scu_conn_id); LOGP(DRUA, LOGL_INFO, "New conn: %s '%s' RUA-%u <-> SCCP-%u %s%s%s %s l=%s<->r=%s\n", - osmo_sock_get_name2_c(OTC_SELECT, osmo_stream_srv_get_ofd(map->hnb_ctx->conn)->fd), + osmo_sock_get_name2_c(OTC_SELECT, osmo_stream_srv_get_fd(map->hnb_ctx->conn)), hnb_context_name(map->hnb_ctx), map->rua_ctx_id, new_scu_conn_id, cnlink_selected->name, diff --git a/src/osmo-hnbgw/hnb.c b/src/osmo-hnbgw/hnb.c index 9938092..bd6b02c 100644 --- a/src/osmo-hnbgw/hnb.c +++ b/src/osmo-hnbgw/hnb.c @@ -95,7 +95,7 @@ return NULL; } -static int hnb_read_cb(struct osmo_stream_srv *conn); +static int hnb_read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg); static int hnb_closed_cb(struct osmo_stream_srv *conn); static struct hnb_context *hnb_context_alloc(struct osmo_stream_srv_link *link, int new_fd) @@ -107,12 +107,14 @@ return NULL; INIT_LLIST_HEAD(&ctx->map_list); - ctx->conn = osmo_stream_srv_create(g_hnbgw, link, new_fd, hnb_read_cb, hnb_closed_cb, ctx); + ctx->conn = osmo_stream_srv_create2(g_hnbgw, link, new_fd, ctx); if (!ctx->conn) { LOGP(DMAIN, LOGL_INFO, "error while creating connection\n"); talloc_free(ctx); return NULL; } + osmo_stream_srv_set_read_cb(ctx->conn, hnb_read_cb); + osmo_stream_srv_set_closed_cb(ctx->conn, hnb_closed_cb); llist_add_tail(&ctx->list, &g_hnbgw->hnb_list); return ctx; @@ -127,7 +129,7 @@ if (ctx->conn) { char hostbuf_r[INET6_ADDRSTRLEN]; char portbuf_r[6]; - int fd = osmo_stream_srv_get_ofd(ctx->conn)->fd; + int fd = osmo_stream_srv_get_fd(ctx->conn); /* get remote addr */ if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) == 0) @@ -176,7 +178,7 @@ if (ctx->conn) { /* we own a conn, we must free it: */ LOGHNB(ctx, DMAIN, LOGL_INFO, "Closing HNB SCTP connection %s\n", - osmo_sock_get_name2(osmo_stream_srv_get_ofd(ctx->conn)->fd)); + osmo_stream_srv_get_sockname(ctx->conn)); /* Avoid our closed_cb calling hnb_context_release() again: */ osmo_stream_srv_set_data(ctx->conn, NULL); osmo_stream_srv_destroy(ctx->conn); @@ -208,36 +210,30 @@ * SCTP Socket / stream handling ***********************************************************************/ -static int hnb_read_cb(struct osmo_stream_srv *conn) +static int hnb_read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct hnb_context *hnb = osmo_stream_srv_get_data(conn); - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); - struct msgb *msg = msgb_alloc(IUH_MSGB_SIZE, "Iuh rx"); + int flags = msgb_sctp_msg_flags(msg); int rc; - if (!msg) - return -ENOMEM; - OSMO_ASSERT(hnb); - /* we store a reference to the HomeNodeB in the msg->dest for the - * benefit of various downstream processing functions */ - msg->dst = hnb; - rc = osmo_stream_srv_recv(conn, msg); + LOGHNB(hnb, DMAIN, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", + __func__, res, flags); + /* Notification received */ - if (msgb_sctp_msg_flags(msg) & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { + if (flags & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { union sctp_notification *notif = (union sctp_notification *)msgb_data(msg); - rc = 0; switch (notif->sn_header.sn_type) { case SCTP_ASSOC_CHANGE: switch (notif->sn_assoc_change.sac_state) { case SCTP_COMM_LOST: LOGHNB(hnb, DMAIN, LOGL_NOTICE, "sctp_recvmsg(%s) = SCTP_COMM_LOST, closing conn\n", - osmo_sock_get_name2(ofd->fd)); + osmo_stream_srv_get_sockname(conn)); + msgb_free(msg); osmo_stream_srv_destroy(conn); - rc = -EBADF; - break; + return -EBADF; case SCTP_RESTART: LOGHNB(hnb, DMAIN, LOGL_NOTICE, "HNB SCTP conn RESTARTed, marking as HNBAP-unregistered\n"); hnb->hnb_registered = false; @@ -248,40 +244,41 @@ * queue may contain plenty of oldish messages to be sent. Since the HNB will re-register after * this, we simply drop all those old messages: */ osmo_stream_srv_clear_tx_queue(conn); - break; + msgb_free(msg); + return 0; } break; case SCTP_SHUTDOWN_EVENT: LOGHNB(hnb, DMAIN, LOGL_NOTICE, "sctp_recvmsg(%s) = SCTP_SHUTDOWN_EVENT, closing conn\n", - osmo_sock_get_name2(ofd->fd)); + osmo_stream_srv_get_sockname(conn)); + msgb_free(msg); osmo_stream_srv_destroy(conn); - rc = -EBADF; - break; - } - goto out; - } else if (rc == -EAGAIN) { - /* Older versions of osmo_stream_srv_recv() not supporting - * msgb_sctp_msg_flags() may still return -EAGAIN when an sctp - * notification is received. */ - rc = 0; - goto out; - } else if (rc < 0) { - LOGHNB(hnb, DMAIN, LOGL_ERROR, "Error during sctp_recvmsg(%s)\n", - osmo_sock_get_name2(ofd->fd)); - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; - } else if (rc == 0) { - LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Connection closed sctp_recvmsg(%s) = 0\n", - osmo_sock_get_name2(ofd->fd)); - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; - } else { - msgb_put(msg, rc); + return -EBADF; + default: + msgb_free(msg); + return 0; + }; } + if (OSMO_UNLIKELY(res < 0)) { + LOGHNB(hnb, DMAIN, LOGL_ERROR, "Error during sctp_recvmsg(%s)\n", + osmo_stream_srv_get_sockname(conn)); + msgb_free(msg); + osmo_stream_srv_destroy(conn); + return -EBADF; + } else if (OSMO_UNLIKELY(res == 0)) { + LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Connection closed sctp_recvmsg(%s) = 0\n", + osmo_stream_srv_get_sockname(conn)); + msgb_free(msg); + osmo_stream_srv_destroy(conn); + return -EBADF; + } + + /* we store a reference to the HomeNodeB in the msg->dest for the + * benefit of various downstream processing functions */ + msg->dst = hnb; + switch (msgb_sctp_ppid(msg)) { case IUH_PPI_HNBAP: hnb->hnbap_stream = msgb_sctp_stream(msg); @@ -290,7 +287,8 @@ case IUH_PPI_RUA: if (!hnb->hnb_registered) { LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Discarding RUA as HNB is not registered\n"); - goto out; + msgb_free(msg); + return 0; } hnb->rua_stream = msgb_sctp_stream(msg); rc = hnbgw_rua_rx(hnb, msg); @@ -307,7 +305,6 @@ break; } -out: msgb_free(msg); return rc; } @@ -318,6 +315,8 @@ if (!hnb) return 0; /* hnb_context is being freed, nothing do be done */ + LOGHNB(hnb, DMAIN, LOGL_INFO, "connection closed\n"); + /* hnb: conn became broken, let's release the associated hnb. * conn object is being freed after closed_cb(), so unassign it from hnb * if available to avoid it freeing it again: */ diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index b291513..8185f72 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -473,7 +473,7 @@ struct hnb_context *hnb, *tmp; HNBAP_HNBRegisterRequestIEs_t ies; int rc; - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(ctx->conn); + int fd = osmo_stream_srv_get_fd(ctx->conn); char identity_str[256]; const char *cell_id_str; struct timespec tp; @@ -503,7 +503,7 @@ osmo_plmn_from_bcd(ies.plmNidentity.buf, &ctx->id.plmn); cell_id_str = umts_cell_id_to_str(&ctx->id); - if (getpeername(ofd->fd, &cur_osa.u.sa, &len) < 0) { + if (getpeername(fd, &cur_osa.u.sa, &len) < 0) { LOGHNB(ctx, DHNBAP, LOGL_ERROR, "HNB-REGISTER-REQ %s: rejecting due to getpeername() error: %s\n", cell_id_str, strerror(errno)); hnbap_free_hnbregisterrequesties(&ies); @@ -535,10 +535,10 @@ if (hnb->hnb_registered && ctx != hnb && memcmp(&ctx->id, &hnb->id, sizeof(ctx->id)) == 0) { /* If it's coming from the same remote IP addr+port, then it must be our internal * fault (bug), and we release the old context to keep going... */ - struct osmo_fd *other_fd = osmo_stream_srv_get_ofd(hnb->conn); + int other_fd = osmo_stream_srv_get_fd(hnb->conn); struct osmo_sockaddr other_osa = {}; socklen_t len = sizeof(other_osa); - if (getpeername(other_fd->fd, &other_osa.u.sa, &len) < 0) { + if (getpeername(other_fd, &other_osa.u.sa, &len) < 0) { LOGHNB(ctx, DHNBAP, LOGL_ERROR, "BUG! Found old registered HNB with invalid socket, releasing it\n"); hnb_context_release(hnb); continue; diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index 7d78909..f463522 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -176,18 +176,6 @@ return CMD_SUCCESS; } -static void vty_out_ofd_addr(struct vty *vty, struct osmo_fd *ofd) -{ - char *name; - if (!ofd || ofd->fd < 0 - || !(name = osmo_sock_get_name(vty, ofd->fd))) { - vty_out(vty, "(no addr)"); - return; - } - vty_out(vty, "%s", name); - talloc_free(name); -} - static void vty_dump_hnb_info__map_states(struct vty *vty, const char *name, unsigned int count, unsigned int state_count[]) { @@ -211,7 +199,7 @@ unsigned long long sec; vty_out(vty, "HNB "); - vty_out_ofd_addr(vty, hnb->conn? osmo_stream_srv_get_ofd(hnb->conn) : NULL); + vty_out(vty, "%s", hnb->conn ? osmo_stream_srv_get_sockname(hnb->conn) : "(no addr)"); vty_out(vty, " \"%s\"%s", hnb->identity_info, VTY_NEWLINE); vty_out(vty, " MCC %s MNC %s LAC %u RAC %u SAC %u CID %u SCTP-stream:HNBAP=%u,RUA=%u%s", osmo_mcc_name(hnb->id.plmn.mcc), osmo_mnc_name(hnb->id.plmn.mnc, hnb->id.plmn.mnc_3_digits), diff --git a/src/osmo-hnbgw/osmo_hnbgw_main.c b/src/osmo-hnbgw/osmo_hnbgw_main.c index 0f932d9..b8b1b0b 100644 --- a/src/osmo-hnbgw/osmo_hnbgw_main.c +++ b/src/osmo-hnbgw/osmo_hnbgw_main.c @@ -315,6 +315,7 @@ osmo_stream_srv_link_set_addr(srv, g_hnbgw->config.iuh_local_ip); osmo_stream_srv_link_set_port(srv, g_hnbgw->config.iuh_local_port); osmo_stream_srv_link_set_accept_cb(srv, hnbgw_rua_accept_cb); + osmo_stream_srv_link_set_msgb_alloc_info(srv, IUH_MSGB_SIZE, 0); if (osmo_stream_srv_link_open(srv) < 0) { perror("Cannot open server"); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If981eec0e73d696a8f68ae42ceb0db5a7a549ac3 Gerrit-Change-Number: 41435 Gerrit-PatchSet: 1 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>

1 0

[M] Change in osmo-hnbgw[master]: iuh: Use osmo_stream_srv_create2 API
by fixeria 17 Nov '25

17 Nov '25

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41435?usp=email ) Change subject: iuh: Use osmo_stream_srv_create2 API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If981eec0e73d696a8f68ae42ceb0db5a7a549ac3 Gerrit-Change-Number: 41435 Gerrit-PatchSet: 1 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Nov 2025 10:51:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-hnbgw[master]: iuh: Use osmo_stream_srv_create2 API
by osmith 17 Nov '25

17 Nov '25

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41435?usp=email ) Change subject: iuh: Use osmo_stream_srv_create2 API ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If981eec0e73d696a8f68ae42ceb0db5a7a549ac3 Gerrit-Change-Number: 41435 Gerrit-PatchSet: 1 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Nov 2025 10:37:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-netif[master]: cosmetic: Fix typo in doc of osmo_stream_srv_get_sockname()
by pespin 17 Nov '25

17 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/41433?usp=email ) Change subject: cosmetic: Fix typo in doc of osmo_stream_srv_get_sockname() ...................................................................... cosmetic: Fix typo in doc of osmo_stream_srv_get_sockname() Change-Id: I7655b6cf0f734c07cc5d985dc834f45a97a425bb --- M src/stream_srv.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/stream_srv.c b/src/stream_srv.c index 2e80909..cc32dc7 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -1235,7 +1235,7 @@ /*! Retrieve the stream server socket description. * The returned name is stored in a static buffer; it is hence not re-entrant or thread-safe! - * \param[in] cli Stream Server to examine + * \param[in] conn Stream Server to examine * \returns Socket description or NULL in case of error */ const char *osmo_stream_srv_get_sockname(const struct osmo_stream_srv *conn) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/41433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7655b6cf0f734c07cc5d985dc834f45a97a425bb Gerrit-Change-Number: 41433 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-hnbgw[master]: iuh: Use osmo_stream_srv_create2 API
by pespin 17 Nov '25

17 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41435?usp=email ) Change subject: iuh: Use osmo_stream_srv_create2 API ...................................................................... iuh: Use osmo_stream_srv_create2 API Thw newer libosmo-netif API uses osmo_io under the hood and allows using iu_uring as backend as well. Related: SYS#7693 Change-Id: If981eec0e73d696a8f68ae42ceb0db5a7a549ac3 --- M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/hnb.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c M src/osmo-hnbgw/osmo_hnbgw_main.c 5 files changed, 53 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/35/41435/1 diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index a70905c..35a0fef 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -127,7 +127,7 @@ hash_add(hsu->hnbgw_context_map_by_conn_id, &map->hnbgw_sccp_user_entry, new_scu_conn_id); LOGP(DRUA, LOGL_INFO, "New conn: %s '%s' RUA-%u <-> SCCP-%u %s%s%s %s l=%s<->r=%s\n", - osmo_sock_get_name2_c(OTC_SELECT, osmo_stream_srv_get_ofd(map->hnb_ctx->conn)->fd), + osmo_sock_get_name2_c(OTC_SELECT, osmo_stream_srv_get_fd(map->hnb_ctx->conn)), hnb_context_name(map->hnb_ctx), map->rua_ctx_id, new_scu_conn_id, cnlink_selected->name, diff --git a/src/osmo-hnbgw/hnb.c b/src/osmo-hnbgw/hnb.c index 9938092..bd6b02c 100644 --- a/src/osmo-hnbgw/hnb.c +++ b/src/osmo-hnbgw/hnb.c @@ -95,7 +95,7 @@ return NULL; } -static int hnb_read_cb(struct osmo_stream_srv *conn); +static int hnb_read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg); static int hnb_closed_cb(struct osmo_stream_srv *conn); static struct hnb_context *hnb_context_alloc(struct osmo_stream_srv_link *link, int new_fd) @@ -107,12 +107,14 @@ return NULL; INIT_LLIST_HEAD(&ctx->map_list); - ctx->conn = osmo_stream_srv_create(g_hnbgw, link, new_fd, hnb_read_cb, hnb_closed_cb, ctx); + ctx->conn = osmo_stream_srv_create2(g_hnbgw, link, new_fd, ctx); if (!ctx->conn) { LOGP(DMAIN, LOGL_INFO, "error while creating connection\n"); talloc_free(ctx); return NULL; } + osmo_stream_srv_set_read_cb(ctx->conn, hnb_read_cb); + osmo_stream_srv_set_closed_cb(ctx->conn, hnb_closed_cb); llist_add_tail(&ctx->list, &g_hnbgw->hnb_list); return ctx; @@ -127,7 +129,7 @@ if (ctx->conn) { char hostbuf_r[INET6_ADDRSTRLEN]; char portbuf_r[6]; - int fd = osmo_stream_srv_get_ofd(ctx->conn)->fd; + int fd = osmo_stream_srv_get_fd(ctx->conn); /* get remote addr */ if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) == 0) @@ -176,7 +178,7 @@ if (ctx->conn) { /* we own a conn, we must free it: */ LOGHNB(ctx, DMAIN, LOGL_INFO, "Closing HNB SCTP connection %s\n", - osmo_sock_get_name2(osmo_stream_srv_get_ofd(ctx->conn)->fd)); + osmo_stream_srv_get_sockname(ctx->conn)); /* Avoid our closed_cb calling hnb_context_release() again: */ osmo_stream_srv_set_data(ctx->conn, NULL); osmo_stream_srv_destroy(ctx->conn); @@ -208,36 +210,30 @@ * SCTP Socket / stream handling ***********************************************************************/ -static int hnb_read_cb(struct osmo_stream_srv *conn) +static int hnb_read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct hnb_context *hnb = osmo_stream_srv_get_data(conn); - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); - struct msgb *msg = msgb_alloc(IUH_MSGB_SIZE, "Iuh rx"); + int flags = msgb_sctp_msg_flags(msg); int rc; - if (!msg) - return -ENOMEM; - OSMO_ASSERT(hnb); - /* we store a reference to the HomeNodeB in the msg->dest for the - * benefit of various downstream processing functions */ - msg->dst = hnb; - rc = osmo_stream_srv_recv(conn, msg); + LOGHNB(hnb, DMAIN, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", + __func__, res, flags); + /* Notification received */ - if (msgb_sctp_msg_flags(msg) & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { + if (flags & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { union sctp_notification *notif = (union sctp_notification *)msgb_data(msg); - rc = 0; switch (notif->sn_header.sn_type) { case SCTP_ASSOC_CHANGE: switch (notif->sn_assoc_change.sac_state) { case SCTP_COMM_LOST: LOGHNB(hnb, DMAIN, LOGL_NOTICE, "sctp_recvmsg(%s) = SCTP_COMM_LOST, closing conn\n", - osmo_sock_get_name2(ofd->fd)); + osmo_stream_srv_get_sockname(conn)); + msgb_free(msg); osmo_stream_srv_destroy(conn); - rc = -EBADF; - break; + return -EBADF; case SCTP_RESTART: LOGHNB(hnb, DMAIN, LOGL_NOTICE, "HNB SCTP conn RESTARTed, marking as HNBAP-unregistered\n"); hnb->hnb_registered = false; @@ -248,40 +244,41 @@ * queue may contain plenty of oldish messages to be sent. Since the HNB will re-register after * this, we simply drop all those old messages: */ osmo_stream_srv_clear_tx_queue(conn); - break; + msgb_free(msg); + return 0; } break; case SCTP_SHUTDOWN_EVENT: LOGHNB(hnb, DMAIN, LOGL_NOTICE, "sctp_recvmsg(%s) = SCTP_SHUTDOWN_EVENT, closing conn\n", - osmo_sock_get_name2(ofd->fd)); + osmo_stream_srv_get_sockname(conn)); + msgb_free(msg); osmo_stream_srv_destroy(conn); - rc = -EBADF; - break; - } - goto out; - } else if (rc == -EAGAIN) { - /* Older versions of osmo_stream_srv_recv() not supporting - * msgb_sctp_msg_flags() may still return -EAGAIN when an sctp - * notification is received. */ - rc = 0; - goto out; - } else if (rc < 0) { - LOGHNB(hnb, DMAIN, LOGL_ERROR, "Error during sctp_recvmsg(%s)\n", - osmo_sock_get_name2(ofd->fd)); - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; - } else if (rc == 0) { - LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Connection closed sctp_recvmsg(%s) = 0\n", - osmo_sock_get_name2(ofd->fd)); - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; - } else { - msgb_put(msg, rc); + return -EBADF; + default: + msgb_free(msg); + return 0; + }; } + if (OSMO_UNLIKELY(res < 0)) { + LOGHNB(hnb, DMAIN, LOGL_ERROR, "Error during sctp_recvmsg(%s)\n", + osmo_stream_srv_get_sockname(conn)); + msgb_free(msg); + osmo_stream_srv_destroy(conn); + return -EBADF; + } else if (OSMO_UNLIKELY(res == 0)) { + LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Connection closed sctp_recvmsg(%s) = 0\n", + osmo_stream_srv_get_sockname(conn)); + msgb_free(msg); + osmo_stream_srv_destroy(conn); + return -EBADF; + } + + /* we store a reference to the HomeNodeB in the msg->dest for the + * benefit of various downstream processing functions */ + msg->dst = hnb; + switch (msgb_sctp_ppid(msg)) { case IUH_PPI_HNBAP: hnb->hnbap_stream = msgb_sctp_stream(msg); @@ -290,7 +287,8 @@ case IUH_PPI_RUA: if (!hnb->hnb_registered) { LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Discarding RUA as HNB is not registered\n"); - goto out; + msgb_free(msg); + return 0; } hnb->rua_stream = msgb_sctp_stream(msg); rc = hnbgw_rua_rx(hnb, msg); @@ -307,7 +305,6 @@ break; } -out: msgb_free(msg); return rc; } @@ -318,6 +315,8 @@ if (!hnb) return 0; /* hnb_context is being freed, nothing do be done */ + LOGHNB(hnb, DMAIN, LOGL_INFO, "connection closed\n"); + /* hnb: conn became broken, let's release the associated hnb. * conn object is being freed after closed_cb(), so unassign it from hnb * if available to avoid it freeing it again: */ diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index b291513..8185f72 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -473,7 +473,7 @@ struct hnb_context *hnb, *tmp; HNBAP_HNBRegisterRequestIEs_t ies; int rc; - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(ctx->conn); + int fd = osmo_stream_srv_get_fd(ctx->conn); char identity_str[256]; const char *cell_id_str; struct timespec tp; @@ -503,7 +503,7 @@ osmo_plmn_from_bcd(ies.plmNidentity.buf, &ctx->id.plmn); cell_id_str = umts_cell_id_to_str(&ctx->id); - if (getpeername(ofd->fd, &cur_osa.u.sa, &len) < 0) { + if (getpeername(fd, &cur_osa.u.sa, &len) < 0) { LOGHNB(ctx, DHNBAP, LOGL_ERROR, "HNB-REGISTER-REQ %s: rejecting due to getpeername() error: %s\n", cell_id_str, strerror(errno)); hnbap_free_hnbregisterrequesties(&ies); @@ -535,10 +535,10 @@ if (hnb->hnb_registered && ctx != hnb && memcmp(&ctx->id, &hnb->id, sizeof(ctx->id)) == 0) { /* If it's coming from the same remote IP addr+port, then it must be our internal * fault (bug), and we release the old context to keep going... */ - struct osmo_fd *other_fd = osmo_stream_srv_get_ofd(hnb->conn); + int other_fd = osmo_stream_srv_get_fd(hnb->conn); struct osmo_sockaddr other_osa = {}; socklen_t len = sizeof(other_osa); - if (getpeername(other_fd->fd, &other_osa.u.sa, &len) < 0) { + if (getpeername(other_fd, &other_osa.u.sa, &len) < 0) { LOGHNB(ctx, DHNBAP, LOGL_ERROR, "BUG! Found old registered HNB with invalid socket, releasing it\n"); hnb_context_release(hnb); continue; diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index 7d78909..f463522 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -176,18 +176,6 @@ return CMD_SUCCESS; } -static void vty_out_ofd_addr(struct vty *vty, struct osmo_fd *ofd) -{ - char *name; - if (!ofd || ofd->fd < 0 - || !(name = osmo_sock_get_name(vty, ofd->fd))) { - vty_out(vty, "(no addr)"); - return; - } - vty_out(vty, "%s", name); - talloc_free(name); -} - static void vty_dump_hnb_info__map_states(struct vty *vty, const char *name, unsigned int count, unsigned int state_count[]) { @@ -211,7 +199,7 @@ unsigned long long sec; vty_out(vty, "HNB "); - vty_out_ofd_addr(vty, hnb->conn? osmo_stream_srv_get_ofd(hnb->conn) : NULL); + vty_out(vty, "%s", hnb->conn ? osmo_stream_srv_get_sockname(hnb->conn) : "(no addr)"); vty_out(vty, " \"%s\"%s", hnb->identity_info, VTY_NEWLINE); vty_out(vty, " MCC %s MNC %s LAC %u RAC %u SAC %u CID %u SCTP-stream:HNBAP=%u,RUA=%u%s", osmo_mcc_name(hnb->id.plmn.mcc), osmo_mnc_name(hnb->id.plmn.mnc, hnb->id.plmn.mnc_3_digits), diff --git a/src/osmo-hnbgw/osmo_hnbgw_main.c b/src/osmo-hnbgw/osmo_hnbgw_main.c index 0f932d9..b8b1b0b 100644 --- a/src/osmo-hnbgw/osmo_hnbgw_main.c +++ b/src/osmo-hnbgw/osmo_hnbgw_main.c @@ -315,6 +315,7 @@ osmo_stream_srv_link_set_addr(srv, g_hnbgw->config.iuh_local_ip); osmo_stream_srv_link_set_port(srv, g_hnbgw->config.iuh_local_port); osmo_stream_srv_link_set_accept_cb(srv, hnbgw_rua_accept_cb); + osmo_stream_srv_link_set_msgb_alloc_info(srv, IUH_MSGB_SIZE, 0); if (osmo_stream_srv_link_open(srv) < 0) { perror("Cannot open server"); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If981eec0e73d696a8f68ae42ceb0db5a7a549ac3 Gerrit-Change-Number: 41435 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-netif[master]: stream: Support overwriting tx_queue_max_length per srv conn
by osmith 17 Nov '25

17 Nov '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/41434?usp=email ) Change subject: stream: Support overwriting tx_queue_max_length per srv conn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/41434?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibc68612bd8dee4f9b8031ce2c3f5c7ff6bb639e3 Gerrit-Change-Number: 41434 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Nov 2025 10:33:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-netif[master]: cosmetic: Fix typo in doc of osmo_stream_srv_get_sockname()
by osmith 17 Nov '25

17 Nov '25

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/41433?usp=email ) Change subject: cosmetic: Fix typo in doc of osmo_stream_srv_get_sockname() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/41433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7655b6cf0f734c07cc5d985dc834f45a97a425bb Gerrit-Change-Number: 41433 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Nov 2025 10:32:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-netif[master]: cosmetic: Fix typo in doc of osmo_stream_srv_get_sockname()
by pespin 17 Nov '25

17 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/41433?usp=email ) Change subject: cosmetic: Fix typo in doc of osmo_stream_srv_get_sockname() ...................................................................... cosmetic: Fix typo in doc of osmo_stream_srv_get_sockname() Change-Id: I7655b6cf0f734c07cc5d985dc834f45a97a425bb --- M src/stream_srv.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/33/41433/1 diff --git a/src/stream_srv.c b/src/stream_srv.c index 2e80909..cc32dc7 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -1235,7 +1235,7 @@ /*! Retrieve the stream server socket description. * The returned name is stored in a static buffer; it is hence not re-entrant or thread-safe! - * \param[in] cli Stream Server to examine + * \param[in] conn Stream Server to examine * \returns Socket description or NULL in case of error */ const char *osmo_stream_srv_get_sockname(const struct osmo_stream_srv *conn) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/41433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7655b6cf0f734c07cc5d985dc834f45a97a425bb Gerrit-Change-Number: 41433 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2025

2024

2023

2022

gerrit-log November 2025