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

[S] Change in osmo-ttcn3-hacks[master]: hlr: pyhss: make TC_gsup_ul_subscriber_data pass
by osmith 21 Nov '25

21 Nov '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41474?usp=email ) Change subject: hlr: pyhss: make TC_gsup_ul_subscriber_data pass ...................................................................... hlr: pyhss: make TC_gsup_ul_subscriber_data pass Extend the PDP Info IE templates with wildcards, as PyHSS adds additional IEs in PDP info, currently PDP Address and an empty Quality of Service IE. The PDP Address IE is marked as "conditional" with the note "The conditional IE are mandantory unless mentioned otherwise": https://gitea.osmocom.org/cellular-infrastructure/osmo-gsm-manuals/src/comm… The reason why I had previously disabled the test with PyHSS was wrong (confused send auth info with insert subscriber data). With this patch and the following changes in PyHSS, the test passes: * https://github.com/nickvsnetworking/pyhss/pull/277 * https://github.com/nickvsnetworking/pyhss/pull/278 Change-Id: I5441d7eeb4b36e9ed499e36ae839b87ce9888d52 --- M hlr/HLR_Tests.ttcn 1 file changed, 14 insertions(+), 10 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 6cfc08f..5048005 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -1164,11 +1164,15 @@ template GSUP_IEs tr_pdp_info_internet := { tr_GSUP_IE_PDP_CONTEXT_ID('01'O), - tr_GSUP_IE_APN(str2apn("internet")) + *, /* PDP Address (sent by PyHSS, omitted by OsmoHLR) */ + tr_GSUP_IE_APN(str2apn("internet")), + * } template GSUP_IEs tr_pdp_info_wildcard := { tr_GSUP_IE_PDP_CONTEXT_ID('02'O), - tr_GSUP_IE_APN(str2apn("*")) + *, /* PDP Address (sent by PyHSS, omitted by OsmoHLR) */ + tr_GSUP_IE_APN(str2apn("*")), + * } /* Search for PDP info 'internet', '*' */ @@ -1212,9 +1216,13 @@ var HlrSubscriberList sl; f_init(false); - f_vty_config2(VTY, {"hlr", "ps"} , "no pdp-profiles default"); - f_vty_config2(VTY, {"hlr", "ps", "pdp-profiles default", "profile 1"}, "apn internet"); - f_vty_config2(VTY, {"hlr", "ps", "pdp-profiles default", "profile 2"}, "apn *"); + if (m_hlr_impl == HLR_IMPL_OSMOCOM) { + f_vty_config2(VTY, {"hlr", "ps"} , "no pdp-profiles default"); + f_vty_config2(VTY, {"hlr", "ps", "pdp-profiles default", "profile 1"}, "apn internet"); + f_vty_config2(VTY, {"hlr", "ps", "pdp-profiles default", "profile 2"}, "apn *"); + } else { + /* PyHSS: already set via setup_db.sh */ + } sl := f_gen_subs(); f_start_handler_per_sub(refers(f_TC_gsup_ul_subscriber_data), sl); @@ -2206,6 +2214,7 @@ execute( TC_gsup_ul_unknown_imsi() ); execute( TC_gsup_sai_err_unknown_imsi() ); execute( TC_gsup_ul() ); + execute( TC_gsup_ul_subscriber_data() ); execute( TC_gsup_purge_cs() ); execute( TC_gsup_purge_ps() ); execute( TC_gsup_purge_unknown() ); @@ -2240,11 +2249,6 @@ * run it with osmo_dia2gsup. */ execute( TC_gsup_sai_eps() ); - /* OsmoHLR + osmo_dia2gsup: check for PDP Info IE in Send - * Authentication Info Request (see SYS#6391 and - * https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35899) */ - execute( TC_gsup_ul_subscriber_data() ); - /* OsmoHLR's VTY interface */ execute( TC_vty() ); execute( TC_vty_msisdn_isd() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41474?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5441d7eeb4b36e9ed499e36ae839b87ce9888d52 Gerrit-Change-Number: 41474 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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

[XS] Change in osmo-gsm-manuals[master]: GSUP: PDP Context ID: start at 1
by osmith 21 Nov '25

21 Nov '25

Attention is currently required from: fixeria, laforge, lynxis lazus, pespin. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/41471?usp=email ) Change subject: GSUP: PDP Context ID: start at 1 ...................................................................... Patch Set 2: (1 comment) File common/chapters/gsup.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/41471/comment/11793dc0_9725… : PS2, Line 1279: not 0 > Maybe say `0 is reserved`? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/41471?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9c39002cb7f7dd81ae0f1f0f9d80df1aaf399f48 Gerrit-Change-Number: 41471 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 21 Nov 2025 12:14:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-gsm-manuals[master]: GSUP: PDP Context ID: start at 1
by osmith 21 Nov '25

21 Nov '25

Attention is currently required from: fixeria, laforge, lynxis lazus, osmith, pespin. Hello Jenkins Builder, fixeria, laforge, lynxis lazus, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/41471?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: GSUP: PDP Context ID: start at 1 ...................................................................... GSUP: PDP Context ID: start at 1 In OsmoHLR, PDP Contexts can have IDs <1-10>. 0 is used internally to mark a profile slot as disabled: https://gitea.osmocom.org/cellular-infrastructure/osmo-hlr/src/commit/d4b45… HLR Test TC_gsup_ul_subscriber_data in osmo-ttcn3-hacks also makes this assumption: https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/src/commit/85276b94c474bb6… However the new GSUP implementation in PyHSS started its IDs at 0. I've suggested to start it at 1 here: https://github.com/nickvsnetworking/pyhss/pull/277/files/4b6da7447438778068… Change-Id: I9c39002cb7f7dd81ae0f1f0f9d80df1aaf399f48 --- M common/chapters/gsup.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/71/41471/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/41471?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9c39002cb7f7dd81ae0f1f0f9d80df1aaf399f48 Gerrit-Change-Number: 41471 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-upf[master]: Validate session remote CP F-SEID and use it to transmit session requ...
by pespin 21 Nov '25

21 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/41482?usp=email ) Change subject: Validate session remote CP F-SEID and use it to transmit session requests ...................................................................... Validate session remote CP F-SEID and use it to transmit session requests Change-Id: Ifccd4d2b8d500c9928778400bb096baaa12c9a31 --- M include/osmocom/upf/pfcp_entity_peer.h M src/osmo-upf/pfcp_entity_peer.c M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_session.c 4 files changed, 155 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/82/41482/1 diff --git a/include/osmocom/upf/pfcp_entity_peer.h b/include/osmocom/upf/pfcp_entity_peer.h index d2727e5..ae771eb 100644 --- a/include/osmocom/upf/pfcp_entity_peer.h +++ b/include/osmocom/upf/pfcp_entity_peer.h @@ -73,9 +73,12 @@ char *pfcp_entity_peer_remote_addr_str(struct pfcp_entity_peer *entity_peer); -struct osmo_pfcp_msg *pfcp_entity_peer_init_tx(struct pfcp_entity_peer *entity_peer, - struct osmo_pfcp_msg *in_reply_to, - enum osmo_pfcp_message_type message_type); +struct osmo_pfcp_msg *pfcp_entity_peer_init_tx_req(struct pfcp_entity_peer *peer, + const struct osmo_sockaddr *dst_addr, + enum osmo_pfcp_message_type message_type); +struct osmo_pfcp_msg *pfcp_entity_peer_init_tx_resp(struct pfcp_entity_peer *peer, + struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type message_type); struct up_session *pfcp_entity_peer_find_up_session_by_up_seid(struct pfcp_entity_peer *entity_peer, uint64_t up_seid); struct up_session *pfcp_entity_peer_find_up_session_by_cp_f_seid(struct pfcp_entity_peer *entity_peer, const struct osmo_pfcp_ie_f_seid *cp_f_seid); diff --git a/src/osmo-upf/pfcp_entity_peer.c b/src/osmo-upf/pfcp_entity_peer.c index db02f78..7b8c28d 100644 --- a/src/osmo-upf/pfcp_entity_peer.c +++ b/src/osmo-upf/pfcp_entity_peer.c @@ -194,15 +194,22 @@ m->ctx.peer_use_token = NULL; } -struct osmo_pfcp_msg *pfcp_entity_peer_init_tx(struct pfcp_entity_peer *peer, - struct osmo_pfcp_msg *in_reply_to, - enum osmo_pfcp_message_type message_type) +struct osmo_pfcp_msg *pfcp_entity_peer_init_tx_req(struct pfcp_entity_peer *peer, + const struct osmo_sockaddr *dst_addr, + enum osmo_pfcp_message_type message_type) { struct osmo_pfcp_msg *tx; - if (in_reply_to) - tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, in_reply_to, message_type); - else - tx = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, message_type); + tx = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, dst_addr, message_type); + pfcp_entity_peer_set_msg_ctx(peer, tx); + return tx; +} + +struct osmo_pfcp_msg *pfcp_entity_peer_init_tx_resp(struct pfcp_entity_peer *peer, + struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type message_type) +{ + struct osmo_pfcp_msg *tx; + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, in_reply_to, message_type); pfcp_entity_peer_set_msg_ctx(peer, tx); return tx; } @@ -211,7 +218,7 @@ { struct osmo_pfcp_msg *resp; - resp = pfcp_entity_peer_init_tx(entity_peer, m, OSMO_PFCP_MSGT_ASSOC_SETUP_RESP); + resp = pfcp_entity_peer_init_tx_resp(entity_peer, m, OSMO_PFCP_MSGT_ASSOC_SETUP_RESP); resp->ies.assoc_setup_resp = (struct osmo_pfcp_msg_assoc_setup_resp) { .cause = cause, @@ -232,7 +239,7 @@ { struct osmo_pfcp_msg *resp; - resp = pfcp_entity_peer_init_tx(peer, m, OSMO_PFCP_MSGT_ASSOC_RELEASE_RESP); + resp = pfcp_entity_peer_init_tx_resp(peer, m, OSMO_PFCP_MSGT_ASSOC_RELEASE_RESP); resp->ies.assoc_release_resp = (struct osmo_pfcp_msg_assoc_release_resp) { .cause = cause, @@ -307,7 +314,9 @@ { enum osmo_pfcp_cause cause = OSMO_PFCP_CAUSE_REQUEST_ACCEPTED; struct osmo_pfcp_msg *resp; - struct up_session *session = pfcp_entity_peer_find_up_session_by_cp_f_seid(peer, &m->ies.session_est_req.cp_f_seid); + struct up_session *session; + + session = pfcp_entity_peer_find_up_session_by_cp_f_seid(peer, &m->ies.session_est_req.cp_f_seid); if (!session) session = up_session_alloc(peer, &m->ies.session_est_req.cp_f_seid); if (!session) { @@ -324,7 +333,7 @@ return; nack_response: - resp = pfcp_entity_peer_init_tx(peer, m, OSMO_PFCP_MSGT_SESSION_EST_RESP); + resp = pfcp_entity_peer_init_tx_resp(peer, m, OSMO_PFCP_MSGT_SESSION_EST_RESP); resp->h.seid = m->ies.session_est_req.cp_f_seid.seid; resp->h.seid_present = true; resp->ies.session_est_resp = (struct osmo_pfcp_msg_session_est_resp){ diff --git a/src/osmo-upf/up_endpoint.c b/src/osmo-upf/up_endpoint.c index f53dc50..8161042 100644 --- a/src/osmo-upf/up_endpoint.c +++ b/src/osmo-upf/up_endpoint.c @@ -166,61 +166,137 @@ OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); } +/* Validate received F-SEID IP address */ +static enum osmo_pfcp_cause up_ep_validate_cp_f_seid_addr(const struct up_endpoint *up_ep, + const struct osmo_pfcp_ie_f_seid *f_seid) +{ + const struct osmo_sockaddr *local_addr; + + OSMO_ASSERT(up_ep); + OSMO_ASSERT(f_seid) + + /* Validate the F-SEID contains an IP address we can send requests to later on: */ + local_addr = osmo_pfcp_endpoint_get_local_addr(up_ep->pfcp_ep); + OSMO_ASSERT(local_addr); + switch (local_addr->u.sa.sa_family) { + case AF_INET: + if (!f_seid->ip_addr.v4_present) + return OSMO_PFCP_CAUSE_MANDATORY_IE_INCORRECT; + break; + case AF_INET6: + if (!f_seid->ip_addr.v4_present && + !f_seid->ip_addr.v6_present) + return OSMO_PFCP_CAUSE_MANDATORY_IE_INCORRECT; + break; + default: + OSMO_ASSERT(0); + } + return OSMO_PFCP_CAUSE_REQUEST_ACCEPTED; +} + static void up_ep_rx_session_est_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { - if (!m->ctx.peer_fi) { - struct osmo_pfcp_msg *tx; - OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot establish session\n"); - tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_EST_RESP); - tx->ies.session_est_resp.cause = OSMO_PFCP_CAUSE_NO_ESTABLISHED_PFCP_ASSOC; - osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, tx); - return; + struct osmo_pfcp_msg *resp; + enum osmo_pfcp_cause cause; + + cause = up_ep_validate_cp_f_seid_addr(up_ep, &m->ies.session_est_req.cp_f_seid); + if (cause != OSMO_PFCP_CAUSE_REQUEST_ACCEPTED) { + OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Remote CP F-SEID IP address invalid\n"); + goto nack_response; } + + if (!m->ctx.peer_fi) { + OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot establish session\n"); + cause = OSMO_PFCP_CAUSE_NO_ESTABLISHED_PFCP_ASSOC; + goto nack_response; + } + osmo_fsm_inst_dispatch(m->ctx.peer_fi, PFCP_ENTITY_PEER_EV_RX_SESSION_EST_REQ, (void *)m); + return; + +nack_response: + resp = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_EST_RESP); + resp->ies.session_est_resp.cause = cause; + osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, resp); } static void up_ep_rx_session_mod_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { + struct osmo_pfcp_msg *resp; + enum osmo_pfcp_cause cause; + + if (m->ies.session_mod_req.cp_f_seid_present) { + cause = up_ep_validate_cp_f_seid_addr(up_ep, &m->ies.session_mod_req.cp_f_seid); + if (cause != OSMO_PFCP_CAUSE_REQUEST_ACCEPTED) { + OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Remote CP F-SEID IP address invalid\n"); + goto nack_response; + } + } + if (!m->ctx.session_fi) { /* Session not found. */ - struct osmo_pfcp_msg *tx; - tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_MOD_RESP); if (!m->ctx.peer_fi) { /* Not even the peer is associated. */ OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot modify session\n"); - tx->ies.session_mod_resp.cause = OSMO_PFCP_CAUSE_NO_ESTABLISHED_PFCP_ASSOC; + cause = OSMO_PFCP_CAUSE_NO_ESTABLISHED_PFCP_ASSOC; + goto nack_response; } else { OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "No established session with SEID=0x%"PRIx64", cannot modify\n", m->h.seid); - tx->ies.session_mod_resp.cause = OSMO_PFCP_CAUSE_SESSION_CTX_NOT_FOUND; + cause = OSMO_PFCP_CAUSE_SESSION_CTX_NOT_FOUND; + goto nack_response; } - osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, tx); - return; } + osmo_fsm_inst_dispatch(m->ctx.session_fi, UP_SESSION_EV_RX_SESSION_MOD_REQ, (void *)m); + return; + +nack_response: + resp = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_MOD_RESP); + resp->ies.session_mod_resp.cause = cause; + osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, resp); } static void up_ep_rx_session_del_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { + struct osmo_pfcp_msg *resp; + enum osmo_pfcp_cause cause; + +#if 0 + /* Can be enabled once libosmo-pfcp struct osmo_pfcp_msg_session_del_req supports the IE: */ + if (m->ies.session_del_req.cp_f_seid_present) { + cause = up_ep_validate_cp_f_seid_addr(up_ep, &m->ies.session_mod_req.cp_f_seid); + if (cause != OSMO_PFCP_CAUSE_REQUEST_ACCEPTED) { + OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Remote CP F-SEID IP address invalid\n"); + goto nack_response; + } + } +#endif + if (!m->ctx.session_fi) { /* Session not found. */ - struct osmo_pfcp_msg *tx; - tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_DEL_RESP); if (!m->ctx.peer_fi) { /* Not even the peer is associated. */ OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot delete session\n"); - tx->ies.session_del_resp.cause = OSMO_PFCP_CAUSE_NO_ESTABLISHED_PFCP_ASSOC; + cause = OSMO_PFCP_CAUSE_NO_ESTABLISHED_PFCP_ASSOC; + goto nack_response; } else { OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "No established session with SEID=0x%"PRIx64", cannot delete\n", m->h.seid); - tx->ies.session_del_resp.cause = OSMO_PFCP_CAUSE_SESSION_CTX_NOT_FOUND; + cause = OSMO_PFCP_CAUSE_SESSION_CTX_NOT_FOUND; + goto nack_response; } - osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, tx); - return; } + osmo_fsm_inst_dispatch(m->ctx.session_fi, UP_SESSION_EV_RX_SESSION_DEL_REQ, (void *)m); + return; + +nack_response: + resp = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_DEL_RESP); + resp->ies.session_del_resp.cause = cause; + osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, resp); } static void up_ep_rx_session_rep_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index 5f406d5..9693745 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -90,10 +90,43 @@ return 1; } +/* Return as dst IP address the IP address from remote's CP F-SEID that matches + * our local endpoint configuration. + * Asserts regarding cp_f_seid are validated during session establishment/modification/deletion, + * see pfcp_entityt_peer_validate_cp_f_seid(). */ +static const struct osmo_sockaddr *up_session_req_dst_addr(const struct up_session *session) +{ + const struct osmo_sockaddr *src_addr = osmo_pfcp_endpoint_get_local_addr(session->entity_peer->node_peer->up_endpoint->pfcp_ep); + switch (src_addr->u.sa.sa_family) { + case AF_INET: + OSMO_ASSERT(session->cp_f_seid.ip_addr.v4_present); + return &session->cp_f_seid.ip_addr.v4; + case AF_INET6: + if (session->cp_f_seid.ip_addr.v6_present) + return &session->cp_f_seid.ip_addr.v6; + if (session->cp_f_seid.ip_addr.v4_present) + return &session->cp_f_seid.ip_addr.v4; + OSMO_ASSERT(0); + break; + default: + OSMO_ASSERT(0); + break; + } + return NULL; +} + struct osmo_pfcp_msg *up_session_init_tx(struct up_session *session, struct osmo_pfcp_msg *in_reply_to, enum osmo_pfcp_message_type message_type) { - struct osmo_pfcp_msg *tx = pfcp_entity_peer_init_tx(session->entity_peer, in_reply_to, message_type); + struct osmo_pfcp_msg *tx; + if (in_reply_to) { + /* Use req src IP address as resp dst IP address: */ + tx = pfcp_entity_peer_init_tx_resp(session->entity_peer, in_reply_to, message_type); + } else { + const struct osmo_sockaddr *dst_addr = up_session_req_dst_addr(session); + /* Use IP address from remote's CP F-SEID as dst IP address: */ + tx = pfcp_entity_peer_init_tx_req(session->entity_peer, dst_addr, message_type); + } tx->h.seid = session->cp_f_seid.seid; tx->h.seid_present = true; up_session_set_msg_ctx(session, tx); -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/41482?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ifccd4d2b8d500c9928778400bb096baaa12c9a31 Gerrit-Change-Number: 41482 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: log the creation event and UID
by fixeria 21 Nov '25

21 Nov '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41475?usp=email ) Change subject: erab_fsm: log the creation event and UID ...................................................................... erab_fsm: log the creation event and UID When looking at GSMTAP logging, it's oftentimes useful to see the beginning of a lifecycle of an E-RAB FSM. Change-Id: I5746a645d95c9c931c24ebc170ef88cd38311542 Related: SYS#7738 --- M src/erab_fsm.erl 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 49a26ca..213a3c1 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -232,6 +232,7 @@ init([UID]) -> set_logging_prefix(UID), + ?LOG_DEBUG("Creating E-RAB FSM (UID ~p)", [UID]), %% request a unieue SEID for this E-RAB FSM {ok, SEID} = pfcp_peer:seid_alloc(), {ok, erab_wait_setup_req, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41475?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I5746a645d95c9c931c24ebc170ef88cd38311542 Gerrit-Change-Number: 41475 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: sctp_proxy: move catch-all for SCTP events to handle_event/4
by fixeria 21 Nov '25

21 Nov '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41476?usp=email ) Change subject: sctp_proxy: move catch-all for SCTP events to handle_event/4 ...................................................................... sctp_proxy: move catch-all for SCTP events to handle_event/4 Reduce code duplication and prepare for handing of sctp_error. Change-Id: I8f42a31fdf4a4e01106ace81d87188a340fe7c83 Related: SYS#7738 --- M src/sctp_proxy.erl 1 file changed, 6 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 4ed3cb8..594b286 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -149,13 +149,6 @@ {stop, {shutdown, conn_est_fail}} end; -%% Catch-all for other kinds of SCTP events -connecting(info, {sctp, _Socket, MmeAddr, MmePort, - {AncData, Data}}, S) -> - ?LOG_DEBUG("Unhandled SCTP event (~p:~p): ~p, ~p", - [MmeAddr, MmePort, AncData, Data]), - {keep_state, S}; - connecting(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). @@ -213,13 +206,6 @@ end, {keep_state, S}; -%% Catch-all for other kinds of SCTP events -connected(info, {sctp, _Socket, MmeAddr, MmePort, - {AncData, Data}}, S) -> - ?LOG_DEBUG("Unhandled SCTP event (~p:~p): ~p, ~p", - [MmeAddr, MmePort, AncData, Data]), - {keep_state, S}; - connected(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). @@ -233,6 +219,12 @@ ?LOG_ERROR("Unexpected call in state ~p: ~p", [State, EventData]), {keep_state_and_data, {reply, From, {error, {unexpected_call, State}}}}; +%% Catch-all for unhandled SCTP events +handle_event(State, info, {sctp, _Socket, MmeAddr, MmePort, {AncData, Data}}, _S) -> + ?LOG_DEBUG("Unhandled SCTP event in state ~p (~p:~p): ~p, ~p", + [State, MmeAddr, MmePort, AncData, Data]), + keep_state_and_data; + handle_event(State, Event, EventData, _S) -> ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), keep_state_and_data. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41476?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8f42a31fdf4a4e01106ace81d87188a340fe7c83 Gerrit-Change-Number: 41476 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: sctp_{server,proxy}: handle sctp_error messages from gen_sctp
by fixeria 21 Nov '25

21 Nov '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41477?usp=email ) Change subject: sctp_{server,proxy}: handle sctp_error messages from gen_sctp ...................................................................... sctp_{server,proxy}: handle sctp_error messages from gen_sctp The `{sctp_error, ...}` message is undocumented, but it does exist, and we have encountered it in production. The logic that generates `{sctp, ...}` and `{sctp_error, ...}` messages resides in Erlang/OTP's inet_drv.c, specifically in packet_binary_message() and sctp_parse_async_event(). Within sctp_parse_async_event(), an error is indicated by replacing the initial `sctp` atom with `sctp_error`. Currently the following SCTP events are treated as errors: * SCTP_SEND_FAILED (becomes #sctp_send_failed{}), * SCTP_REMOTE_ERROR (becomes #sctp_remote_error{}), * SCTP_PARTIAL_DELIVERY_EVENT (becomes #sctp_pdapi_event{}). Print more specific messages when the sctp_error is received. Add new metrics for the above-mentioned SCTP events. Change-Id: I38203d915d54dacd4e9bbf158ab86f8936585a34 Related: SYS#7738 --- M include/s1gw_metrics.hrl M src/s1gw_metrics.erl M src/sctp_common.erl M src/sctp_proxy.erl M src/sctp_server.erl 5 files changed, 41 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index 5afbff0..385b5fa 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -40,6 +40,12 @@ -define(S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ALL, [ctr, s1ap, proxy, out_pkt, reply, all]). -define(S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ERAB_SETUP_RSP, [ctr, s1ap, proxy, out_pkt, reply, erab_setup_rsp]). +%% SCTP related metrics +-define(S1GW_CTR_SCTP_ERROR_ALL, [ctr, sctp, error, all]). +-define(S1GW_CTR_SCTP_ERROR_SEND_FAILED, [ctr, sctp, error, send_failed]). +-define(S1GW_CTR_SCTP_ERROR_PDAPI_EVENT, [ctr, sctp, error, pdapi_event]). +-define(S1GW_CTR_SCTP_ERROR_REMOTE_ERROR, [ctr, sctp, error, remote_error]). + %% per-eNB counters %% NOTE: these counters shall not be listed in ?S1GW_COUNTERS, %% but created dynamically for each connecting eNB. diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index 7ca3352..bb4bd97 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -95,7 +95,13 @@ ?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, %% forwarded: processed ?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, %% forwarded: unmodified ?S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ALL, %% replied: total - ?S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ERAB_SETUP_RSP %% replied: E-RAB SETUP.rsp + ?S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ERAB_SETUP_RSP, %% replied: E-RAB SETUP.rsp + + %% SCTP related counters + ?S1GW_CTR_SCTP_ERROR_ALL, %% total number of SCTP errors + ?S1GW_CTR_SCTP_ERROR_SEND_FAILED, %% send operation failed + ?S1GW_CTR_SCTP_ERROR_PDAPI_EVENT, %% partial delivery failure + ?S1GW_CTR_SCTP_ERROR_REMOTE_ERROR %% remote error ]). -define(S1GW_GAUGES, [ diff --git a/src/sctp_common.erl b/src/sctp_common.erl index 296dbff..9b86b50 100644 --- a/src/sctp_common.erl +++ b/src/sctp_common.erl @@ -35,12 +35,14 @@ -module(sctp_common). -export([parse_addr/1, + report_error/1, send_data/2, shutdown/1]). -include_lib("kernel/include/logger.hrl"). -include_lib("kernel/include/inet_sctp.hrl"). +-include("s1gw_metrics.hrl"). -include("s1ap.hrl"). @@ -68,6 +70,20 @@ end. +-spec report_error(term()) -> term(). +report_error(Error) -> + s1gw_metrics:ctr_inc(?S1GW_CTR_SCTP_ERROR_ALL), + case Error of + #sctp_send_failed{} -> + s1gw_metrics:ctr_inc(?S1GW_CTR_SCTP_ERROR_SEND_FAILED); + #sctp_pdapi_event{} -> + s1gw_metrics:ctr_inc(?S1GW_CTR_SCTP_ERROR_PDAPI_EVENT); + #sctp_remote_error{} -> + s1gw_metrics:ctr_inc(?S1GW_CTR_SCTP_ERROR_REMOTE_ERROR); + _ -> ok + end. + + -spec send_data(sock_aid(), binary()) -> ok | {error, term()}. send_data({Sock, Aid}, Data) -> gen_sctp:send(Sock, #sctp_sndrcvinfo{stream = ?S1AP_SCTP_STREAM, diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 594b286..3aa67d8 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -225,6 +225,12 @@ [State, MmeAddr, MmePort, AncData, Data]), keep_state_and_data; +handle_event(State, info, {sctp_error, _Socket, MmeAddr, MmePort, {_, Error}}, _S) -> + ?LOG_ERROR("Rx SCTP error in state ~p (~p:~p): ~p", + [State, MmeAddr, MmePort, Error]), + sctp_common:report_error(Error), + keep_state_and_data; + handle_event(State, Event, EventData, _S) -> ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), keep_state_and_data. diff --git a/src/sctp_server.erl b/src/sctp_server.erl index d194ce4..52d50e6 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -158,6 +158,12 @@ S1 = sctp_recv({FromAddr, FromPort, AncData, Data}, S0), {noreply, S1}; +handle_info({sctp_error, _Socket, FromAddr, FromPort, {_, Error}}, S0) -> + ?LOG_ERROR("Rx SCTP error (~p:~p): ~p", + [FromAddr, FromPort, Error]), + sctp_common:report_error(Error), + {noreply, S0}; + %% Handle termination events of the child processes handle_info({'EXIT', Pid, Reason}, #server_state{sock = Sock, clients = Clients} = S0) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41477?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I38203d915d54dacd4e9bbf158ab86f8936585a34 Gerrit-Change-Number: 41477 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-hnbgw[master]: vty: Improve 'show hnb' param input
by pespin 21 Nov '25

21 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41446?usp=email ) Change subject: vty: Improve 'show hnb' param input ...................................................................... vty: Improve 'show hnb' param input Make it more logic to what user expects, specially wrt to other existing commands in the osmocom world. Change-Id: If329d57f701b0c53a61c89aae8b7ea421f728566 --- M src/osmo-hnbgw/hnbgw_vty.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index 45f3567..e83bfbc 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -219,8 +219,8 @@ #define SHOW_HNB_STR SHOW_STR "Display information about HNB\n" -DEFUN(show_hnb, show_hnb_cmd, "show hnb all", - SHOW_HNB_STR "All HNB\n") +DEFUN(show_hnb, show_hnb_cmd, "show hnb", + SHOW_HNB_STR) { struct hnb_context *hnb; unsigned int count = 0; @@ -240,8 +240,8 @@ return CMD_SUCCESS; } -DEFUN(show_one_hnb, show_one_hnb_cmd, "show hnb NAME ", - SHOW_HNB_STR "HNB name\n") +DEFUN(show_one_hnb, show_one_hnb_cmd, "show hnb name NAME", + SHOW_HNB_STR "HNB name\n" "HNB name\n") { struct hnb_context *hnb; const char *identity_info = argv[0]; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41446?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: If329d57f701b0c53a61c89aae8b7ea421f728566 Gerrit-Change-Number: 41446 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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]: vty: Log Iuh SCTP assoc & rem-addr socket information
by pespin 21 Nov '25

21 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41447?usp=email ) Change subject: vty: Log Iuh SCTP assoc & rem-addr socket information ...................................................................... vty: Log Iuh SCTP assoc & rem-addr socket information This allows checking status of the sockets towards HNB. Related: SYS#7693 Change-Id: Iad2101ed16ab660f291442c4cab8b72bff560169 --- M src/osmo-hnbgw/hnbgw_vty.c 1 file changed, 107 insertions(+), 18 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index e83bfbc..aec0bbe 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -22,6 +22,8 @@ #include "config.h" #include <string.h> +#include <netinet/in.h> +#include <netinet/sctp.h> #include <osmocom/core/socket.h> #include <osmocom/vty/command.h> @@ -29,6 +31,14 @@ #include <osmocom/gsm/gsm23236.h> +#include <osmocom/netif/stream.h> +#include <osmocom/netif/sctp.h> + +#include <osmocom/sigtran/protocol/sua.h> +#include <osmocom/sigtran/sccp_helpers.h> + +#include <osmocom/mgcp_client/mgcp_client.h> + #include <osmocom/hnbgw/vty.h> #include <osmocom/hnbgw/hnb.h> @@ -38,11 +48,6 @@ #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/tdefs.h> #include <osmocom/hnbgw/nft_kpi.h> -#include <osmocom/sigtran/protocol/sua.h> -#include <osmocom/sigtran/sccp_helpers.h> -#include <osmocom/netif/stream.h> - -#include <osmocom/mgcp_client/mgcp_client.h> static struct cmd_node hnbgw_node = { HNBGW_NODE, @@ -188,20 +193,110 @@ vty_out(vty, VTY_NEWLINE); } -static void vty_dump_hnb_info(struct vty *vty, struct hnb_context *hnb) +static void vty_dump_one_remaddr_sctp(struct vty *vty, int fd) +{ + struct sctp_paddrinfo pinfo[OSMO_SOCK_MAX_ADDRS]; + struct osmo_sockaddr osa = {}; + size_t pinfo_cnt = ARRAY_SIZE(pinfo); + bool more_needed; + int rc; + unsigned int i; + + rc = osmo_sock_sctp_get_peer_addr_info(fd, &pinfo[0], &pinfo_cnt); + if (rc < 0) { + char buf_err[128]; + strerror_r(errno, buf_err, sizeof(buf_err)); + vty_out(vty, "%% getsockopt(SCTP_GET_PEER_ADDR_INFO) failed: %s%s", buf_err, VTY_NEWLINE); + return; + } + + more_needed = pinfo_cnt > ARRAY_SIZE(pinfo); + if (pinfo_cnt > ARRAY_SIZE(pinfo)) + pinfo_cnt = ARRAY_SIZE(pinfo); + + for (i = 0; i < pinfo_cnt; i++) { + osa.u.sas = pinfo[i].spinfo_address; + vty_out(vty, " RemAddr %-46s State SCTP_%-18s CWND %-8u SRTT %-8u RTO %-8u MTU %-8u%s", + osmo_sockaddr_to_str(&osa), + osmo_sctp_spinfo_state_str(pinfo[i].spinfo_state), + pinfo[i].spinfo_cwnd, pinfo[i].spinfo_srtt, + pinfo[i].spinfo_rto, pinfo[i].spinfo_mtu, + VTY_NEWLINE); + } + + if (more_needed) + vty_out(vty, "%% more address buffers needed!%s", VTY_NEWLINE); +} + +static void vty_dump_one_assoc_status_sctp(struct vty *vty, int fd) +{ + struct osmo_sockaddr osa = {}; + struct sctp_status st; + socklen_t len; + int rc; + + memset(&st, 0, sizeof(st)); + len = sizeof(st); + rc = getsockopt(fd, IPPROTO_SCTP, SCTP_STATUS, &st, &len); + if (rc < 0) { + char buf_err[128]; + strerror_r(errno, buf_err, sizeof(buf_err)); + vty_out(vty, "%% getsockopt(SCTP_STATUS) failed: %s%s", buf_err, VTY_NEWLINE); + return; + } + + osa.u.sas = st.sstat_primary.spinfo_address; + vty_out(vty, " SCTP-ASSOC: State SCTP_%-18s InStreams %-9u OutStreams %-10u RWND %-8u UNACK %-9u PEND %-7u FRAG %-9u PrimaryAddr %-46s%s", + osmo_sctp_sstat_state_str(st.sstat_state), + st.sstat_instrms, st.sstat_outstrms, + st.sstat_rwnd, st.sstat_unackdata, st.sstat_penddata, + st.sstat_fragmentation_point, + osmo_sockaddr_to_str(&osa), + VTY_NEWLINE); + + vty_dump_one_remaddr_sctp(vty, fd); +} + +static void vty_dump_hnb_info__iuh_fd(struct vty *vty, const struct hnb_context *hnb) +{ + int fd; + unsigned long long sec; + + vty_out(vty, " Iuh: %s%s", + hnb->conn ? osmo_stream_srv_get_sockname(hnb->conn) : "(no addr)", VTY_NEWLINE); + if (!hnb->conn) + return; + + sec = hnb_get_updowntime(hnb); + if (sec) { + vty_out(vty, " Uptime: %llu days %llu hours %llu min. %llu sec.%s", + OSMO_SEC2DAY(sec), OSMO_SEC2HRS(sec), OSMO_SEC2MIN(sec), sec % 60, VTY_NEWLINE); + } + + fd = osmo_stream_srv_get_fd(hnb->conn); + if (fd < 0) + return; + + vty_dump_one_assoc_status_sctp(vty, fd); + + + vty_out(vty, " HNBAP: SCTP-stream %u%s", hnb->hnbap_stream, VTY_NEWLINE); + vty_out(vty, " RUA: SCTP-stream %u%s", hnb->rua_stream, VTY_NEWLINE); +} + +static void vty_dump_hnb_info(struct vty *vty, const struct hnb_context *hnb) { struct hnbgw_context_map *map; unsigned int map_count[2] = {}; unsigned int state_count[2][MAP_S_NUM_STATES + 1] = {}; - unsigned long long sec; vty_out(vty, "HNB "); - 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), - hnb->id.lac, hnb->id.rac, hnb->id.sac, hnb->id.cid, - hnb->hnbap_stream, hnb->rua_stream, VTY_NEWLINE); + vty_out(vty, " MCC %s MNC %s LAC %u RAC %u SAC %u CID %u%s", + osmo_mcc_name(hnb->id.plmn.mcc), + osmo_mnc_name(hnb->id.plmn.mnc, hnb->id.plmn.mnc_3_digits), + hnb->id.lac, hnb->id.rac, hnb->id.sac, hnb->id.cid, VTY_NEWLINE); + vty_dump_hnb_info__iuh_fd(vty, hnb); llist_for_each_entry(map, &hnb->map_list, hnb_list) { map_count[map->is_ps ? 1 : 0]++; @@ -209,12 +304,6 @@ } vty_dump_hnb_info__map_states(vty, "IuCS", map_count[0], state_count[0]); vty_dump_hnb_info__map_states(vty, "IuPS", map_count[1], state_count[1]); - - sec = hnb_get_updowntime(hnb); - if (sec) { - vty_out(vty, " Iuh Uptime: %llu days %llu hours %llu min. %llu sec.%s", - OSMO_SEC2DAY(sec), OSMO_SEC2HRS(sec), OSMO_SEC2MIN(sec), sec % 60, VTY_NEWLINE); - } } #define SHOW_HNB_STR SHOW_STR "Display information about HNB\n" -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41447?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: Iad2101ed16ab660f291442c4cab8b72bff560169 Gerrit-Change-Number: 41447 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-hnbgw[master]: hnb: Allow setting Iuh tx-queue-max-length per HNB
by pespin 21 Nov '25

21 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41444?usp=email ) Change subject: hnb: Allow setting Iuh tx-queue-max-length per HNB ...................................................................... hnb: Allow setting Iuh tx-queue-max-length per HNB Related: SYS#7693 Depends: libosmo-netif.git Change-Id Ibc68612bd8dee4f9b8031ce2c3f5c7ff6bb639e3 Change-Id: Ibf69a5a2e6ff8d6829320efe793c6368aa542102 --- M TODO-RELEASE M include/osmocom/hnbgw/hnb.h M include/osmocom/hnbgw/hnb_persistent.h M src/osmo-hnbgw/hnb.c M src/osmo-hnbgw/hnb_persistent.c M src/osmo-hnbgw/hnbgw_vty.c M tests/osmo-hnbgw.vty 7 files changed, 69 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 895cb3c..a42e798 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmo-sigtran >2.1.0 osmo_sccp_addr_{create,update}() +libosmo-netif >1.6.0 osmo_stream_srv_set_tx_queue_max_length() diff --git a/include/osmocom/hnbgw/hnb.h b/include/osmocom/hnbgw/hnb.h index 9c210e6..caa566a 100644 --- a/include/osmocom/hnbgw/hnb.h +++ b/include/osmocom/hnbgw/hnb.h @@ -72,5 +72,7 @@ void hnb_context_release(struct hnb_context *ctx); void hnb_context_release_ue_state(struct hnb_context *ctx); +void hnb_context_apply_tx_queue_max_length(struct hnb_context *ctx); + unsigned long long hnb_get_updowntime(const struct hnb_context *ctx); void hnb_store_rab_durations(struct hnb_context *hnb); diff --git a/include/osmocom/hnbgw/hnb_persistent.h b/include/osmocom/hnbgw/hnb_persistent.h index 07c017b..08db9c4 100644 --- a/include/osmocom/hnbgw/hnb_persistent.h +++ b/include/osmocom/hnbgw/hnb_persistent.h @@ -157,6 +157,10 @@ struct rate_ctr_group *ctrs; struct osmo_stat_item_group *statg; + struct { + int iuh_tx_queue_max_length; /* -1: Use hnbgw default */ + } config; + /* State that the main thread needs in order to know what was requested from the nft worker threads and what * still needs to be requested. */ struct { diff --git a/src/osmo-hnbgw/hnb.c b/src/osmo-hnbgw/hnb.c index 88c64f6..63aa622 100644 --- a/src/osmo-hnbgw/hnb.c +++ b/src/osmo-hnbgw/hnb.c @@ -115,6 +115,7 @@ } osmo_stream_srv_set_read_cb(ctx->conn, hnb_read_cb); osmo_stream_srv_set_closed_cb(ctx->conn, hnb_closed_cb); + hnb_context_apply_tx_queue_max_length(ctx); llist_add_tail(&ctx->list, &g_hnbgw->hnb_list); return ctx; @@ -206,6 +207,22 @@ return hnbp_get_updowntime(ctx->persistent); } +void hnb_context_apply_tx_queue_max_length(struct hnb_context *ctx) +{ + unsigned int v; + const struct hnb_persistent *hnbp = ctx->persistent; + + if (!ctx->conn) + return; + + if (hnbp && + hnbp->config.iuh_tx_queue_max_length >= 0) + v = hnbp->config.iuh_tx_queue_max_length >= 0; + else /* Use global HNBGW default */ + v = g_hnbgw->config.iuh.tx_queue_max_length; + osmo_stream_srv_set_tx_queue_max_length(ctx->conn, v); +} + /*********************************************************************** * SCTP Socket / stream handling ***********************************************************************/ diff --git a/src/osmo-hnbgw/hnb_persistent.c b/src/osmo-hnbgw/hnb_persistent.c index 015e7c6..63c0c6a 100644 --- a/src/osmo-hnbgw/hnb_persistent.c +++ b/src/osmo-hnbgw/hnb_persistent.c @@ -275,6 +275,8 @@ goto out_free_ctrs; osmo_stat_item_group_set_name(hnbp->statg, hnbp->id_str); + hnbp->config.iuh_tx_queue_max_length = -1; /* global HNBGW default */ + llist_add(&hnbp->list, &g_hnbgw->hnb_persistent_list); hash_add(g_hnbgw->hnb_persistent_by_id, &hnbp->node_by_id, umts_cell_id_hash(&hnbp->id)); diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index 28d5e84..45f3567 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -323,10 +323,17 @@ "Maximum transmit queue length, in msgbs\n" "Amount of msgbs which can be queued at maximum in the transmit queue\n") { + struct hnb_context *hnb; + 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); + + /* Apply new default to HNBs which don't hace a specific value set. */ + llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) + hnb_context_apply_tx_queue_max_length(hnb); + return CMD_SUCCESS; } @@ -874,6 +881,18 @@ return CMD_SUCCESS; } +DEFUN(cfg_hnb_tx_queue_max_length, cfg_hnb_tx_queue_max_length_cmd, + "tx-queue-max-length <-1-65535>", + "Maximum transmit queue length, in msgbs\n" + "Amount of msgbs which can be queued at maximum in the tramist queue (-1: Use hnbgw default)\n") +{ + struct hnb_persistent *hnbp = vty->index; + hnbp->config.iuh_tx_queue_max_length = atoi(argv[0]); + if (hnbp->ctx) + hnb_context_apply_tx_queue_max_length(hnbp->ctx); + return CMD_SUCCESS; +} + #define NFT_KPI_STR "Retrieve traffic counters from nftables\n" DEFUN(cfg_hnbgw_nft_kpi, cfg_hnbgw_nft_kpi_cmd, @@ -997,6 +1016,8 @@ static void write_one_hnbp(struct vty *vty, const struct hnb_persistent *hnbp) { vty_out(vty, " hnb %s%s", hnbp->id_str, VTY_NEWLINE); + if (hnbp->config.iuh_tx_queue_max_length >= 0) + vty_out(vty, " tx-queue-max-length %u%s", hnbp->config.iuh_tx_queue_max_length, VTY_NEWLINE); } static int config_write_hnbgw(struct vty *vty) @@ -1162,6 +1183,7 @@ install_element(HNBGW_NODE, &cfg_hnbgw_hnb_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_no_hnb_cmd); install_node(&hnb_node, NULL); + install_element(HNB_NODE, &cfg_hnb_tx_queue_max_length_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_nft_kpi_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_no_nft_kpi_cmd); diff --git a/tests/osmo-hnbgw.vty b/tests/osmo-hnbgw.vty index c3e1f11..e10cb27 100644 --- a/tests/osmo-hnbgw.vty +++ b/tests/osmo-hnbgw.vty @@ -103,6 +103,27 @@ ... OsmoHNBGW(config-hnbgw-iuh)# exit +OsmoHNBGW(config-hnbgw)# hnb 23-42-L1-R2-S3-C4 +OsmoHNBGW(config-hnbgw-hnb)# list +... + tx-queue-max-length <-1-65535> +... +OsmoHNBGW(config-hnbgw-hnb)# show running-config +... +hnbgw +... + hnb 023-42-L1-R2-S3-C4 +... +OsmoHNBGW(config-hnbgw-hnb)# tx-queue-max-length 3000 +OsmoHNBGW(config-hnbgw-hnb)# show running-config +... +hnbgw +... + hnb 023-42-L1-R2-S3-C4 + tx-queue-max-length 3000 +... +OsmoHNBGW(config-hnbgw-hnb)# 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/+/41444?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: Ibf69a5a2e6ff8d6829320efe793c6368aa542102 Gerrit-Change-Number: 41444 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log November 2025