- gerrit-log - lists.osmocom.org

[S] Change in libosmo-netif[master]: stream: Add osmo_stream_*_get_name() APIs
by fixeria 13 Mar '24

13 Mar '24

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36237?usp=email ) Change subject: stream: Add osmo_stream_*_get_name() APIs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36237?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If5054d3c207f8f5d58a448f1e58266ad9c4386dd Gerrit-Change-Number: 36237 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Mar 2024 23:56:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-hnbgw[master]: rename hnbgw_peek_l3 to hnbgw_peek_l3_ul as it's uplink only
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36207?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: rename hnbgw_peek_l3 to hnbgw_peek_l3_ul as it's uplink only ...................................................................... rename hnbgw_peek_l3 to hnbgw_peek_l3_ul as it's uplink only Let's not make the functions appear more generic than they are: They all explicitly only support uplink so far. Change-Id: I7db0d933a8f17f8c410141f43dab12b8c19fc8ae --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw_l3.c M src/osmo-hnbgw/hnbgw_rua.c 3 files changed, 22 insertions(+), 10 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 008f49f..069dca2 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -429,4 +429,4 @@ struct msgb *hnbgw_ranap_msg_alloc(const char *name); -int hnbgw_peek_l3(struct hnbgw_context_map *map, struct msgb *ranap_msg); +int hnbgw_peek_l3_ul(struct hnbgw_context_map *map, struct msgb *ranap_msg); diff --git a/src/osmo-hnbgw/hnbgw_l3.c b/src/osmo-hnbgw/hnbgw_l3.c index a6b48ce..1fd3398 100644 --- a/src/osmo-hnbgw/hnbgw_l3.c +++ b/src/osmo-hnbgw/hnbgw_l3.c @@ -156,8 +156,8 @@ return 0; } -static int peek_l3_nas(struct hnbgw_context_map *map, const uint8_t *nas_pdu, size_t len, - const struct osmo_plmn_id *local_plmn) +static int peek_l3_ul_nas(struct hnbgw_context_map *map, const uint8_t *nas_pdu, size_t len, + const struct osmo_plmn_id *local_plmn) { const struct gsm48_hdr *gh; int8_t pdisc; @@ -277,7 +277,7 @@ return 0; } -static int peek_l3_initial_ue(struct hnbgw_context_map *map, const RANAP_InitialUE_MessageIEs_t *ies) +static int peek_l3_ul_initial_ue(struct hnbgw_context_map *map, const RANAP_InitialUE_MessageIEs_t *ies) { struct osmo_plmn_id local_plmn; @@ -293,12 +293,12 @@ osmo_plmn_from_bcd(ies->lai.pLMNidentity.buf, &local_plmn); } - return peek_l3_nas(map, ies->nas_pdu.buf, ies->nas_pdu.size, &local_plmn); + return peek_l3_ul_nas(map, ies->nas_pdu.buf, ies->nas_pdu.size, &local_plmn); } -/* Extract a Layer 3 message (NAS PDU) from the RANAP message, and put the info obtained in map->l3. This is relevant - * for CN pooling, to decide which CN link to map the RUA context to. */ -int hnbgw_peek_l3(struct hnbgw_context_map *map, struct msgb *ranap_msg) +/* Extract a Layer 3 message (NAS PDU) from the uplink RANAP message, and put the info obtained in map->l3. + * This is relevant for CN pooling, to decide which CN link to map the RUA context to. */ +int hnbgw_peek_l3_ul(struct hnbgw_context_map *map, struct msgb *ranap_msg) { ranap_message *message = hnbgw_decode_ranap_co(ranap_msg); if (!message) { @@ -308,7 +308,7 @@ switch (message->procedureCode) { case RANAP_ProcedureCode_id_InitialUE_Message: - return peek_l3_initial_ue(map, &message->msg.initialUE_MessageIEs); + return peek_l3_ul_initial_ue(map, &message->msg.initialUE_MessageIEs); default: LOGP(DCN, LOGL_ERROR, "unexpected RANAP PDU in RUA Connect message: %s\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index ae518c0..5576fa4 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -194,7 +194,7 @@ map = context_map_alloc(hnb, rua_ctx_id, is_ps); OSMO_ASSERT(map); - if (hnbgw_peek_l3(map, ranap_msg)) + if (hnbgw_peek_l3_ul(map, ranap_msg)) LOGP(DCN, LOGL_NOTICE, "Failed to extract Mobile Identity from RUA Connect message's RANAP payload\n"); /* map->l3 now contains all the interesting information from the NAS PDU, if any. * If no useful information could be decoded, still continue to select a hopefully adequate link by round robin. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7db0d933a8f17f8c410141f43dab12b8c19fc8ae Gerrit-Change-Number: 36207 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-MessageType: merged

1 0

[S] Change in osmo-hnbgw[master]: cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36206?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul ...................................................................... cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul Those functions have always been handling only unit-data in uplink direction, so let's reflect that in the function name to prevent anyone assuming they process connection-oriented RANAP and/or the downlink direction. Change-Id: I29e8176ac19b2e7390e5950b8d0944c8961e491f --- M include/osmocom/hnbgw/hnbgw_ranap.h M src/osmo-hnbgw/hnbgw_ranap.c M src/osmo-hnbgw/hnbgw_rua.c 3 files changed, 31 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/hnbgw/hnbgw_ranap.h b/include/osmocom/hnbgw/hnbgw_ranap.h index a5d7380..50504e6 100644 --- a/include/osmocom/hnbgw/hnbgw_ranap.h +++ b/include/osmocom/hnbgw/hnbgw_ranap.h @@ -2,5 +2,5 @@ #include <osmocom/hnbgw/hnbgw.h> -int hnbgw_ranap_rx(struct msgb *msg, uint8_t *data, size_t len); +int hnbgw_ranap_rx_udt_ul(struct msgb *msg, uint8_t *data, size_t len); int hnbgw_ranap_init(void); diff --git a/src/osmo-hnbgw/hnbgw_ranap.c b/src/osmo-hnbgw/hnbgw_ranap.c index 2977730..7fb7dcb 100644 --- a/src/osmo-hnbgw/hnbgw_ranap.c +++ b/src/osmo-hnbgw/hnbgw_ranap.c @@ -35,8 +35,7 @@ #include <osmocom/ranap/ranap_ies_defs.h> #include <osmocom/ranap/ranap_msg_factory.h> -static int ranap_tx_reset_ack(struct hnb_context *hnb, - RANAP_CN_DomainIndicator_t domain) +static int ranap_tx_udt_dl_reset_ack(struct hnb_context *hnb, RANAP_CN_DomainIndicator_t domain) { struct msgb *msg; int rc; @@ -52,7 +51,7 @@ return rc; } -static int ranap_rx_init_reset(struct hnb_context *hnb, ANY_t *in) +static int ranap_rx_udt_ul_init_reset(struct hnb_context *hnb, ANY_t *in) { RANAP_ResetIEs_t ies; int rc, is_ps = 0; @@ -70,12 +69,12 @@ /* FIXME: Actually we have to wait for some guard time? */ /* FIXME: Reset all resources related to this HNB/RNC */ - ranap_tx_reset_ack(hnb, ies.cN_DomainIndicator); + ranap_tx_udt_dl_reset_ack(hnb, ies.cN_DomainIndicator); return 0; } -static int ranap_rx_error_ind(struct hnb_context *hnb, ANY_t *in) +static int ranap_rx_udt_ul_error_ind(struct hnb_context *hnb, ANY_t *in) { RANAP_ErrorIndicationIEs_t ies; int rc; @@ -97,7 +96,7 @@ return 0; } -static int ranap_rx_initiating_msg(struct hnb_context *hnb, RANAP_InitiatingMessage_t *imsg) +static int ranap_rx_udt_ul_initiating_msg(struct hnb_context *hnb, RANAP_InitiatingMessage_t *imsg) { int rc = 0; @@ -111,12 +110,12 @@ switch (imsg->procedureCode) { case RANAP_ProcedureCode_id_Reset: /* Reset request */ - rc = ranap_rx_init_reset(hnb, &imsg->value); + rc = ranap_rx_udt_ul_init_reset(hnb, &imsg->value); break; case RANAP_ProcedureCode_id_OverloadControl: /* Overload ind */ break; case RANAP_ProcedureCode_id_ErrorIndication: /* Error ind */ - rc = ranap_rx_error_ind(hnb, &imsg->value); + rc = ranap_rx_udt_ul_error_ind(hnb, &imsg->value); break; case RANAP_ProcedureCode_id_ResetResource: /* request */ case RANAP_ProcedureCode_id_InformationTransfer: @@ -134,7 +133,7 @@ return rc; } -static int ranap_rx_successful_msg(struct hnb_context *hnb, RANAP_SuccessfulOutcome_t *imsg) +static int ranap_rx_udt_ul_successful_msg(struct hnb_context *hnb, RANAP_SuccessfulOutcome_t *imsg) { /* according tot the spec, we can primarily receive Overload, * Reset, Reset ACK, Error Indication, reset Resource, Reset @@ -164,16 +163,16 @@ -static int _hnbgw_ranap_rx(struct hnb_context *hnb, RANAP_RANAP_PDU_t *pdu) +static int _hnbgw_ranap_rx_udt_ul(struct hnb_context *hnb, RANAP_RANAP_PDU_t *pdu) { int rc = 0; switch (pdu->present) { case RANAP_RANAP_PDU_PR_initiatingMessage: - rc = ranap_rx_initiating_msg(hnb, &pdu->choice.initiatingMessage); + rc = ranap_rx_udt_ul_initiating_msg(hnb, &pdu->choice.initiatingMessage); break; case RANAP_RANAP_PDU_PR_successfulOutcome: - rc = ranap_rx_successful_msg(hnb, &pdu->choice.successfulOutcome); + rc = ranap_rx_udt_ul_successful_msg(hnb, &pdu->choice.successfulOutcome); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: LOGHNB(hnb, DRANAP, LOGL_NOTICE, "Received unsupported RANAP " @@ -189,8 +188,8 @@ return rc; } - -int hnbgw_ranap_rx(struct msgb *msg, uint8_t *data, size_t len) +/* receive a RNAAP Unit-Data message in uplink direction */ +int hnbgw_ranap_rx_udt_ul(struct msgb *msg, uint8_t *data, size_t len) { RANAP_RANAP_PDU_t _pdu, *pdu = &_pdu; struct hnb_context *hnb = msg->dst; @@ -205,7 +204,7 @@ return -1; } - rc = _hnbgw_ranap_rx(hnb, pdu); + rc = _hnbgw_ranap_rx_udt_ul(hnb, pdu); return rc; } diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index f07c186..ae518c0 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -218,7 +218,7 @@ /* dispatch a RUA connection-oriented message received from a HNB to a context mapping's RUA FSM, so that it is * forwarded to the CN via SCCP connection-oriented messages. - * Connectionless messages are handled in hnbgw_ranap_rx() instead, not here. */ + * Connectionless messages are handled in hnbgw_ranap_rx_udt_ul() instead, not here. */ static int rua_to_scu(struct hnb_context *hnb, RUA_CN_DomainIndicator_t cN_DomainIndicator, enum RUA_ProcedureCode rua_procedure, @@ -484,7 +484,7 @@ * Information Transfer and Uplink Information Trnansfer that we * can ignore. In either case, it is RANAP that we need to * decode... */ - rc = hnbgw_ranap_rx(msg, ies.ranaP_Message.buf, ies.ranaP_Message.size); + rc = hnbgw_ranap_rx_udt_ul(msg, ies.ranaP_Message.buf, ies.ranaP_Message.size); rua_free_connectionlesstransferies(&ies); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36206?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I29e8176ac19b2e7390e5950b8d0944c8961e491f Gerrit-Change-Number: 36206 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-MessageType: merged

1 0

[S] Change in osmo-hnbgw[master]: don't forward paging requests to HNB's not yet registered
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36208?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: don't forward paging requests to HNB's not yet registered ...................................................................... don't forward paging requests to HNB's not yet registered Change-Id: I22ddfea1c6e13e91acecaf731b446e2de0976892 --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 2163f2c..9da8377 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -305,6 +305,8 @@ /* FIXME: determine which HNBs to send this Paging command, * rather than broadcasting to all HNBs */ llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) { + if (!hnb->hnb_registered) + continue; rua_tx_udt(hnb, data, len); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36208?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I22ddfea1c6e13e91acecaf731b446e2de0976892 Gerrit-Change-Number: 36208 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-hnbgw[master]: stats: Introduce basic counters for RANAP unit-data from CN links
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36213?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: stats: Introduce basic counters for RANAP unit-data from CN links ...................................................................... stats: Introduce basic counters for RANAP unit-data from CN links Let's keep track of the various unit-data messages we receive from CN-link peers: RESET, RESET-ACK, PAGING, UNKNOWN, UNSUPPORTED, OVERLOAD_IND, ERROR_IND. Change-Id: Ibe4c73b0288ea20ca3d54519b42bc7cb0e9e61b2 --- M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/hnbgw_cn.c 3 files changed, 71 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index 04498d8..9b26e6e 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -39,6 +39,16 @@ /* TODO: basic counters completely missing * ... */ + CNLINK_CTR_RANAP_RX_UDT_RESET, + CNLINK_CTR_RANAP_RX_UDT_RESET_ACK, + CNLINK_CTR_RANAP_RX_UDT_PAGING, + CNLINK_CTR_RANAP_RX_UDT_UNKNOWN, + CNLINK_CTR_RANAP_RX_UDT_UNSUPPORTED, + CNLINK_CTR_RANAP_RX_UDT_OVERLOAD_IND, + CNLINK_CTR_RANAP_RX_UDT_ERROR_IND, + + CNLINK_CTR_RANAP_TX_UDT_RESET, + CNLINK_CTR_RANAP_TX_UDT_RESET_ACK, /* Counters related to link selection from a CN pool. */ CNLINK_CTR_CNPOOL_SUBSCR_NEW, diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index 78cd72f..fc67fd3 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -174,7 +174,7 @@ } msg = ranap_new_msg_reset2(cnlink->pool->domain, &cause, use_grnc_id); - + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_TX_UDT_RESET); osmo_sccp_tx_unitdata_msg(cnlink->hnbgw_sccp_user->sccp_user, &cnlink->hnbgw_sccp_user->local_addr, &cnlink->remote_addr, @@ -225,7 +225,7 @@ } msg = ranap_new_msg_reset_ack(cnlink->pool->domain, use_grnc_id); - + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_TX_UDT_RESET_ACK); osmo_sccp_tx_unitdata_msg(cnlink->hnbgw_sccp_user->sccp_user, &cnlink->hnbgw_sccp_user->local_addr, &cnlink->remote_addr, diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 7e4a3cd..2163f2c 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -318,21 +318,27 @@ { switch (imsg->procedureCode) { case RANAP_ProcedureCode_id_Reset: + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_RX_UDT_RESET); return cn_ranap_rx_reset_cmd(cnlink, unitdata, imsg); case RANAP_ProcedureCode_id_Paging: + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_RX_UDT_PAGING); return cn_ranap_rx_paging_cmd(cnlink, imsg, data, len); case RANAP_ProcedureCode_id_OverloadControl: /* Overload ind */ + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_RX_UDT_OVERLOAD_IND); break; case RANAP_ProcedureCode_id_ErrorIndication: /* Error ind */ + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_RX_UDT_ERROR_IND); break; case RANAP_ProcedureCode_id_ResetResource: /* request */ case RANAP_ProcedureCode_id_InformationTransfer: case RANAP_ProcedureCode_id_DirectInformationTransfer: case RANAP_ProcedureCode_id_UplinkInformationExchange: + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_RX_UDT_UNSUPPORTED); LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " "Procedure %ld from CN, ignoring\n", imsg->procedureCode); break; default: + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_RX_UDT_UNKNOWN); LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " "Procedure %ld from CN, ignoring\n", imsg->procedureCode); break; @@ -345,15 +351,18 @@ { switch (omsg->procedureCode) { case RANAP_ProcedureCode_id_Reset: /* Reset acknowledge */ + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_RX_UDT_RESET); return cn_ranap_rx_reset_ack(cnlink, omsg); case RANAP_ProcedureCode_id_ResetResource: /* response */ case RANAP_ProcedureCode_id_InformationTransfer: case RANAP_ProcedureCode_id_DirectInformationTransfer: case RANAP_ProcedureCode_id_UplinkInformationExchange: + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_RX_UDT_UNSUPPORTED); LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " "Procedure %ld from CN, ignoring\n", omsg->procedureCode); break; default: + CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_RX_UDT_UNKNOWN); LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " "Procedure %ld from CN, ignoring\n", omsg->procedureCode); break; @@ -1126,6 +1135,43 @@ } static const struct rate_ctr_desc cnlink_ctr_description[] = { + [CNLINK_CTR_RANAP_RX_UDT_RESET] = { + "ranap:rx:udt:reset", + "RANAP Unitdata RESET messages received" + }, + [CNLINK_CTR_RANAP_RX_UDT_RESET_ACK] = { + "ranap:rx:udt:reset_ack", + "RANAP Unitdata RESET ACK messages received", + }, + [CNLINK_CTR_RANAP_RX_UDT_PAGING] = { + "ranap:rx:udt:paging", + "RANAP Unitdata PAGING messages received", + }, + [CNLINK_CTR_RANAP_RX_UDT_UNKNOWN] = { + "ranap:rx:udt:unknown", + "Unknown RANAP Unitdata messages received", + }, + [CNLINK_CTR_RANAP_RX_UDT_UNSUPPORTED] = { + "ranap:rx:udt:unsupported", + "Unsupported RANAP Unitdata messages received", + }, + [CNLINK_CTR_RANAP_RX_UDT_OVERLOAD_IND] = { + "ranap:rx:udt:overload_ind", + "RANAP Unitdata Overload Indications received", + }, + [CNLINK_CTR_RANAP_RX_UDT_ERROR_IND] = { + "ranap:rx:udt:error_ind", + "RANAP Unitdata Error Indications received", + }, + + [CNLINK_CTR_RANAP_TX_UDT_RESET] = { + "ranap:tx:udt:reset", + "RANAP Unitdata RESET messages transmitted", + }, + [CNLINK_CTR_RANAP_TX_UDT_RESET_ACK] = { + "ranap:tx:udt:reset_ack", + "RANAP Unitdata RESET ACK messages transmitted", + }, /* Indicators for CN pool usage */ [CNLINK_CTR_CNPOOL_SUBSCR_NEW] = { -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36213?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ibe4c73b0288ea20ca3d54519b42bc7cb0e9e61b2 Gerrit-Change-Number: 36213 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-MessageType: merged

1 0

[S] Change in osmo-hnbgw[master]: stats: Introduce CNLINK counter macros
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36211?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: stats: Introduce CNLINK counter macros ...................................................................... stats: Introduce CNLINK counter macros Ever since the ancient days of OpenBSC, we've always had macros to abbreviate the cumbersome 'rate_ctr_inc(rate_ctr_group_get_ctr(...))' construct. Somehow this was missed here. Also, since 2018 (libosmocore.git 175a4ae93aaf1068b61041dca12962059d65ed55) we have rate_ctr_inc2() to make it even simpler... Change-Id: I2754d7aa9d6c3e333bd729bc6e924c502b40cdad --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw_cn.c 2 files changed, 25 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 3653838..4d59560 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -240,6 +240,8 @@ #define LOG_CNLINK(CNLINK, SUBSYS, LEVEL, FMT, ARGS...) \ LOGP(SUBSYS, LEVEL, "(%s) " FMT, (CNLINK) ? (CNLINK)->name : "null", ##ARGS) +#define CNLINK_CTR_INC(cnlink, x) rate_ctr_inc2((cnlink)->ctrs, x) + struct hnbgw_cnlink *cnlink_get_nr(struct hnbgw_cnpool *cnpool, int nr, bool create_if_missing); static inline bool cnlink_is_cs(const struct hnbgw_cnlink *cnlink) diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 31bf192..7720416 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -988,7 +988,7 @@ if (cnlink) { LOG_MAP(map, DCN, LOGL_INFO, "CN link paging record selects %s %d\n", cnpool->peer_name, cnlink->nr); - rate_ctr_inc(rate_ctr_group_get_ctr(cnlink->ctrs, CNLINK_CTR_CNPOOL_SUBSCR_PAGED)); + CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_SUBSCR_PAGED); return cnlink; } /* If there is no match, go on with other ways */ @@ -1038,7 +1038,7 @@ if (nri_matches_cnlink) { LOG_NRI(LOGL_DEBUG, "NRI matches %s %d, but this %s is currently not connected\n", cnpool->peer_name, cnlink->nr, cnpool->peer_name); - rate_ctr_inc(rate_ctr_group_get_ctr(cnlink->ctrs, CNLINK_CTR_CNPOOL_SUBSCR_ATTACH_LOST)); + CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_SUBSCR_ATTACH_LOST); } continue; } @@ -1050,9 +1050,9 @@ cnpool->peer_name, cnlink->nr); } else { LOG_NRI(LOGL_INFO, "NRI match selects %s %d\n", cnpool->peer_name, cnlink->nr); - rate_ctr_inc(rate_ctr_group_get_ctr(cnlink->ctrs, CNLINK_CTR_CNPOOL_SUBSCR_KNOWN)); + CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_SUBSCR_KNOWN); if (map->l3.is_emerg) { - rate_ctr_inc(rate_ctr_group_get_ctr(cnlink->ctrs, CNLINK_CTR_CNPOOL_EMERG_FORWARDED)); + CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_EMERG_FORWARDED); rate_ctr_inc(rate_ctr_group_get_ctr(cnpool->ctrs, CNPOOL_CTR_EMERG_FORWARDED)); } return cnlink; @@ -1099,12 +1099,12 @@ LOG_MAP(map, DCN, LOGL_INFO, "CN link round-robin selects %s %d\n", cnpool->peer_name, cnlink->nr); if (is_null_nri) - rate_ctr_inc(rate_ctr_group_get_ctr(cnlink->ctrs, CNLINK_CTR_CNPOOL_SUBSCR_REATTACH)); + CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_SUBSCR_REATTACH); else - rate_ctr_inc(rate_ctr_group_get_ctr(cnlink->ctrs, CNLINK_CTR_CNPOOL_SUBSCR_NEW)); + CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_SUBSCR_NEW); if (map->l3.is_emerg) { - rate_ctr_inc(rate_ctr_group_get_ctr(cnlink->ctrs, CNLINK_CTR_CNPOOL_EMERG_FORWARDED)); + CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_EMERG_FORWARDED); rate_ctr_inc(rate_ctr_group_get_ctr(cnpool->ctrs, CNPOOL_CTR_EMERG_FORWARDED)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36211?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2754d7aa9d6c3e333bd729bc6e924c502b40cdad Gerrit-Change-Number: 36211 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-MessageType: merged

1 0

[S] Change in osmo-hnbgw[master]: stats: Introduce CNPOOL counter macro
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36212?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: stats: Introduce CNPOOL counter macro ...................................................................... stats: Introduce CNPOOL counter macro Ever since the ancient days of OpenBSC, we've always had macros to abbreviate the cumbersome 'rate_ctr_inc(rate_ctr_group_get_ctr(...))' construct. Somehow this was missed here. Also, since 2018 (libosmocore.git 175a4ae93aaf1068b61041dca12962059d65ed55) we have rate_ctr_inc2() to make it even simpler... Change-Id: I5b9e6b2069eed533c472cea8483a370f7fcc8e74 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw_cn.c 2 files changed, 22 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 4d59560..008f49f 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -203,6 +203,8 @@ struct rate_ctr_group *ctrs; }; +#define CNPOOL_CTR_INC(cnpool, x) rate_ctr_inc2((cnpool)->ctrs, x) + /* A CN peer, like 'msc 0' or 'sgsn 23' */ struct hnbgw_cnlink { struct llist_head entry; diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 7720416..7e4a3cd 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -1053,7 +1053,7 @@ CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_SUBSCR_KNOWN); if (map->l3.is_emerg) { CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_EMERG_FORWARDED); - rate_ctr_inc(rate_ctr_group_get_ctr(cnpool->ctrs, CNPOOL_CTR_EMERG_FORWARDED)); + CNPOOL_CTR_INC(cnpool, CNPOOL_CTR_EMERG_FORWARDED); } return cnlink; } @@ -1090,9 +1090,9 @@ * them are usable -- wrap to the start. */ cnlink = round_robin_next ? : round_robin_first; if (!cnlink) { - rate_ctr_inc(rate_ctr_group_get_ctr(cnpool->ctrs, CNPOOL_CTR_SUBSCR_NO_CNLINK)); + CNPOOL_CTR_INC(cnpool, CNPOOL_CTR_SUBSCR_NO_CNLINK); if (map->l3.is_emerg) - rate_ctr_inc(rate_ctr_group_get_ctr(cnpool->ctrs, CNPOOL_CTR_EMERG_LOST)); + CNPOOL_CTR_INC(cnpool, CNPOOL_CTR_EMERG_LOST); return NULL; } @@ -1105,7 +1105,7 @@ if (map->l3.is_emerg) { CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_EMERG_FORWARDED); - rate_ctr_inc(rate_ctr_group_get_ctr(cnpool->ctrs, CNPOOL_CTR_EMERG_FORWARDED)); + CNPOOL_CTR_INC(cnpool, CNPOOL_CTR_EMERG_FORWARDED); } /* A CN link was picked by round-robin, so update the next round-robin nr to pick */ -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36212?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5b9e6b2069eed533c472cea8483a370f7fcc8e74 Gerrit-Change-Number: 36212 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-MessageType: merged

1 0

[S] Change in osmo-hnbgw[master]: cosmetic: Fix comment in mgw_fsm.c: One RAB per context_map, not hnb!
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36215?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cosmetic: Fix comment in mgw_fsm.c: One RAB per context_map, not hnb! ...................................................................... cosmetic: Fix comment in mgw_fsm.c: One RAB per context_map, not hnb! Change-Id: I0cecccd94ba9c1b14de083265a394a210b758b92 --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index 6fd0e6a..77d3961 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -47,9 +47,9 @@ #include <osmocom/hnbgw/tdefs.h> #include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h> -/* NOTE: This implementation can only handle one RAB per hnbgw context. This simplification was made because usually - * a voice call will require only one RAB at a time. An exception may be corner cases like video calls, which we - * do not support at the moment. */ +/* NOTE: This implementation can only handle one RAB per context_map (== SCCP connection == RUA connection == UE + * context). This simplification was made because usually a voice call will require only one RAB at a time. An exception + * may be corner cases like video calls, which we do not support at the moment. */ /* Send Iu Release Request, this is done in erroneous cases from which we cannot recover */ static void tx_release_req(struct hnbgw_context_map *map) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36215?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0cecccd94ba9c1b14de083265a394a210b758b92 Gerrit-Change-Number: 36215 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-MessageType: merged

1 0

[S] Change in osmo-hnbgw[master]: cosmetic: talk about cs_rab_ass_* when working in CS domain
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36216?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cosmetic: talk about cs_rab_ass_* when working in CS domain ...................................................................... cosmetic: talk about cs_rab_ass_* when working in CS domain There's RAB assignment for CS and PS, let's not name functions too generic to avoid confusion. Change-Id: Id49ef931e11958315d612d764bbc488ef43f4290 --- M include/osmocom/hnbgw/mgw_fsm.h M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/mgw_fsm.c 4 files changed, 18 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmocom/hnbgw/mgw_fsm.h b/include/osmocom/hnbgw/mgw_fsm.h index d4e989d..2c919e5 100644 --- a/include/osmocom/hnbgw/mgw_fsm.h +++ b/include/osmocom/hnbgw/mgw_fsm.h @@ -2,6 +2,6 @@ #include <osmocom/ranap/ranap_ies_defs.h> -int handle_rab_ass_req(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message); -int mgw_fsm_handle_rab_ass_resp(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message); +int handle_cs_rab_ass_req(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message); +int mgw_fsm_handle_cs_rab_ass_resp(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message); int mgw_fsm_release(struct hnbgw_context_map *map); diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index 6064b1c..2263792 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -171,7 +171,7 @@ switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_handle_rab_ass_resp() takes ownership of prim->oph and (ranap) message */ - return mgw_fsm_handle_rab_ass_resp(map, ranap_msg, message); + return mgw_fsm_handle_cs_rab_ass_resp(map, ranap_msg, message); } } #if ENABLE_PFCP diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 4a78337..5eb97e2 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -218,7 +218,7 @@ switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_alloc_and_handle_rab_ass_req() takes ownership of (ranap) message */ - return handle_rab_ass_req(map, ranap_msg, message); + return handle_cs_rab_ass_req(map, ranap_msg, message); case RANAP_ProcedureCode_id_Iu_Release: /* Any IU Release will terminate the MGW FSM, the message itsself is not passed to the * FSM code. It is just forwarded normally by map_rua_tx_dt() below. */ diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index 77d3961..d405d85 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -794,7 +794,7 @@ * \param[in] message decoded RANAP message container, allocated in OTC_SELECT. * This function may talloc_steal(message) to keep it for later. * \returns 0 on success; negative on error. */ -int handle_rab_ass_req(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message) +int handle_cs_rab_ass_req(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message) { static bool initialized = false; struct mgw_fsm_priv *mgw_fsm_priv; @@ -866,7 +866,7 @@ * \param[in] message decoded RANAP message container, allocated in OTC_SELECT. * This function may talloc_steal(message) to keep it for later. * \returns 0 on success; negative on error. */ -int mgw_fsm_handle_rab_ass_resp(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message) +int mgw_fsm_handle_cs_rab_ass_resp(struct hnbgw_context_map *map, struct msgb *ranap_msg, ranap_message *message) { struct mgw_fsm_priv *mgw_fsm_priv; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36216?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id49ef931e11958315d612d764bbc488ef43f4290 Gerrit-Change-Number: 36216 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-MessageType: merged

1 0

[S] Change in osmo-hnodeb[master]: iuh: Name stream_cli connection
by laforge 12 Mar '24

12 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/36236?usp=email ) Change subject: iuh: Name stream_cli connection ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/36236?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I1503b322f8ff053088688b3088a70801d10b3d88 Gerrit-Change-Number: 36236 Gerrit-PatchSet: 2 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: Tue, 12 Mar 2024 20:48:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log