Osmocom Open Build Service

osmo-hnbgw.spec Changed

osmo-hnbgw_1.5.0.42.ffae.202403182026.dsc -> osmo-hnbgw_1.5.0.43.6917.202403192026.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-hnbgw
 Binary: osmo-hnbgw, osmo-hnbgw-dbg, osmo-hnbgw-doc
 Architecture: any all
-Version: 1.5.0.42.ffae.202403182026
+Version: 1.5.0.43.6917.202403192026
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-hnbgw
 Standards-Version: 3.9.8
@@ -14,8 +14,8 @@
  osmo-hnbgw-dbg deb debug extra arch=any
  osmo-hnbgw-doc deb doc optional arch=all
 Checksums-Sha1:
- bf558c7a45405cca7631284dbfce756996761c3f 105092 osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz
+ b2e063dca4952f583b76e70a0e49feedb38b04b7 107060 osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz
 Checksums-Sha256:
- 9aea25747b170ec43304b78d34fe6981cea2815ef3356fade8f8845a33c8f34d 105092 osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz
+ 3eea03db4cf4c213416c85eb1b4e1cb220babe55705d79f3723f7999f509c530 107060 osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz
 Files:
- 09061048637e4dec1e921120ca32fe6c 105092 osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz
+ 47760fcd61771dbda3e7d7d47f672e68 107060 osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/.tarball-version -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/.tarball-version Changed

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/contrib/osmo-hnbgw.spec.in -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/contrib/osmo-hnbgw.spec.in Changed

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/debian/changelog -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/debian/changelog Changed

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/debian/control -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/debian/control Changed

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/include/osmocom/hnbgw/Makefile.am -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/include/osmocom/hnbgw/Makefile.am Changed

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/include/osmocom/hnbgw/context_map.h -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/include/osmocom/hnbgw/context_map.h Changed

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/include/osmocom/hnbgw/hnbgw.h -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/include/osmocom/hnbgw/hnbgw.h Changed

@@ -80,6 +80,36 @@
 	HNB_CTR_RANAP_PS_RESET_REQ_UL,
 	HNB_CTR_RANAP_CS_RESET_REQ_UL,
 
+	HNB_CTR_RANAP_PS_RAB_ACT_REQ,
+	HNB_CTR_RANAP_CS_RAB_ACT_REQ,
+
+	HNB_CTR_RANAP_PS_RAB_ACT_CNF,
+	HNB_CTR_RANAP_CS_RAB_ACT_CNF,
+
+	HNB_CTR_RANAP_PS_RAB_ACT_FAIL,
+	HNB_CTR_RANAP_CS_RAB_ACT_FAIL,
+
+	HNB_CTR_RANAP_PS_RAB_MOD_REQ,
+	HNB_CTR_RANAP_CS_RAB_MOD_REQ,
+
+	HNB_CTR_RANAP_PS_RAB_MOD_CNF,
+	HNB_CTR_RANAP_CS_RAB_MOD_CNF,
+
+	HNB_CTR_RANAP_PS_RAB_MOD_FAIL,
+	HNB_CTR_RANAP_CS_RAB_MOD_FAIL,
+
+	HNB_CTR_RANAP_PS_RAB_REL_REQ,
+	HNB_CTR_RANAP_CS_RAB_REL_REQ,
+
+	HNB_CTR_RANAP_PS_RAB_REL_CNF,
+	HNB_CTR_RANAP_CS_RAB_REL_CNF,
+
+	HNB_CTR_RANAP_PS_RAB_REL_FAIL,
+	HNB_CTR_RANAP_CS_RAB_REL_FAIL,
+
+	HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT,
+	HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT,
+
 	HNB_CTR_RUA_ERR_IND,
 
 	HNB_CTR_RUA_PS_CONNECT_UL,
@@ -301,6 +331,7 @@
 
 #define HNBP_CTR(hnbp, x) rate_ctr_group_get_ctr((hnbp)->ctrs, x)
 #define HNBP_CTR_INC(hnbp, x) rate_ctr_inc(HNBP_CTR(hnbp, x))
+#define HNBP_CTR_ADD(hnbp, x, y) rate_ctr_add2((hnbp)->ctrs, x, y)
 
 #define HNBP_STAT(hbp, x) osmo_stat_item_group_get_item((hnbp)->statg, x)
 #define HNBP_STAT_SET(hnbp, x, val) osmo_stat_item_set(HNBP_STAT(hnbp, x), val)

osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/include/osmocom/hnbgw/kpi.h Added

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/src/osmo-hnbgw/Makefile.am -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/src/osmo-hnbgw/Makefile.am Changed

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/src/osmo-hnbgw/context_map_rua.c -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/src/osmo-hnbgw/context_map_rua.c Changed

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/src/osmo-hnbgw/context_map_sccp.c -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/src/osmo-hnbgw/context_map_sccp.c Changed

osmo-hnbgw_1.5.0.42.ffae.202403182026.tar.xz/src/osmo-hnbgw/hnbgw.c -> osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/src/osmo-hnbgw/hnbgw.c Changed

@@ -364,6 +364,59 @@
 	HNB_CTR_RANAP_CS_RESET_REQ_UL = {
 		"ranap:cs:reset_req:ul", "Received RESET Requests in Uplink (CS Domain)" },
 
+
+	HNB_CTR_RANAP_PS_RAB_ACT_REQ = {
+		"ranap:ps:rab_act:req", "PS RAB Activations requested" },
+	HNB_CTR_RANAP_CS_RAB_ACT_REQ = {
+		"ranap:cs:rab_act:req", "CS RAB Activations requested" },
+
+	HNB_CTR_RANAP_PS_RAB_ACT_CNF = {
+		"ranap:ps:rab_act:cnf", "PS RAB Activations confirmed" },
+	HNB_CTR_RANAP_CS_RAB_ACT_CNF = {
+		"ranap:cs:rab_act:cnf", "CS RAB Activations confirmed" },
+
+	HNB_CTR_RANAP_PS_RAB_ACT_FAIL = {
+		"ranap:ps:rab_act:fail", "PS RAB Activations failed" },
+	HNB_CTR_RANAP_CS_RAB_ACT_FAIL = {
+		"ranap:cs:rab_act:fail", "CS RAB Activations failed" },
+
+
+	HNB_CTR_RANAP_PS_RAB_MOD_REQ = {
+		"ranap:ps:rab_mod:req", "PS RAB Modifications requested" },
+	HNB_CTR_RANAP_CS_RAB_MOD_REQ = {
+		"ranap:cs:rab_mod:req", "CS RAB Modifications requested" },
+
+	HNB_CTR_RANAP_PS_RAB_MOD_CNF = {
+		"ranap:ps:rab_mod:cnf", "PS RAB Modifications confirmed" },
+	HNB_CTR_RANAP_CS_RAB_MOD_CNF = {
+		"ranap:cs:rab_mod:cnf", "CS RAB Modifications confirmed" },
+
+	HNB_CTR_RANAP_PS_RAB_MOD_FAIL = {
+		"ranap:ps:rab_mod:fail", "PS RAB Modifications failed" },
+	HNB_CTR_RANAP_CS_RAB_MOD_FAIL = {
+		"ranap:cs:rab_mod:fail", "CS RAB Modifications failed" },
+
+
+	HNB_CTR_RANAP_PS_RAB_REL_REQ = {
+		"ranap:ps:rab_rel:req", "PS RAB Release requested" },
+	HNB_CTR_RANAP_CS_RAB_REL_REQ = {
+		"ranap:cs:rab_rel:req", "CS RAB Release requested" },
+
+	HNB_CTR_RANAP_PS_RAB_REL_CNF = {
+		"ranap:ps:rab_rel:cnf", "PS RAB Release confirmed" },
+	HNB_CTR_RANAP_CS_RAB_REL_CNF = {
+		"ranap:cs:rab_rel:cnf", "CS RAB Release confirmed" },
+
+	HNB_CTR_RANAP_PS_RAB_REL_FAIL = {
+		"ranap:ps:rab_rel:fail", "PS RAB Release failed" },
+	HNB_CTR_RANAP_CS_RAB_REL_FAIL = {
+		"ranap:cs:rab_rel:fail", "CS RAB Release failed" },
+
+	HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT = {
+		"ranap:ps:rab_rel:implicit", "PS RAB Release implicit (during Iu Release)" },
+	HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT = {
+		"ranap:cs:rab_rel:implicit", "CS RAB Release implicit (during Iu Release)" },
+
 	HNB_CTR_RUA_ERR_IND = {
 		"rua:error_ind", "Received RUA Error Indications" },

osmo-hnbgw_1.5.0.43.6917.202403192026.tar.xz/src/osmo-hnbgw/kpi_ranap.c Added

@@ -0,0 +1,370 @@
+/* KPI (statistics, counters) at RANAP level */
+/* (C) 2024 by Harald Welte <laforge@osmocom.org>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: AGPL-3.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <osmocom/core/utils.h>
+
+#include <osmocom/ranap/ranap_common_ran.h>
+
+#include <osmocom/hnbgw/hnbgw_cn.h>
+#include <osmocom/hnbgw/context_map.h>
+#include <osmocom/hnbgw/kpi.h>
+
+
+/***********************************************************************
+ * DOWNLINK messages
+ ***********************************************************************/
+
+static void kpi_ranap_process_dl_iu_rel_cmd(struct hnbgw_context_map *map, const ranap_message *ranap)
+{
+	struct hnb_persistent *hnbp = map->hnb_ctx->persistent;
+
+	OSMO_ASSERT(ranap->procedureCode == RANAP_ProcedureCode_id_Iu_Release);
+
+	/* When Iu is released, all RABs are released implicitly */
+	for (unsigned int i = 0; i < ARRAY_SIZE(map->rab_state); i++) {
+		switch (map->rab_statei) {
+		case RAB_STATE_ACTIVE:
+			HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT : HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT);
+			break;
+		}
+	}
+	/* clear all RAB state */
+	memset(map->rab_state, 0, sizeof(map->rab_state));
+}
+
+static void kpi_ranap_process_dl_rab_ass_req(struct hnbgw_context_map *map, ranap_message *ranap)
+{
+	struct hnb_persistent *hnbp = map->hnb_ctx->persistent;
+	RANAP_RAB_AssignmentRequestIEs_t *ies;
+	int rc;
+
+	OSMO_ASSERT(ranap->procedureCode == RANAP_ProcedureCode_id_RAB_Assignment);
+
+	ies = &ranap->msg.raB_AssignmentRequestIEs;
+
+	if (ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_SETUPORMODIFYLIST_PRESENT) {
+		RANAP_RAB_SetupOrModifyList_t *som_list = &ies->raB_SetupOrModifyList;
+		for (unsigned int i = 0; i < som_list->list.count; i++) {
+			RANAP_ProtocolIE_ContainerPair_t *container_pair = som_list->list.arrayi;
+			RANAP_ProtocolIE_FieldPair_t *field_pair = container_pair->list.array0;
+			RANAP_RAB_SetupOrModifyItemFirst_t _rab_setup_or_modify_item_first = {};
+			RANAP_RAB_SetupOrModifyItemFirst_t *rab_setup_or_modify_item_first = &_rab_setup_or_modify_item_first;
+			uint8_t rab_id;
+
+			if (!field_pair)
+				continue;
+
+			if (field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem)
+				continue;
+
+			rc = ranap_decode_rab_setupormodifyitemfirst(rab_setup_or_modify_item_first, &field_pair->firstValue);
+			if (rc < 0)
+				continue;
+
+			/* RAB-ID is an 8-bit bit-string, so it's the first byte */
+			rab_id = rab_setup_or_modify_item_first->rAB_ID.buf0;
+
+			/* the only way to distinguish a "setup" from a "modify" is to know which RABs are
+			 * already established. If it's already established, it is a modification; if it's
+			 * new, it is a setup */
+			switch (map->rab_staterab_id) {
+			case RAB_STATE_ACTIVE:
+				HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_REQ : HNB_CTR_RANAP_CS_RAB_MOD_REQ);
+				break;
+			case RAB_STATE_INACTIVE:
+				HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_REQ : HNB_CTR_RANAP_CS_RAB_ACT_REQ);
+				map->rab_staterab_id = RAB_STATE_ACT_REQ;
+				break;
+			default:
+				LOG_MAP(map, DRANAP, LOGL_NOTICE,
+				       "Unexpected RAB Activation/Modification Req for RAB in state %u\n", map->rab_staterab_id);
+				break;
+			}
+
+			ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, rab_setup_or_modify_item_first);
+		}
+	}
+
+	if (ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_RELEASELIST_PRESENT) {
+		RANAP_RAB_ReleaseList_t *r_list = &ies->raB_ReleaseList;
+		/* increment number of released RABs, we don't need to do that individually during iteration */
+		HNBP_CTR_ADD(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_REQ : HNB_CTR_RANAP_CS_RAB_REL_REQ,
+			     r_list->raB_ReleaseList_ies.list.count);
+
+		for (unsigned int i = 0; i < r_list->raB_ReleaseList_ies.list.count; i++) {
+			RANAP_IE_t *release_list_ie = r_list->raB_ReleaseList_ies.list.arrayi;
+			RANAP_RAB_ReleaseItemIEs_t _rab_rel_item_ies = {};
+			RANAP_RAB_ReleaseItemIEs_t *rab_rel_item_ies = &_rab_rel_item_ies;
+			RANAP_RAB_ReleaseItem_t *rab_rel_item;
+			uint8_t rab_id;
+
+			if (!release_list_ie)
+				continue;
+
+			if (release_list_ie->id != RANAP_ProtocolIE_ID_id_RAB_ReleaseItem)
+				continue;
+
+			rc = ranap_decode_rab_releaseitemies_fromlist(rab_rel_item_ies, &release_list_ie->value);
+			if (rc < 0)
+				continue;
+
+			rab_rel_item = &rab_rel_item_ies->raB_ReleaseItem;
+			/* RAB-ID is an 8-bit bit-string, so it's the first byte */
+			rab_id = rab_rel_item->rAB_ID.buf0;
+
+			switch (map->rab_staterab_id) {
+			case RAB_STATE_ACTIVE:
+				break;
+			default:
+				LOG_MAP(map, DRANAP, LOGL_NOTICE,
+					"Unexpected RAB Release Req in state %u\n", map->rab_staterab_id);
+				break;
+			}
+			/* mark that RAB as release requested */
+			map->rab_staterab_id = RAB_STATE_REL_REQ;
+
+			ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_ReleaseItem, rab_rel_item_ies);
+		}
+	}
+}
+
+void kpi_ranap_process_dl(struct hnbgw_context_map *map, ranap_message *ranap)
+{
+	switch (ranap->procedureCode) {
+	case RANAP_ProcedureCode_id_RAB_Assignment:			/* RAB ASSIGNMENT REQ (8.2) */
+		kpi_ranap_process_dl_rab_ass_req(map, ranap);
+		break;
+	case RANAP_ProcedureCode_id_Iu_Release:
+		kpi_ranap_process_dl_iu_rel_cmd(map, ranap);		/* IU RELEASE CMD (8.5) */
+		break;
+	default:
+		break;
+	}
+}
+
+/***********************************************************************
+ * UPLINK messages
+ ***********************************************************************/
+
+static void kpi_ranap_process_ul_rab_ass_resp(struct hnbgw_context_map *map, ranap_message *ranap)
+{
+	struct hnb_persistent *hnbp = map->hnb_ctx->persistent;
+	RANAP_RAB_AssignmentResponseIEs_t *ies;
+	int rc;
+
+	OSMO_ASSERT(ranap->procedureCode == RANAP_ProcedureCode_id_RAB_Assignment);
+
+	ies = &ranap->msg.raB_AssignmentResponseIEs;
+
+	if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_SETUPORMODIFIEDLIST_PRESENT) {
+		RANAP_RAB_SetupOrModifiedList_t *som_list = &ies->raB_SetupOrModifiedList;
+		for (unsigned int i = 0; i < som_list->raB_SetupOrModifiedList_ies.list.count; i++) {
+			RANAP_IE_t *som_list_ie = som_list->raB_SetupOrModifiedList_ies.list.arrayi;
+			RANAP_RAB_SetupOrModifiedItemIEs_t _rab_som_item_ies = {};
+			RANAP_RAB_SetupOrModifiedItemIEs_t *rab_som_item_ies = &_rab_som_item_ies;
+			RANAP_RAB_SetupOrModifiedItem_t *rab_som_item;
+			uint8_t rab_id;
+
+			if (!som_list_ie)
+				continue;
+
+			if (som_list_ie->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifiedItem)
+				continue;
+
+			rc = ranap_decode_rab_setupormodifieditemies_fromlist(rab_som_item_ies, &som_list_ie->value);
+			if (rc < 0)
+				continue;
+
+			rab_som_item = &rab_som_item_ies->raB_SetupOrModifiedItem;
+			/* RAB-ID is an 8-bit bit-string, so it's the first byte */
+			rab_id = rab_som_item->rAB_ID.buf0;

Changes of Revision 637