[L] Change in osmo-hnbgw[master]: Move hnbgw_cnlink to cnlink.h and hnbgw_cnpool to hnbgw_cn.h
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40253?usp=email )
Change subject: Move hnbgw_cnlink to cnlink.h and hnbgw_cnpool to hnbgw_cn.h
......................................................................
Move hnbgw_cnlink to cnlink.h and hnbgw_cnpool to hnbgw_cn.h
Simplify mastodontic hnbgw.h and properly split per object/entity.
We actually have that in C files (cnlink.c and hnbgw_cn.c), so do the
same here.
This makes it easier to spot where stuff is, and extend it later (like
adding stats, etc.).
Change-Id: I75988112cff6c8c17d2bdb166a0934934c523dfc
---
M include/osmocom/hnbgw/Makefile.am
A include/osmocom/hnbgw/cnlink.h
M include/osmocom/hnbgw/hnbgw.h
M include/osmocom/hnbgw/hnbgw_cn.h
4 files changed, 175 insertions(+), 157 deletions(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
diff --git a/include/osmocom/hnbgw/Makefile.am b/include/osmocom/hnbgw/Makefile.am
index d3fbb07..ebc26ce 100644
--- a/include/osmocom/hnbgw/Makefile.am
+++ b/include/osmocom/hnbgw/Makefile.am
@@ -1,4 +1,5 @@
noinst_HEADERS = \
+ cnlink.h \
context_map.h \
hnbgw.h \
hnbgw_cn.h \
diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h
new file mode 100644
index 0000000..9495041
--- /dev/null
+++ b/include/osmocom/hnbgw/cnlink.h
@@ -0,0 +1,122 @@
+#pragma once
+
+#include <stdbool.h>
+
+#include <osmocom/core/rate_ctr.h>
+#include <osmocom/gsm/gsm48.h>
+
+#include <osmocom/sigtran/sccp_sap.h>
+
+#include <osmocom/ranap/ranap_ies_defs.h>
+
+#include <osmocom/hnbgw/hnbgw_sccp.h>
+
+struct hnbgw_cnpool;
+
+struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr);
+
+void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink);
+
+bool cnlink_is_conn_ready(const struct hnbgw_cnlink *cnlink);
+void cnlink_rx_reset_cmd(struct hnbgw_cnlink *cnlink);
+void cnlink_rx_reset_ack(struct hnbgw_cnlink *cnlink);
+void cnlink_resend_reset(struct hnbgw_cnlink *cnlink);
+void cnlink_set_disconnected(struct hnbgw_cnlink *cnlink);
+
+const char *cnlink_paging_add_ranap(struct hnbgw_cnlink *cnlink, const RANAP_PagingIEs_t *paging_ies);
+struct hnbgw_cnlink *cnlink_find_by_paging_mi(struct hnbgw_cnpool *cnpool, const struct osmo_mobile_identity *mi);
+
+enum hnbgw_cnlink_ctr {
+ /* 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,
+
+ /* SCCP Counters: */
+ CNLINK_CTR_SCCP_N_UNITDATA_REQ,
+ CNLINK_CTR_SCCP_N_UNITDATA_IND,
+ CNLINK_CTR_SCCP_N_CONNECT_REQ,
+ CNLINK_CTR_SCCP_N_CONNECT_CNF,
+ CNLINK_CTR_SCCP_N_DATA_REQ,
+ CNLINK_CTR_SCCP_N_DATA_IND,
+ CNLINK_CTR_SCCP_N_DISCONNECT_REQ,
+ CNLINK_CTR_SCCP_N_DISCONNECT_IND,
+ CNLINK_CTR_SCCP_N_PCSTATE_IND,
+ CNLINK_CTR_SCCP_RLSD_CN_ORIGIN,
+
+ /* Counters related to link selection from a CN pool. */
+ CNLINK_CTR_CNPOOL_SUBSCR_NEW,
+ CNLINK_CTR_CNPOOL_SUBSCR_REATTACH,
+ CNLINK_CTR_CNPOOL_SUBSCR_KNOWN,
+ CNLINK_CTR_CNPOOL_SUBSCR_PAGED,
+ CNLINK_CTR_CNPOOL_SUBSCR_ATTACH_LOST,
+ CNLINK_CTR_CNPOOL_EMERG_FORWARDED,
+};
+
+/* User provided configuration for struct hnbgw_cnlink. */
+struct hnbgw_cnlink_cfg {
+ /* cs7 address book entry to indicate both the remote point-code of the peer, as well as which cs7 instance to
+ * use. */
+ char *remote_addr_name;
+
+ struct osmo_nri_ranges *nri_ranges;
+};
+
+/* A CN peer, like 'msc 0' or 'sgsn 23' */
+struct hnbgw_cnlink {
+ struct llist_head entry;
+
+ /* backpointer to CS or PS CN pool. */
+ struct hnbgw_cnpool *pool;
+
+ struct osmo_fsm_inst *fi;
+
+ int nr;
+
+ struct hnbgw_cnlink_cfg vty;
+ struct hnbgw_cnlink_cfg use;
+
+ /* To print in logging/VTY */
+ char *name;
+
+ /* Copy of the address book entry use.remote_addr_name. */
+ struct osmo_sccp_addr remote_addr;
+
+ /* The SCCP instance for the cs7 instance indicated by remote_addr_name. (Multiple hnbgw_cnlinks may use the
+ * same hnbgw_sccp_user -- there is exactly one hnbgw_sccp_user per configured cs7 instance.) */
+ struct hnbgw_sccp_user *hnbgw_sccp_user;
+
+ /* linked list of hnbgw_context_map */
+ struct llist_head map_list;
+
+ bool allow_attach;
+ bool allow_emerg;
+ struct llist_head paging;
+
+ struct rate_ctr_group *ctrs;
+};
+
+static inline struct osmo_sccp_instance *cnlink_sccp(const struct hnbgw_cnlink *cnlink)
+{
+ if (!cnlink)
+ return NULL;
+ if (!cnlink->hnbgw_sccp_user)
+ return NULL;
+ if (!cnlink->hnbgw_sccp_user->ss7)
+ return NULL;
+ return osmo_ss7_get_sccp(cnlink->hnbgw_sccp_user->ss7);
+}
+
+#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)
diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h
index 3995294..b253d7f 100644
--- a/include/osmocom/hnbgw/hnbgw.h
+++ b/include/osmocom/hnbgw/hnbgw.h
@@ -19,7 +19,8 @@
#include <osmocom/mgcp_client/mgcp_client_pool.h>
#include <osmocom/hnbgw/nft_kpi.h>
-#include <osmocom/hnbgw/hnbgw_sccp.h>
+#include <osmocom/hnbgw/cnlink.h>
+#include <osmocom/hnbgw/hnbgw_cn.h>
#define STORE_UPTIME_INTERVAL 10 /* seconds */
#define HNB_STORE_RAB_DURATIONS_INTERVAL 1 /* seconds */
@@ -202,93 +203,6 @@
struct hnbgw_context_map;
-/* User provided configuration for struct hnbgw_cnpool. */
-struct hnbgw_cnpool_cfg {
- uint8_t nri_bitlen;
- struct osmo_nri_ranges *null_nri_ranges;
-};
-
-/* User provided configuration for struct hnbgw_cnlink. */
-struct hnbgw_cnlink_cfg {
- /* cs7 address book entry to indicate both the remote point-code of the peer, as well as which cs7 instance to
- * use. */
- char *remote_addr_name;
-
- struct osmo_nri_ranges *nri_ranges;
-};
-
-/* Collection of CN peers to distribute UE connections across. MSCs for DOMAIN_CS, SGSNs for DOMAIN_PS. */
-struct hnbgw_cnpool {
- RANAP_CN_DomainIndicator_t domain;
-
- /* CN pool string used in VTY config and logging, "iucs" or "iups". */
- const char *pool_name;
- /* CN peer string used in VTY config and logging, "msc" or "sgsn". */
- const char *peer_name;
- /* What we use as the remote MSC/SGSN point-code if the user does not configure any address. */
- uint32_t default_remote_pc;
-
- struct hnbgw_cnpool_cfg vty;
- struct hnbgw_cnpool_cfg use;
-
- /* List of struct hnbgw_cnlink */
- struct llist_head cnlinks;
-
- unsigned int round_robin_next_nr;
- /* Emergency calls potentially select a different set of MSCs, so to not mess up the normal round-robin
- * behavior, emergency calls need a separate round-robin counter. */
- unsigned int round_robin_next_emerg_nr;
-
- /* rate counter group that child hnbgw_cnlinks should use (points to msc_ctrg_desc or sgsn_ctrg_desc) */
- const struct rate_ctr_group_desc *cnlink_ctrg_desc;
-
- /* Running counters for this pool */
- 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;
-
- /* backpointer to CS or PS CN pool. */
- struct hnbgw_cnpool *pool;
-
- struct osmo_fsm_inst *fi;
-
- int nr;
-
- struct hnbgw_cnlink_cfg vty;
- struct hnbgw_cnlink_cfg use;
-
- /* To print in logging/VTY */
- char *name;
-
- /* Copy of the address book entry use.remote_addr_name. */
- struct osmo_sccp_addr remote_addr;
-
- /* The SCCP instance for the cs7 instance indicated by remote_addr_name. (Multiple hnbgw_cnlinks may use the
- * same hnbgw_sccp_user -- there is exactly one hnbgw_sccp_user per configured cs7 instance.) */
- struct hnbgw_sccp_user *hnbgw_sccp_user;
-
- /* linked list of hnbgw_context_map */
- struct llist_head map_list;
-
- bool allow_attach;
- bool allow_emerg;
- struct llist_head paging;
-
- struct rate_ctr_group *ctrs;
-};
-
-#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)
{
return cnlink && cnlink->pool->domain == DOMAIN_CS;
@@ -299,17 +213,6 @@
return cnlink && cnlink->pool->domain == DOMAIN_PS;
}
-static inline struct osmo_sccp_instance *cnlink_sccp(const struct hnbgw_cnlink *cnlink)
-{
- if (!cnlink)
- return NULL;
- if (!cnlink->hnbgw_sccp_user)
- return NULL;
- if (!cnlink->hnbgw_sccp_user->ss7)
- return NULL;
- return osmo_ss7_get_sccp(cnlink->hnbgw_sccp_user->ss7);
-}
-
/* The lifecycle of the hnb_context object is the same as its conn */
struct hnb_context {
/*! Entry in HNB-global list of HNB */
diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h
index fc33e5b..d6098b4 100644
--- a/include/osmocom/hnbgw/hnbgw_cn.h
+++ b/include/osmocom/hnbgw/hnbgw_cn.h
@@ -1,31 +1,13 @@
#pragma once
+#include <stdint.h>
#include <osmocom/core/rate_ctr.h>
-#include <osmocom/gsm/gsm48.h>
-#include <osmocom/ranap/ranap_ies_defs.h>
+#include <osmocom/sigtran/sccp_sap.h>
-#include <osmocom/hnbgw/hnbgw.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
-struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr);
-struct hnbgw_cnlink *hnbgw_cnlink_select(struct hnbgw_context_map *map);
-
-void hnbgw_cnpool_start(struct hnbgw_cnpool *cnpool);
-void hnbgw_cnpool_apply_cfg(struct hnbgw_cnpool *cnpool);
-void hnbgw_cnpool_cnlinks_start_or_restart(struct hnbgw_cnpool *cnpool);
-int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink);
-void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink);
-
-char *cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr);
-
-bool cnlink_is_conn_ready(const struct hnbgw_cnlink *cnlink);
-void cnlink_rx_reset_cmd(struct hnbgw_cnlink *cnlink);
-void cnlink_rx_reset_ack(struct hnbgw_cnlink *cnlink);
-void cnlink_resend_reset(struct hnbgw_cnlink *cnlink);
-void cnlink_set_disconnected(struct hnbgw_cnlink *cnlink);
-
-const char *cnlink_paging_add_ranap(struct hnbgw_cnlink *cnlink, const RANAP_PagingIEs_t *paging_ies);
-struct hnbgw_cnlink *cnlink_find_by_paging_mi(struct hnbgw_cnpool *cnpool, const struct osmo_mobile_identity *mi);
+struct hnbgw_context_map;
enum hnbgw_cnpool_ctr {
/* TODO: basic counters completely missing
@@ -37,45 +19,55 @@
CNPOOL_CTR_EMERG_FORWARDED,
CNPOOL_CTR_EMERG_LOST,
};
+#define CNPOOL_CTR_INC(cnpool, x) rate_ctr_inc2((cnpool)->ctrs, x)
+
+/* User provided configuration for struct hnbgw_cnpool. */
+struct hnbgw_cnpool_cfg {
+ uint8_t nri_bitlen;
+ struct osmo_nri_ranges *null_nri_ranges;
+};
+
+/* Collection of CN peers to distribute UE connections across. MSCs for DOMAIN_CS, SGSNs for DOMAIN_PS. */
+struct hnbgw_cnpool {
+ RANAP_CN_DomainIndicator_t domain;
+
+ /* CN pool string used in VTY config and logging, "iucs" or "iups". */
+ const char *pool_name;
+ /* CN peer string used in VTY config and logging, "msc" or "sgsn". */
+ const char *peer_name;
+ /* What we use as the remote MSC/SGSN point-code if the user does not configure any address. */
+ uint32_t default_remote_pc;
+
+ struct hnbgw_cnpool_cfg vty;
+ struct hnbgw_cnpool_cfg use;
+
+ /* List of struct hnbgw_cnlink */
+ struct llist_head cnlinks;
+
+ unsigned int round_robin_next_nr;
+ /* Emergency calls potentially select a different set of MSCs, so to not mess up the normal round-robin
+ * behavior, emergency calls need a separate round-robin counter. */
+ unsigned int round_robin_next_emerg_nr;
+
+ /* rate counter group that child hnbgw_cnlinks should use (points to msc_ctrg_desc or sgsn_ctrg_desc) */
+ const struct rate_ctr_group_desc *cnlink_ctrg_desc;
+
+ /* Running counters for this pool */
+ struct rate_ctr_group *ctrs;
+};
extern const struct rate_ctr_group_desc iucs_ctrg_desc;
extern const struct rate_ctr_group_desc iups_ctrg_desc;
-enum hnbgw_cnlink_ctr {
- /* 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,
-
- /* SCCP Counters: */
- CNLINK_CTR_SCCP_N_UNITDATA_REQ,
- CNLINK_CTR_SCCP_N_UNITDATA_IND,
- CNLINK_CTR_SCCP_N_CONNECT_REQ,
- CNLINK_CTR_SCCP_N_CONNECT_CNF,
- CNLINK_CTR_SCCP_N_DATA_REQ,
- CNLINK_CTR_SCCP_N_DATA_IND,
- CNLINK_CTR_SCCP_N_DISCONNECT_REQ,
- CNLINK_CTR_SCCP_N_DISCONNECT_IND,
- CNLINK_CTR_SCCP_N_PCSTATE_IND,
- CNLINK_CTR_SCCP_RLSD_CN_ORIGIN,
-
- /* Counters related to link selection from a CN pool. */
- CNLINK_CTR_CNPOOL_SUBSCR_NEW,
- CNLINK_CTR_CNPOOL_SUBSCR_REATTACH,
- CNLINK_CTR_CNPOOL_SUBSCR_KNOWN,
- CNLINK_CTR_CNPOOL_SUBSCR_PAGED,
- CNLINK_CTR_CNPOOL_SUBSCR_ATTACH_LOST,
- CNLINK_CTR_CNPOOL_EMERG_FORWARDED,
-};
-
extern const struct rate_ctr_group_desc msc_ctrg_desc;
extern const struct rate_ctr_group_desc sgsn_ctrg_desc;
+
+struct hnbgw_cnlink *hnbgw_cnlink_select(struct hnbgw_context_map *map);
+
+void hnbgw_cnpool_start(struct hnbgw_cnpool *cnpool);
+void hnbgw_cnpool_cnlinks_start_or_restart(struct hnbgw_cnpool *cnpool);
+struct hnbgw_cnlink *cnlink_get_nr(struct hnbgw_cnpool *cnpool, int nr, bool create_if_missing);
+void hnbgw_cnpool_apply_cfg(struct hnbgw_cnpool *cnpool);
+
+int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink);
+char *cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr);
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40253?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: I75988112cff6c8c17d2bdb166a0934934c523dfc
Gerrit-Change-Number: 40253
Gerrit-PatchSet: 1
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 month, 2 weeks
- 1
- 0
[XL] Change in osmo-hnbgw[master]: Split hnb_context,hnb_persistent,umts_cell_id to their own files
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40254?usp=email )
Change subject: Split hnb_context,hnb_persistent,umts_cell_id to their own files
......................................................................
Split hnb_context,hnb_persistent,umts_cell_id to their own files
It's really disturbing having to cope with all HNB related code while
for instance focusing on CN side of things.
Properly split the HNB related code to its own files so it can be left
out easily when needed, or stuff found more easily when required.
It also makes it easier to extend it later.
umts_cell_id is split to its own module since it's needed both in
hnb_context and hnb_persitent, and it's really independent of everything
else in the code.
Change-Id: I4ff65d14f94d99a57316c2483c92244078bb5dd9
---
M include/osmocom/hnbgw/Makefile.am
M include/osmocom/hnbgw/context_map.h
A include/osmocom/hnbgw/hnb.h
A include/osmocom/hnbgw/hnb_persistent.h
M include/osmocom/hnbgw/hnbgw.h
M include/osmocom/hnbgw/hnbgw_hnbap.h
M include/osmocom/hnbgw/hnbgw_rua.h
A include/osmocom/hnbgw/umts_cell_id.h
M src/osmo-hnbgw/Makefile.am
M src/osmo-hnbgw/context_map.c
M src/osmo-hnbgw/context_map_rua.c
M src/osmo-hnbgw/context_map_sccp.c
A src/osmo-hnbgw/hnb.c
A src/osmo-hnbgw/hnb_persistent.c
M src/osmo-hnbgw/hnbgw.c
M src/osmo-hnbgw/hnbgw_hnbap.c
M src/osmo-hnbgw/hnbgw_ranap.c
M src/osmo-hnbgw/hnbgw_rua.c
M src/osmo-hnbgw/hnbgw_vty.c
M src/osmo-hnbgw/kpi_dtap.c
M src/osmo-hnbgw/kpi_ranap.c
M src/osmo-hnbgw/nft_kpi.c
M src/osmo-hnbgw/osmo_hnbgw_main.c
A src/osmo-hnbgw/umts_cell_id.c
M tests/ranap_rab_ass/ranap_rab_ass_test.c
M tests/umts_cell_id/umts_cell_id_test.c
26 files changed, 1,224 insertions(+), 1,006 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/include/osmocom/hnbgw/Makefile.am b/include/osmocom/hnbgw/Makefile.am
index ebc26ce..04fc713 100644
--- a/include/osmocom/hnbgw/Makefile.am
+++ b/include/osmocom/hnbgw/Makefile.am
@@ -1,6 +1,8 @@
noinst_HEADERS = \
cnlink.h \
context_map.h \
+ hnb.h \
+ hnb_persistent.h \
hnbgw.h \
hnbgw_cn.h \
hnbgw_hnbap.h \
@@ -15,5 +17,6 @@
ps_rab_fsm.h \
ranap_rab_ass.h \
tdefs.h \
+ umts_cell_id.h \
vty.h \
$(NULL)
diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h
index 80b7e2b..a885f5b 100644
--- a/include/osmocom/hnbgw/context_map.h
+++ b/include/osmocom/hnbgw/context_map.h
@@ -3,6 +3,7 @@
#include <stdint.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/utils.h>
+#include <osmocom/hnbgw/hnb.h>
#include <osmocom/hnbgw/hnbgw.h>
#include <osmocom/gsm/gsm48.h>
diff --git a/include/osmocom/hnbgw/hnb.h b/include/osmocom/hnbgw/hnb.h
new file mode 100644
index 0000000..9c210e6
--- /dev/null
+++ b/include/osmocom/hnbgw/hnb.h
@@ -0,0 +1,76 @@
+#pragma once
+
+#include <osmocom/core/select.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/hashtable.h>
+#include <osmocom/core/write_queue.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/rate_ctr.h>
+#include <osmocom/core/sockaddr_str.h>
+#include <osmocom/gsm/gsm23003.h>
+#include <osmocom/sigtran/osmo_ss7.h>
+#include <osmocom/ctrl/control_if.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+
+#define DEBUG
+#include <osmocom/core/logging.h>
+
+#include <osmocom/netif/stream.h>
+
+#include <osmocom/mgcp_client/mgcp_client.h>
+#include <osmocom/mgcp_client/mgcp_client_pool.h>
+
+#include <osmocom/hnbgw/umts_cell_id.h>
+#include <osmocom/hnbgw/nft_kpi.h>
+#include <osmocom/hnbgw/cnlink.h>
+#include <osmocom/hnbgw/hnbgw_cn.h>
+
+#define HNB_STORE_RAB_DURATIONS_INTERVAL 1 /* seconds */
+
+#define LOGHNB(HNB_CTX, ss, lvl, fmt, args ...) \
+ LOGP(ss, lvl, "(%s) " fmt, hnb_context_name(HNB_CTX), ## args)
+
+enum hnb_ctrl_node {
+ CTRL_NODE_HNB = _LAST_CTRL_NODE,
+ _LAST_CTRL_NODE_HNB
+};
+
+/* The lifecycle of the hnb_context object is the same as its conn */
+struct hnb_context {
+ /*! Entry in HNB-global list of HNB */
+ struct llist_head list;
+ /*! SCTP socket + write queue for Iuh to this specific HNB */
+ struct osmo_stream_srv *conn;
+ /*! copied from HNB-Identity-Info IE */
+ char identity_info[256];
+ /*! copied from Cell Identity IE */
+ struct umts_cell_id id;
+
+ /*! SCTP stream ID for HNBAP */
+ uint16_t hnbap_stream;
+ /*! SCTP stream ID for RUA */
+ uint16_t rua_stream;
+
+ /*! True if a HNB-REGISTER-REQ from this HNB has been accepted. */
+ bool hnb_registered;
+
+ /* linked list of hnbgw_context_map */
+ struct llist_head map_list;
+
+ /*! pointer to the associated hnb persistent state. Always present after HNB-Register */
+ struct hnb_persistent *persistent;
+};
+
+
+int hnbgw_rua_accept_cb(struct osmo_stream_srv_link *srv, int fd);
+int hnb_ctrl_cmds_install(void);
+int hnb_ctrl_node_lookup(void *data, vector vline, int *node_type, void **node_data, int *i);
+
+struct hnb_context *hnb_context_by_identity_info(const char *identity_info);
+const char *hnb_context_name(struct hnb_context *ctx);
+
+void hnb_context_release(struct hnb_context *ctx);
+void hnb_context_release_ue_state(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
new file mode 100644
index 0000000..c4379de
--- /dev/null
+++ b/include/osmocom/hnbgw/hnb_persistent.h
@@ -0,0 +1,181 @@
+#pragma once
+
+#include <osmocom/core/select.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/hashtable.h>
+#include <osmocom/core/write_queue.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/rate_ctr.h>
+#include <osmocom/core/sockaddr_str.h>
+#include <osmocom/gsm/gsm23003.h>
+#include <osmocom/sigtran/osmo_ss7.h>
+#include <osmocom/ctrl/control_if.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+
+#define DEBUG
+#include <osmocom/core/logging.h>
+
+#include <osmocom/mgcp_client/mgcp_client.h>
+#include <osmocom/mgcp_client/mgcp_client_pool.h>
+
+#include <osmocom/hnbgw/umts_cell_id.h>
+#include <osmocom/hnbgw/nft_kpi.h>
+#include <osmocom/hnbgw/cnlink.h>
+#include <osmocom/hnbgw/hnbgw_cn.h>
+
+#define LOG_HNBP(HNBP, lvl, fmt, args...) \
+ LOGP(DHNB, lvl, "(%s) " fmt, \
+ (HNBP) ? \
+ (((HNBP)->id_str && *(HNBP)->id_str) ? (HNBP)->id_str : "no-cell-id") \
+ : "null", ## args)
+
+
+enum hnb_rate_ctr {
+ HNB_CTR_IUH_ESTABLISHED,
+ HNB_CTR_RANAP_PS_ERR_IND_UL,
+ HNB_CTR_RANAP_CS_ERR_IND_UL,
+ 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_REQ_ABNORMAL,
+ HNB_CTR_RANAP_CS_RAB_REL_REQ_ABNORMAL,
+
+ 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_RANAP_PS_RAB_REL_IMPLICIT_ABNORMAL,
+ HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT_ABNORMAL,
+
+ HNB_CTR_RUA_ERR_IND,
+
+ HNB_CTR_RUA_PS_CONNECT_UL,
+ HNB_CTR_RUA_CS_CONNECT_UL,
+
+ HNB_CTR_RUA_PS_DISCONNECT_UL,
+ HNB_CTR_RUA_CS_DISCONNECT_UL,
+ HNB_CTR_RUA_PS_DISCONNECT_DL,
+ HNB_CTR_RUA_CS_DISCONNECT_DL,
+
+ HNB_CTR_RUA_PS_DT_UL,
+ HNB_CTR_RUA_CS_DT_UL,
+ HNB_CTR_RUA_PS_DT_DL,
+ HNB_CTR_RUA_CS_DT_DL,
+
+ HNB_CTR_RUA_UDT_UL,
+ HNB_CTR_RUA_UDT_DL,
+
+ HNB_CTR_PS_PAGING_ATTEMPTED,
+ HNB_CTR_CS_PAGING_ATTEMPTED,
+
+ HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL,
+
+ HNB_CTR_DTAP_CS_LU_REQ,
+ HNB_CTR_DTAP_CS_LU_ACC,
+ HNB_CTR_DTAP_CS_LU_REJ,
+
+ HNB_CTR_DTAP_PS_ATT_REQ,
+ HNB_CTR_DTAP_PS_ATT_ACK,
+ HNB_CTR_DTAP_PS_ATT_REJ,
+
+ HNB_CTR_DTAP_PS_RAU_REQ,
+ HNB_CTR_DTAP_PS_RAU_ACK,
+ HNB_CTR_DTAP_PS_RAU_REJ,
+
+ HNB_CTR_GTPU_PACKETS_UL,
+ HNB_CTR_GTPU_TOTAL_BYTES_UL,
+ HNB_CTR_GTPU_UE_BYTES_UL,
+ HNB_CTR_GTPU_PACKETS_DL,
+ HNB_CTR_GTPU_TOTAL_BYTES_DL,
+ HNB_CTR_GTPU_UE_BYTES_DL,
+};
+
+enum hnb_stat {
+ HNB_STAT_UPTIME_SECONDS,
+};
+
+#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)
+
+/* persistent data for one HNB. This continues to exist even as conn / hnb_context is deleted on disconnect */
+struct hnb_persistent {
+ /*! Entry in HNBGW-global list of hnb_persistent */
+ struct llist_head list;
+ /*! Entry in hash table g_hnbgw->hnb_persistent_by_id. */
+ struct hlist_node node_by_id;
+ /*! back-pointer to hnb_context. Can be NULL if no context at this point */
+ struct hnb_context *ctx;
+
+ /*! unique cell identity; copied from HNB REGISTER REQ */
+ struct umts_cell_id id;
+ /*! stringified version of the cell identiy above (for printing/naming) */
+ const char *id_str;
+
+ /*! copied from HNB-Identity-Info IE */
+ time_t updowntime;
+
+ struct rate_ctr_group *ctrs;
+ struct osmo_stat_item_group *statg;
+
+ /* 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 {
+ /* Whether a persistent named counter was added in nftables for this cell id. */
+ bool persistent_counter_added;
+
+ /* The last hNodeB GTP-U address we asked the nft maintenance thread to set up.
+ * osmo_sockaddr_str_is_nonzero(addr_remote) == false when no rules were added yet, and when
+ * we asked the nft maintenance thread to remove the rules for this hNodeB because it has
+ * disconnected. */
+ struct osmo_sockaddr_str addr_remote;
+
+ /* the nft handles needed to clean up the UL and DL rules when the hNodeB disconnects,
+ * and the last seen counter value gotten from nft. */
+ struct {
+ struct nft_kpi_handle h;
+ struct nft_kpi_val v;
+ } ul;
+ struct {
+ struct nft_kpi_handle h;
+ struct nft_kpi_val v;
+ } dl;
+ } nft_kpi;
+
+ struct osmo_timer_list disconnected_timeout;
+};
+
+struct hnb_persistent *hnb_persistent_alloc(const struct umts_cell_id *id);
+struct hnb_persistent *hnb_persistent_find_by_id(const struct umts_cell_id *id);
+void hnb_persistent_registered(struct hnb_persistent *hnbp);
+void hnb_persistent_deregistered(struct hnb_persistent *hnbp);
+void hnb_persistent_free(struct hnb_persistent *hnbp);
+
+unsigned long long hnbp_get_updowntime(const struct hnb_persistent *hnbp);
diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h
index b253d7f..eb9c61c 100644
--- a/include/osmocom/hnbgw/hnbgw.h
+++ b/include/osmocom/hnbgw/hnbgw.h
@@ -23,7 +23,6 @@
#include <osmocom/hnbgw/hnbgw_cn.h>
#define STORE_UPTIME_INTERVAL 10 /* seconds */
-#define HNB_STORE_RAB_DURATIONS_INTERVAL 1 /* seconds */
enum {
DMAIN,
@@ -39,15 +38,6 @@
extern const struct log_info hnbgw_log_info;
extern struct vty_app_info hnbgw_vty_info;
-#define LOGHNB(HNB_CTX, ss, lvl, fmt, args ...) \
- LOGP(ss, lvl, "(%s) " fmt, hnb_context_name(HNB_CTX), ## args)
-
-#define LOG_HNBP(HNBP, lvl, fmt, args...) \
- LOGP(DHNB, lvl, "(%s) " fmt, \
- (HNBP) ? \
- (((HNBP)->id_str && *(HNBP)->id_str) ? (HNBP)->id_str : "no-cell-id") \
- : "null", ## args)
-
#define DOMAIN_CS RANAP_CN_DomainIndicator_cs_domain
#define DOMAIN_PS RANAP_CN_DomainIndicator_ps_domain
@@ -57,11 +47,6 @@
return get_value_string(ranap_domain_names, domain);
}
-enum hnb_ctrl_node {
- CTRL_NODE_HNB = _LAST_CTRL_NODE,
- _LAST_CTRL_NODE_HNB
-};
-
#define HNBGW_LOCAL_IP_DEFAULT "0.0.0.0"
/* TODO: CS and PS now both connect to OsmoSTP, i.e. that's always going to be the same address. Drop the
* duplicity. */
@@ -84,123 +69,6 @@
#define IUH_MSGB_SIZE 2048
-enum hnb_rate_ctr {
- HNB_CTR_IUH_ESTABLISHED,
- HNB_CTR_RANAP_PS_ERR_IND_UL,
- HNB_CTR_RANAP_CS_ERR_IND_UL,
- 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_REQ_ABNORMAL,
- HNB_CTR_RANAP_CS_RAB_REL_REQ_ABNORMAL,
-
- 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_RANAP_PS_RAB_REL_IMPLICIT_ABNORMAL,
- HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT_ABNORMAL,
-
- HNB_CTR_RUA_ERR_IND,
-
- HNB_CTR_RUA_PS_CONNECT_UL,
- HNB_CTR_RUA_CS_CONNECT_UL,
-
- HNB_CTR_RUA_PS_DISCONNECT_UL,
- HNB_CTR_RUA_CS_DISCONNECT_UL,
- HNB_CTR_RUA_PS_DISCONNECT_DL,
- HNB_CTR_RUA_CS_DISCONNECT_DL,
-
- HNB_CTR_RUA_PS_DT_UL,
- HNB_CTR_RUA_CS_DT_UL,
- HNB_CTR_RUA_PS_DT_DL,
- HNB_CTR_RUA_CS_DT_DL,
-
- HNB_CTR_RUA_UDT_UL,
- HNB_CTR_RUA_UDT_DL,
-
- HNB_CTR_PS_PAGING_ATTEMPTED,
- HNB_CTR_CS_PAGING_ATTEMPTED,
-
- HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL,
-
- HNB_CTR_DTAP_CS_LU_REQ,
- HNB_CTR_DTAP_CS_LU_ACC,
- HNB_CTR_DTAP_CS_LU_REJ,
-
- HNB_CTR_DTAP_PS_ATT_REQ,
- HNB_CTR_DTAP_PS_ATT_ACK,
- HNB_CTR_DTAP_PS_ATT_REJ,
-
- HNB_CTR_DTAP_PS_RAU_REQ,
- HNB_CTR_DTAP_PS_RAU_ACK,
- HNB_CTR_DTAP_PS_RAU_REJ,
-
- HNB_CTR_GTPU_PACKETS_UL,
- HNB_CTR_GTPU_TOTAL_BYTES_UL,
- HNB_CTR_GTPU_UE_BYTES_UL,
- HNB_CTR_GTPU_PACKETS_DL,
- HNB_CTR_GTPU_TOTAL_BYTES_DL,
- HNB_CTR_GTPU_UE_BYTES_DL,
-};
-
-enum hnb_stat {
- HNB_STAT_UPTIME_SECONDS,
-};
-
-struct umts_cell_id {
- struct osmo_plmn_id plmn; /*!< Mobile Country Code and Mobile Network Code (000-00 to 999-999) */
- uint16_t lac; /*!< Locaton Area Code (1-65534) */
- uint8_t rac; /*!< Routing Area Code (0-255) */
- uint16_t sac; /*!< Service Area Code */
- uint32_t cid; /*!< Cell ID */
-};
-int umts_cell_id_to_str_buf(char *buf, size_t buflen, const struct umts_cell_id *ucid);
-char *umts_cell_id_to_str_c(void *ctx, const struct umts_cell_id *ucid);
-const char *umts_cell_id_to_str(const struct umts_cell_id *ucid);
-int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr);
-uint32_t umts_cell_id_hash(const struct umts_cell_id *ucid);
-
-/*! are both given umts_cell_id euqal? */
-static inline bool umts_cell_id_equal(const struct umts_cell_id *a, const struct umts_cell_id *b)
-{
- if (osmo_plmn_cmp(&a->plmn, &b->plmn))
- return false;
- if (a->lac != b->lac)
- return false;
- if (a->rac != b->rac)
- return false;
- if (a->sac != b->sac)
- return false;
- if (a->cid != b->cid)
- return false;
- return true;
-}
-
struct hnbgw_context_map;
static inline bool cnlink_is_cs(const struct hnbgw_cnlink *cnlink)
@@ -213,86 +81,6 @@
return cnlink && cnlink->pool->domain == DOMAIN_PS;
}
-/* The lifecycle of the hnb_context object is the same as its conn */
-struct hnb_context {
- /*! Entry in HNB-global list of HNB */
- struct llist_head list;
- /*! SCTP socket + write queue for Iuh to this specific HNB */
- struct osmo_stream_srv *conn;
- /*! copied from HNB-Identity-Info IE */
- char identity_info[256];
- /*! copied from Cell Identity IE */
- struct umts_cell_id id;
-
- /*! SCTP stream ID for HNBAP */
- uint16_t hnbap_stream;
- /*! SCTP stream ID for RUA */
- uint16_t rua_stream;
-
- /*! True if a HNB-REGISTER-REQ from this HNB has been accepted. */
- bool hnb_registered;
-
- /* linked list of hnbgw_context_map */
- struct llist_head map_list;
-
- /*! pointer to the associated hnb persistent state. Always present after HNB-Register */
- struct hnb_persistent *persistent;
-};
-
-#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)
-
-/* persistent data for one HNB. This continues to exist even as conn / hnb_context is deleted on disconnect */
-struct hnb_persistent {
- /*! Entry in HNBGW-global list of hnb_persistent */
- struct llist_head list;
- /*! Entry in hash table g_hnbgw->hnb_persistent_by_id. */
- struct hlist_node node_by_id;
- /*! back-pointer to hnb_context. Can be NULL if no context at this point */
- struct hnb_context *ctx;
-
- /*! unique cell identity; copied from HNB REGISTER REQ */
- struct umts_cell_id id;
- /*! stringified version of the cell identiy above (for printing/naming) */
- const char *id_str;
-
- /*! copied from HNB-Identity-Info IE */
- time_t updowntime;
-
- struct rate_ctr_group *ctrs;
- struct osmo_stat_item_group *statg;
-
- /* 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 {
- /* Whether a persistent named counter was added in nftables for this cell id. */
- bool persistent_counter_added;
-
- /* The last hNodeB GTP-U address we asked the nft maintenance thread to set up.
- * osmo_sockaddr_str_is_nonzero(addr_remote) == false when no rules were added yet, and when
- * we asked the nft maintenance thread to remove the rules for this hNodeB because it has
- * disconnected. */
- struct osmo_sockaddr_str addr_remote;
-
- /* the nft handles needed to clean up the UL and DL rules when the hNodeB disconnects,
- * and the last seen counter value gotten from nft. */
- struct {
- struct nft_kpi_handle h;
- struct nft_kpi_val v;
- } ul;
- struct {
- struct nft_kpi_handle h;
- struct nft_kpi_val v;
- } dl;
- } nft_kpi;
-
- struct osmo_timer_list disconnected_timeout;
-};
-
struct hnbgw {
struct {
const char *iuh_local_ip;
@@ -375,22 +163,8 @@
void g_hnbgw_alloc(void *ctx);
int hnbgw_rua_accept_cb(struct osmo_stream_srv_link *srv, int fd);
-int hnb_ctrl_cmds_install(void);
-int hnb_ctrl_node_lookup(void *data, vector vline, int *node_type, void **node_data, int *i);
int hnbgw_mgw_setup(void);
-struct hnb_context *hnb_context_by_identity_info(const char *identity_info);
-const char *hnb_context_name(struct hnb_context *ctx);
-
-void hnb_context_release(struct hnb_context *ctx);
-void hnb_context_release_ue_state(struct hnb_context *ctx);
-
-struct hnb_persistent *hnb_persistent_alloc(const struct umts_cell_id *id);
-struct hnb_persistent *hnb_persistent_find_by_id(const struct umts_cell_id *id);
-void hnb_persistent_registered(struct hnb_persistent *hnbp);
-void hnb_persistent_deregistered(struct hnb_persistent *hnbp);
-void hnb_persistent_free(struct hnb_persistent *hnbp);
-
void hnbgw_vty_init(void);
int hnbgw_vty_go_parent(struct vty *vty);
@@ -408,6 +182,4 @@
int hnbgw_peek_l3_ul(struct hnbgw_context_map *map, struct msgb *ranap_msg);
-unsigned long long hnb_get_updowntime(const struct hnb_context *ctx);
-
uint32_t get_next_ue_ctx_id(void);
diff --git a/include/osmocom/hnbgw/hnbgw_hnbap.h b/include/osmocom/hnbgw/hnbgw_hnbap.h
index 2f0c5b4..a78657e 100644
--- a/include/osmocom/hnbgw/hnbgw_hnbap.h
+++ b/include/osmocom/hnbgw/hnbgw_hnbap.h
@@ -3,5 +3,7 @@
#include <osmocom/hnbgw/hnbgw.h>
+struct hnb_context;
+
int hnbgw_hnbap_rx(struct hnb_context *hnb, struct msgb *msg);
int hnbgw_hnbap_init(void);
diff --git a/include/osmocom/hnbgw/hnbgw_rua.h b/include/osmocom/hnbgw/hnbgw_rua.h
index 2b74be9..583756d 100644
--- a/include/osmocom/hnbgw/hnbgw_rua.h
+++ b/include/osmocom/hnbgw/hnbgw_rua.h
@@ -4,6 +4,8 @@
#include <osmocom/hnbgw/hnbgw.h>
#include <osmocom/rua/RUA_Cause.h>
+struct hnb_context;
+
int hnbgw_rua_rx(struct hnb_context *hnb, struct msgb *msg);
int rua_tx_udt(struct hnb_context *hnb, const uint8_t *data, unsigned int len);
diff --git a/include/osmocom/hnbgw/umts_cell_id.h b/include/osmocom/hnbgw/umts_cell_id.h
new file mode 100644
index 0000000..5bab1fc
--- /dev/null
+++ b/include/osmocom/hnbgw/umts_cell_id.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <stdint.h>
+#include <unistd.h>
+#include <osmocom/gsm/gsm23003.h>
+
+struct umts_cell_id {
+ struct osmo_plmn_id plmn; /*!< Mobile Country Code and Mobile Network Code (000-00 to 999-999) */
+ uint16_t lac; /*!< Locaton Area Code (1-65534) */
+ uint8_t rac; /*!< Routing Area Code (0-255) */
+ uint16_t sac; /*!< Service Area Code */
+ uint32_t cid; /*!< Cell ID */
+};
+int umts_cell_id_to_str_buf(char *buf, size_t buflen, const struct umts_cell_id *ucid);
+char *umts_cell_id_to_str_c(void *ctx, const struct umts_cell_id *ucid);
+const char *umts_cell_id_to_str(const struct umts_cell_id *ucid);
+int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr);
+uint32_t umts_cell_id_hash(const struct umts_cell_id *ucid);
+
+/*! are both given umts_cell_id euqal? */
+static inline bool umts_cell_id_equal(const struct umts_cell_id *a, const struct umts_cell_id *b)
+{
+ if (osmo_plmn_cmp(&a->plmn, &b->plmn))
+ return false;
+ if (a->lac != b->lac)
+ return false;
+ if (a->rac != b->rac)
+ return false;
+ if (a->sac != b->sac)
+ return false;
+ if (a->cid != b->cid)
+ return false;
+ return true;
+}
diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am
index df2bb23..c0798a7 100644
--- a/src/osmo-hnbgw/Makefile.am
+++ b/src/osmo-hnbgw/Makefile.am
@@ -32,6 +32,8 @@
$(NULL)
libhnbgw_la_SOURCES = \
+ hnb.c \
+ hnb_persistent.c \
hnbgw.c \
hnbgw_hnbap.c \
hnbgw_l3.c \
@@ -50,6 +52,7 @@
kpi_dtap.c \
kpi_ranap.c \
tdefs.c \
+ umts_cell_id.c \
nft_kpi.c \
$(NULL)
diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c
index 5a6d79b..cc68ec6 100644
--- a/src/osmo-hnbgw/context_map.c
+++ b/src/osmo-hnbgw/context_map.c
@@ -30,6 +30,7 @@
#include <osmocom/sigtran/sccp_helpers.h>
+#include <osmocom/hnbgw/hnb.h>
#include <osmocom/hnbgw/hnbgw_cn.h>
#include <osmocom/hnbgw/context_map.h>
#include <osmocom/hnbgw/mgw_fsm.h>
diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c
index e84ce65..6315985 100644
--- a/src/osmo-hnbgw/context_map_rua.c
+++ b/src/osmo-hnbgw/context_map_rua.c
@@ -24,6 +24,7 @@
#include <osmocom/core/utils.h>
#include <osmocom/core/fsm.h>
+#include <osmocom/hnbgw/hnb.h>
#include <osmocom/hnbgw/hnbgw.h>
#include <osmocom/hnbgw/context_map.h>
#include <osmocom/hnbgw/tdefs.h>
diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c
index 5b5e77f..f060ad9 100644
--- a/src/osmo-hnbgw/context_map_sccp.c
+++ b/src/osmo-hnbgw/context_map_sccp.c
@@ -27,6 +27,7 @@
#include <osmocom/sigtran/sccp_helpers.h>
+#include <osmocom/hnbgw/hnb.h>
#include <osmocom/hnbgw/hnbgw_cn.h>
#include <osmocom/hnbgw/context_map.h>
#include <osmocom/hnbgw/hnbgw_ranap.h>
diff --git a/src/osmo-hnbgw/hnb.c b/src/osmo-hnbgw/hnb.c
new file mode 100644
index 0000000..9938092
--- /dev/null
+++ b/src/osmo-hnbgw/hnb.c
@@ -0,0 +1,401 @@
+/* HNB related code */
+
+/* (C) 2015,2024 by Harald Welte <laforge(a)gnumonks.org>
+ * (C) 2016-2025 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved
+ *
+ * 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 <inttypes.h>
+
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+
+#include <osmocom/core/stats.h>
+#include <osmocom/core/rate_ctr.h>
+#include <osmocom/core/stat_item.h>
+
+#include <osmocom/gsm/gsm23236.h>
+
+#include <osmocom/netif/stream.h>
+
+#include <osmocom/hnbgw/umts_cell_id.h>
+#include <osmocom/hnbgw/hnb.h>
+#include <osmocom/hnbgw/hnb_persistent.h>
+#include <osmocom/hnbgw/hnbgw.h>
+#include <osmocom/hnbgw/hnbgw_hnbap.h>
+#include <osmocom/hnbgw/hnbgw_rua.h>
+#include <osmocom/hnbgw/tdefs.h>
+#include <osmocom/hnbgw/context_map.h>
+#include <osmocom/hnbgw/mgw_fsm.h>
+
+/* update the active RAB duration rate_ctr for given HNB */
+void hnb_store_rab_durations(struct hnb_context *hnb)
+{
+ struct hnbgw_context_map *map;
+ struct timespec now;
+ uint64_t elapsed_cs_rab_ms = 0;
+
+ osmo_clock_gettime(CLOCK_MONOTONIC, &now);
+
+ /* iterate over all context_maps (subscribers) */
+ llist_for_each_entry(map, &hnb->map_list, hnb_list) {
+ /* skip any PS maps, we care about CS RABs only here */
+ if (map->is_ps)
+ continue;
+ elapsed_cs_rab_ms += mgw_fsm_get_elapsed_ms(map, &now);
+ }
+
+ /* Export to rate countes. */
+ rate_ctr_add(HNBP_CTR(hnb->persistent, HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL), elapsed_cs_rab_ms);
+}
+
+/***********************************************************************
+ * HNB Context
+ ***********************************************************************/
+
+/* look-up HNB context by id. Used from CTRL */
+static struct hnb_context *hnb_context_by_id(uint32_t cid)
+{
+ struct hnb_context *hnb;
+
+ llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) {
+ if (hnb->id.cid == cid)
+ return hnb;
+ }
+
+ return NULL;
+}
+
+/* look-up HNB context by identity_info. Used from VTY */
+struct hnb_context *hnb_context_by_identity_info(const char *identity_info)
+{
+ struct hnb_context *hnb;
+
+ llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) {
+ if (strcmp(identity_info, hnb->identity_info) == 0)
+ return hnb;
+ }
+
+ return NULL;
+}
+
+static int hnb_read_cb(struct osmo_stream_srv *conn);
+static int hnb_closed_cb(struct osmo_stream_srv *conn);
+
+static struct hnb_context *hnb_context_alloc(struct osmo_stream_srv_link *link, int new_fd)
+{
+ struct hnb_context *ctx;
+
+ ctx = talloc_zero(g_hnbgw, struct hnb_context);
+ if (!ctx)
+ return NULL;
+ INIT_LLIST_HEAD(&ctx->map_list);
+
+ ctx->conn = osmo_stream_srv_create(g_hnbgw, link, new_fd, hnb_read_cb, hnb_closed_cb, ctx);
+ if (!ctx->conn) {
+ LOGP(DMAIN, LOGL_INFO, "error while creating connection\n");
+ talloc_free(ctx);
+ return NULL;
+ }
+
+ llist_add_tail(&ctx->list, &g_hnbgw->hnb_list);
+ return ctx;
+}
+
+const char *hnb_context_name(struct hnb_context *ctx)
+{
+ char *result;
+ if (!ctx)
+ return "NULL";
+
+ if (ctx->conn) {
+ char hostbuf_r[INET6_ADDRSTRLEN];
+ char portbuf_r[6];
+ int fd = osmo_stream_srv_get_ofd(ctx->conn)->fd;
+
+ /* get remote addr */
+ if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) == 0)
+ result = talloc_asprintf(OTC_SELECT, "%s:%s", hostbuf_r, portbuf_r);
+ else
+ result = "?";
+ } else {
+ result = "disconnected";
+ }
+
+ if (g_hnbgw->config.log_prefix_hnb_id)
+ result = talloc_asprintf(OTC_SELECT, "%s %s", result, ctx->identity_info);
+ else
+ result = talloc_asprintf(OTC_SELECT, "%s %s", result, umts_cell_id_to_str(&ctx->id));
+ return result;
+}
+
+void hnb_context_release_ue_state(struct hnb_context *ctx)
+{
+ struct hnbgw_context_map *map, *map2;
+
+ /* deactivate all context maps */
+ llist_for_each_entry_safe(map, map2, &ctx->map_list, hnb_list) {
+ context_map_hnb_released(map);
+ /* hnbgw_context_map will remove itself from lists when it is ready. */
+ }
+}
+
+void hnb_context_release(struct hnb_context *ctx)
+{
+ struct hnbgw_context_map *map;
+
+ LOGHNB(ctx, DMAIN, LOGL_INFO, "Releasing HNB context\n");
+
+ if (ctx->persistent) {
+ struct timespec tp;
+ int rc;
+ rc = osmo_clock_gettime(CLOCK_MONOTONIC, &tp);
+ ctx->persistent->updowntime = (rc < 0) ? 0 : tp.tv_sec;
+ }
+
+ /* remove from the list of HNB contexts */
+ llist_del(&ctx->list);
+
+ hnb_context_release_ue_state(ctx);
+
+ if (ctx->conn) { /* we own a conn, we must free it: */
+ LOGHNB(ctx, DMAIN, LOGL_INFO, "Closing HNB SCTP connection %s\n",
+ osmo_sock_get_name2(osmo_stream_srv_get_ofd(ctx->conn)->fd));
+ /* Avoid our closed_cb calling hnb_context_release() again: */
+ osmo_stream_srv_set_data(ctx->conn, NULL);
+ osmo_stream_srv_destroy(ctx->conn);
+ } /* else: we are called from closed_cb, so conn is being freed separately */
+
+ /* hnbgw_context_map are still listed in ctx->map_list, but we are freeing ctx. Remove all entries from the
+ * list, but keep the hnbgw_context_map around for graceful release. They are also listed under
+ * hnbgw_cnlink->map_list, and will remove themselves when ready. */
+ while ((map = llist_first_entry_or_null(&ctx->map_list, struct hnbgw_context_map, hnb_list))) {
+ llist_del(&map->hnb_list);
+ map->hnb_ctx = NULL;
+ }
+
+ /* remove back reference from hnb_persistent to context */
+ if (ctx->persistent)
+ hnb_persistent_deregistered(ctx->persistent);
+
+ talloc_free(ctx);
+}
+
+unsigned long long hnb_get_updowntime(const struct hnb_context *ctx)
+{
+ if (!ctx->persistent)
+ return 0;
+ return hnbp_get_updowntime(ctx->persistent);
+}
+
+/***********************************************************************
+ * SCTP Socket / stream handling
+ ***********************************************************************/
+
+static int hnb_read_cb(struct osmo_stream_srv *conn)
+{
+ struct hnb_context *hnb = osmo_stream_srv_get_data(conn);
+ struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn);
+ struct msgb *msg = msgb_alloc(IUH_MSGB_SIZE, "Iuh rx");
+ int rc;
+
+ if (!msg)
+ return -ENOMEM;
+
+ OSMO_ASSERT(hnb);
+ /* we store a reference to the HomeNodeB in the msg->dest for the
+ * benefit of various downstream processing functions */
+ msg->dst = hnb;
+
+ rc = osmo_stream_srv_recv(conn, msg);
+ /* Notification received */
+ if (msgb_sctp_msg_flags(msg) & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) {
+ union sctp_notification *notif = (union sctp_notification *)msgb_data(msg);
+ rc = 0;
+ switch (notif->sn_header.sn_type) {
+ case SCTP_ASSOC_CHANGE:
+ switch (notif->sn_assoc_change.sac_state) {
+ case SCTP_COMM_LOST:
+ LOGHNB(hnb, DMAIN, LOGL_NOTICE,
+ "sctp_recvmsg(%s) = SCTP_COMM_LOST, closing conn\n",
+ osmo_sock_get_name2(ofd->fd));
+ osmo_stream_srv_destroy(conn);
+ rc = -EBADF;
+ break;
+ case SCTP_RESTART:
+ LOGHNB(hnb, DMAIN, LOGL_NOTICE, "HNB SCTP conn RESTARTed, marking as HNBAP-unregistered\n");
+ hnb->hnb_registered = false;
+ hnb_context_release_ue_state(hnb);
+ /* The tx queue may be quite full after an SCTP RESTART: (SYS#6113)
+ * The link may have been flaky (a possible reason for the peer restarting the conn) and
+ * hence the kernel socket Tx queue may be full (no ACKs coming back) and our own userspace
+ * queue may contain plenty of oldish messages to be sent. Since the HNB will re-register after
+ * this, we simply drop all those old messages: */
+ osmo_stream_srv_clear_tx_queue(conn);
+ break;
+ }
+ break;
+ case SCTP_SHUTDOWN_EVENT:
+ LOGHNB(hnb, DMAIN, LOGL_NOTICE,
+ "sctp_recvmsg(%s) = SCTP_SHUTDOWN_EVENT, closing conn\n",
+ osmo_sock_get_name2(ofd->fd));
+ osmo_stream_srv_destroy(conn);
+ rc = -EBADF;
+ break;
+ }
+ goto out;
+ } else if (rc == -EAGAIN) {
+ /* Older versions of osmo_stream_srv_recv() not supporting
+ * msgb_sctp_msg_flags() may still return -EAGAIN when an sctp
+ * notification is received. */
+ rc = 0;
+ goto out;
+ } else if (rc < 0) {
+ LOGHNB(hnb, DMAIN, LOGL_ERROR, "Error during sctp_recvmsg(%s)\n",
+ osmo_sock_get_name2(ofd->fd));
+ osmo_stream_srv_destroy(conn);
+ rc = -EBADF;
+ goto out;
+ } else if (rc == 0) {
+ LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Connection closed sctp_recvmsg(%s) = 0\n",
+ osmo_sock_get_name2(ofd->fd));
+ osmo_stream_srv_destroy(conn);
+ rc = -EBADF;
+ goto out;
+ } else {
+ msgb_put(msg, rc);
+ }
+
+ switch (msgb_sctp_ppid(msg)) {
+ case IUH_PPI_HNBAP:
+ hnb->hnbap_stream = msgb_sctp_stream(msg);
+ rc = hnbgw_hnbap_rx(hnb, msg);
+ break;
+ case IUH_PPI_RUA:
+ if (!hnb->hnb_registered) {
+ LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Discarding RUA as HNB is not registered\n");
+ goto out;
+ }
+ hnb->rua_stream = msgb_sctp_stream(msg);
+ rc = hnbgw_rua_rx(hnb, msg);
+ break;
+ case IUH_PPI_SABP:
+ case IUH_PPI_RNA:
+ case IUH_PPI_PUA:
+ LOGHNB(hnb, DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%lu received\n", msgb_sctp_ppid(msg));
+ rc = 0;
+ break;
+ default:
+ LOGHNB(hnb, DMAIN, LOGL_ERROR, "Unknown SCTP PPID=%lu received\n", msgb_sctp_ppid(msg));
+ rc = 0;
+ break;
+ }
+
+out:
+ msgb_free(msg);
+ return rc;
+}
+
+static int hnb_closed_cb(struct osmo_stream_srv *conn)
+{
+ struct hnb_context *hnb = osmo_stream_srv_get_data(conn);
+ if (!hnb)
+ return 0; /* hnb_context is being freed, nothing do be done */
+
+ /* hnb: conn became broken, let's release the associated hnb.
+ * conn object is being freed after closed_cb(), so unassign it from hnb
+ * if available to avoid it freeing it again: */
+ hnb->conn = NULL;
+ hnb_context_release(hnb);
+
+ return 0;
+}
+
+/*! call-back when the listen FD has something to read */
+int hnbgw_rua_accept_cb(struct osmo_stream_srv_link *srv, int fd)
+{
+ struct hnb_context *ctx;
+
+ LOGP(DMAIN, LOGL_INFO, "New HNB SCTP connection %s\n",
+ osmo_sock_get_name2(fd));
+
+ ctx = hnb_context_alloc(srv, fd);
+ if (!ctx)
+ return -ENOMEM;
+
+ return 0;
+}
+
+CTRL_CMD_DEFINE_RO(hnb_info, "info");
+static int get_hnb_info(struct ctrl_cmd *cmd, void *data)
+{
+ struct hnb_context *hnb = data;
+
+ cmd->reply = talloc_strdup(cmd, hnb->identity_info);
+
+ return CTRL_CMD_REPLY;
+}
+
+CTRL_CMD_DEFINE_RO(hnbs, "num-hnb");
+static int get_hnbs(struct ctrl_cmd *cmd, void *data)
+{
+ cmd->reply = talloc_asprintf(cmd, "%u", llist_count(&g_hnbgw->hnb_list));
+
+ return CTRL_CMD_REPLY;
+}
+
+int hnb_ctrl_cmds_install(void)
+{
+ int rc = 0;
+
+ rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_hnbs);
+ rc |= ctrl_cmd_install(CTRL_NODE_HNB, &cmd_hnb_info);
+
+ return rc;
+}
+
+int hnb_ctrl_node_lookup(void *data, vector vline, int *node_type, void **node_data, int *i)
+{
+ const char *token = vector_slot(vline, *i);
+ struct hnb_context *hnb;
+ long num;
+
+ switch (*node_type) {
+ case CTRL_NODE_ROOT:
+ if (strcmp(token, "hnb") != 0)
+ return 0;
+
+ (*i)++;
+
+ if (!ctrl_parse_get_num(vline, *i, &num))
+ return -ERANGE;
+
+ hnb = hnb_context_by_id(num);
+ if (!hnb)
+ return -ENODEV;
+
+ *node_data = hnb;
+ *node_type = CTRL_NODE_HNB;
+ break;
+ default:
+ return 0;
+ }
+
+ return 1;
+}
diff --git a/src/osmo-hnbgw/hnb_persistent.c b/src/osmo-hnbgw/hnb_persistent.c
new file mode 100644
index 0000000..bcd6c4b
--- /dev/null
+++ b/src/osmo-hnbgw/hnb_persistent.c
@@ -0,0 +1,379 @@
+/* HNB persistent related code */
+
+/* (C) 2015,2024 by Harald Welte <laforge(a)gnumonks.org>
+ * (C) 2016-2025 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved
+ *
+ * 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 <inttypes.h>
+
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+
+#include <osmocom/core/stats.h>
+#include <osmocom/core/rate_ctr.h>
+#include <osmocom/core/stat_item.h>
+#include <osmocom/core/jhash.h>
+
+#include <osmocom/gsm/gsm23236.h>
+
+#include <osmocom/netif/stream.h>
+
+#include <osmocom/hnbgw/hnb.h>
+#include <osmocom/hnbgw/hnb_persistent.h>
+#include <osmocom/hnbgw/hnbgw.h>
+#include <osmocom/hnbgw/tdefs.h>
+
+/***********************************************************************
+ * HNB Persistent Data
+ ***********************************************************************/
+
+const struct rate_ctr_desc hnb_ctr_description[] = {
+ [HNB_CTR_IUH_ESTABLISHED] = {
+ "iuh:established", "Number of times Iuh link was established" },
+
+ [HNB_CTR_RANAP_PS_ERR_IND_UL] = {
+ "ranap:ps:error_ind:ul", "Received ERROR Indications in Uplink (PS Domain)" },
+ [HNB_CTR_RANAP_CS_ERR_IND_UL] = {
+ "ranap:cs:error_ind:ul", "Received ERROR Indications in Uplink (PS Domain)" },
+
+ [HNB_CTR_RANAP_PS_RESET_REQ_UL] = {
+ "ranap:ps:reset_req:ul", "Received RESET Requests in Uplink (PS Domain)" },
+ [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:normal", "PS RAB Release requested (by CN), normal" },
+ [HNB_CTR_RANAP_CS_RAB_REL_REQ] = {
+ "ranap:cs:rab_rel:req:normal", "CS RAB Release requested (by CN), normal" },
+ [HNB_CTR_RANAP_PS_RAB_REL_REQ_ABNORMAL] = {
+ "ranap:ps:rab_rel:req:abnormal", "PS RAB Release requested (by CN), abnormal" },
+ [HNB_CTR_RANAP_CS_RAB_REL_REQ_ABNORMAL] = {
+ "ranap:cs:rab_rel:req:abnormal", "CS RAB Release requested (by CN), abnormal" },
+
+ [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:normal", "PS RAB Release implicit (during Iu Release), normal" },
+ [HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT] = {
+ "ranap:cs:rab_rel:implicit:normal", "CS RAB Release implicit (during Iu Release), normal" },
+ [HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT_ABNORMAL] = {
+ "ranap:ps:rab_rel:implicit:abnormal", "PS RAB Release implicit (during Iu Release), abnormal" },
+ [HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT_ABNORMAL] = {
+ "ranap:cs:rab_rel:implicit:abnormal", "CS RAB Release implicit (during Iu Release), abnormal" },
+
+ [HNB_CTR_RUA_ERR_IND] = {
+ "rua:error_ind", "Received RUA Error Indications" },
+
+ [HNB_CTR_RUA_PS_CONNECT_UL] = {
+ "rua:ps:connect:ul", "Received RUA Connect requests (PS Domain)" },
+ [HNB_CTR_RUA_CS_CONNECT_UL] = {
+ "rua:cs:connect:ul", "Received RUA Connect requests (CS Domain)" },
+
+ [HNB_CTR_RUA_PS_DISCONNECT_UL] = {
+ "rua:ps:disconnect:ul", "Received RUA Disconnect requests in uplink (PS Domain)" },
+ [HNB_CTR_RUA_CS_DISCONNECT_UL] = {
+ "rua:cs:disconnect:ul", "Received RUA Disconnect requests in uplink (CS Domain)" },
+ [HNB_CTR_RUA_PS_DISCONNECT_DL] = {
+ "rua:ps:disconnect:dl", "Transmitted RUA Disconnect requests in downlink (PS Domain)" },
+ [HNB_CTR_RUA_CS_DISCONNECT_DL] = {
+ "rua:cs:disconnect:dl", "Transmitted RUA Disconnect requests in downlink (CS Domain)" },
+
+ [HNB_CTR_RUA_PS_DT_UL] = {
+ "rua:ps:direct_transfer:ul", "Received RUA DirectTransfer in uplink (PS Domain)" },
+ [HNB_CTR_RUA_CS_DT_UL] = {
+ "rua:cs:direct_transfer:ul", "Received RUA DirectTransfer in uplink (CS Domain)" },
+ [HNB_CTR_RUA_PS_DT_DL] = {
+ "rua:ps:direct_transfer:dl", "Transmitted RUA DirectTransfer in downlink (PS Domain)" },
+ [HNB_CTR_RUA_CS_DT_DL] = {
+ "rua:cs:direct_transfer:dl", "Transmitted RUA DirectTransfer in downlink (CS Domain)" },
+
+ [HNB_CTR_RUA_UDT_UL] = {
+ "rua:unit_data:ul", "Received RUA UnitData (UDT) in uplink" },
+ [HNB_CTR_RUA_UDT_DL] = {
+ "rua:unit_data:dl", "Transmitted RUA UnitData (UDT) in downlink" },
+
+ [HNB_CTR_PS_PAGING_ATTEMPTED] = {
+ "paging:ps:attempted", "Transmitted PS Paging requests" },
+ [HNB_CTR_CS_PAGING_ATTEMPTED] = {
+ "paging:cs:attempted", "Transmitted CS Paging requests" },
+
+ [HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL] = {
+ "rab:cs:active_milliseconds:total", "Cumulative number of milliseconds of CS RAB activity" },
+
+ [HNB_CTR_DTAP_CS_LU_REQ] = { "dtap:cs:location_update:req", "CS Location Update Requests" },
+ [HNB_CTR_DTAP_CS_LU_ACC] = { "dtap:cs:location_update:accept", "CS Location Update Accepts" },
+ [HNB_CTR_DTAP_CS_LU_REJ] = { "dtap:cs:location_update:reject", "CS Location Update Rejects" },
+
+ [HNB_CTR_DTAP_PS_ATT_REQ] = { "dtap:ps:attach:req", "PS Attach Requests" },
+ [HNB_CTR_DTAP_PS_ATT_ACK] = { "dtap:ps:attach:accept", "PS Attach Accepts" },
+ [HNB_CTR_DTAP_PS_ATT_REJ] = { "dtap:ps:attach:reject", "PS Attach Rejects" },
+
+ [HNB_CTR_DTAP_PS_RAU_REQ] = { "dtap:ps:routing_area_update:req", "PS Routing Area Update Requests" },
+ [HNB_CTR_DTAP_PS_RAU_ACK] = { "dtap:ps:routing_area_update:accept", "PS Routing Area Update Accepts" },
+ [HNB_CTR_DTAP_PS_RAU_REJ] = { "dtap:ps:routing_area_update:reject", "PS Routing Area Update Rejects" },
+
+ [HNB_CTR_GTPU_PACKETS_UL] = {
+ "gtpu:packets:ul",
+ "Count of GTP-U packets received from the HNB",
+ },
+ [HNB_CTR_GTPU_TOTAL_BYTES_UL] = {
+ "gtpu:total_bytes:ul",
+ "Count of total GTP-U bytes received from the HNB, including the GTP-U/UDP/IP headers",
+ },
+ [HNB_CTR_GTPU_UE_BYTES_UL] = {
+ "gtpu:ue_bytes:ul",
+ "Assuming an IP header length of 20 bytes, GTP-U bytes received from the HNB, excluding the GTP-U/UDP/IP headers",
+ },
+ [HNB_CTR_GTPU_PACKETS_DL] = {
+ "gtpu:packets:dl",
+ "Count of GTP-U packets sent to the HNB",
+ },
+ [HNB_CTR_GTPU_TOTAL_BYTES_DL] = {
+ "gtpu:total_bytes:dl",
+ "Count of total GTP-U bytes sent to the HNB, including the GTP-U/UDP/IP headers",
+ },
+ [HNB_CTR_GTPU_UE_BYTES_DL] = {
+ "gtpu:ue_bytes:dl",
+ "Assuming an IP header length of 20 bytes, GTP-U bytes sent to the HNB, excluding the GTP-U/UDP/IP headers",
+ },
+
+};
+
+const struct rate_ctr_group_desc hnb_ctrg_desc = {
+ "hnb",
+ "hNodeB",
+ OSMO_STATS_CLASS_GLOBAL,
+ ARRAY_SIZE(hnb_ctr_description),
+ hnb_ctr_description,
+};
+
+const struct osmo_stat_item_desc hnb_stat_desc[] = {
+ [HNB_STAT_UPTIME_SECONDS] = { "uptime:seconds", "Seconds of uptime", "s", 60, 0 },
+};
+
+const struct osmo_stat_item_group_desc hnb_statg_desc = {
+ .group_name_prefix = "hnb",
+ .group_description = "hNodeB",
+ .class_id = OSMO_STATS_CLASS_GLOBAL,
+ .num_items = ARRAY_SIZE(hnb_stat_desc),
+ .item_desc = hnb_stat_desc,
+};
+
+static void hnb_persistent_disconnected_timeout_cb(void *data)
+{
+ hnb_persistent_free(data);
+}
+
+static void hnb_persistent_disconnected_timeout_schedule(struct hnb_persistent *hnbp)
+{
+ unsigned long period_s = osmo_tdef_get(hnbgw_T_defs, -35, OSMO_TDEF_S, 60*60*24*7);
+ if (period_s < 1) {
+ LOG_HNBP(hnbp, LOGL_INFO,
+ "timer X35 is zero, not setting a disconnected timeout for this hnb-persistent instance.\n");
+ return;
+ }
+ /* It is fine if the timer is already active, osmo_timer_del() is done implicitly by the osmo_timer API. */
+ osmo_timer_setup(&hnbp->disconnected_timeout, hnb_persistent_disconnected_timeout_cb, hnbp);
+ osmo_timer_schedule(&hnbp->disconnected_timeout, period_s, 0);
+}
+
+struct hnb_persistent *hnb_persistent_alloc(const struct umts_cell_id *id)
+{
+ struct hnb_persistent *hnbp = talloc_zero(g_hnbgw, struct hnb_persistent);
+ if (!hnbp)
+ return NULL;
+
+ hnbp->id = *id;
+ hnbp->id_str = talloc_strdup(hnbp, umts_cell_id_to_str(id));
+ hnbp->ctrs = rate_ctr_group_alloc(hnbp, &hnb_ctrg_desc, 0);
+ if (!hnbp->ctrs)
+ goto out_free;
+ rate_ctr_group_set_name(hnbp->ctrs, hnbp->id_str);
+ hnbp->statg = osmo_stat_item_group_alloc(hnbp, &hnb_statg_desc, 0);
+ if (!hnbp->statg)
+ goto out_free_ctrs;
+ osmo_stat_item_group_set_name(hnbp->statg, hnbp->id_str);
+
+ 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));
+
+ if (g_hnbgw->nft_kpi.active)
+ nft_kpi_hnb_persistent_add(hnbp);
+
+ /* Normally the disconnected timer runs only when the hNodeB is not currently connected on Iuh. This here is paranoia:
+ * In case we have to HNBAP HNB Register Reject, the disconnected timer should be active on this unused hnbp.
+ * On success, hnb_persistent_registered() will stop the disconnected timer directly after this. */
+ hnb_persistent_disconnected_timeout_schedule(hnbp);
+
+ return hnbp;
+
+out_free_ctrs:
+ rate_ctr_group_free(hnbp->ctrs);
+out_free:
+ talloc_free(hnbp);
+ return NULL;
+}
+
+struct hnb_persistent *hnb_persistent_find_by_id(const struct umts_cell_id *id)
+{
+ struct hnb_persistent *hnbp;
+ uint32_t id_hash = umts_cell_id_hash(id);
+ hash_for_each_possible(g_hnbgw->hnb_persistent_by_id, hnbp, node_by_id, id_hash) {
+ if (umts_cell_id_equal(&hnbp->id, id))
+ return hnbp;
+ }
+ return NULL;
+}
+
+/* Read the peer's remote IP address from the Iuh conn's fd, and set up GTP-U counters for that remote address. */
+static void hnb_persistent_update_remote_addr(struct hnb_persistent *hnbp)
+{
+ socklen_t socklen;
+ struct osmo_sockaddr osa;
+ struct osmo_sockaddr_str remote_str;
+ int fd;
+
+ fd = osmo_stream_srv_get_fd(hnbp->ctx->conn);
+ if (fd < 0) {
+ LOG_HNBP(hnbp, LOGL_ERROR, "no active socket fd, cannot set up traffic counters\n");
+ return;
+ }
+
+ socklen = sizeof(struct osmo_sockaddr);
+ if (getpeername(fd, &osa.u.sa, &socklen)) {
+ LOG_HNBP(hnbp, LOGL_ERROR, "cannot read remote address, cannot set up traffic counters\n");
+ return;
+ }
+ if (osmo_sockaddr_str_from_osa(&remote_str, &osa)) {
+ LOG_HNBP(hnbp, LOGL_ERROR, "cannot parse remote address, cannot set up traffic counters\n");
+ return;
+ }
+
+ /* We got the remote address from the Iuh link (RUA), and now we are blatantly assuming that the hNodeB has its
+ * GTP endpoint on the same IP address, just with UDP port 2152 (the fixed GTP port as per 3GPP spec). */
+ remote_str.port = 2152;
+
+ if (nft_kpi_hnb_start(hnbp, &remote_str))
+ LOG_HNBP(hnbp, LOGL_ERROR, "failed to set up traffic counters\n");
+}
+
+/* Whenever HNBAP registers a HNB, hnbgw_hnbap.c calls this function to let the hnb_persistent update its state to the
+ * (new) remote address being active. When calling this function, a hnbp->ctx should be present, with an active
+ * osmo_stream_srv conn. */
+void hnb_persistent_registered(struct hnb_persistent *hnbp)
+{
+ if (!hnbp->ctx) {
+ LOG_HNBP(hnbp, LOGL_ERROR, "hnb_persistent_registered() invoked, but there is no hnb_ctx\n");
+ return;
+ }
+
+ /* The hNodeB is now connected, i.e. not disconnected. */
+ osmo_timer_del(&hnbp->disconnected_timeout);
+
+ /* start counting traffic */
+ if (g_hnbgw->nft_kpi.active)
+ hnb_persistent_update_remote_addr(hnbp);
+}
+
+/* Whenever a HNB is regarded as no longer registered (HNBAP HNB De-Register, or the Iuh link drops), this function is
+ * called to to let the hnb_persistent update its state to the hNodeB being disconnected. Clear the ctx->persistent and
+ * hnbp->ctx relations; do not delete the hnb_persistent instance. */
+void hnb_persistent_deregistered(struct hnb_persistent *hnbp)
+{
+ /* clear out cross references of hnb_context and hnb_persistent */
+ if (hnbp->ctx) {
+ if (hnbp->ctx->persistent == hnbp)
+ hnbp->ctx->persistent = NULL;
+ hnbp->ctx = NULL;
+ }
+
+ /* stop counting traffic */
+ nft_kpi_hnb_stop(hnbp);
+
+ /* The hNodeB is now disconnected. Clear out hnb_persistent when the disconnected timeout has passed. */
+ hnb_persistent_disconnected_timeout_schedule(hnbp);
+}
+
+void hnb_persistent_free(struct hnb_persistent *hnbp)
+{
+ /* FIXME: check if in use? */
+ osmo_timer_del(&hnbp->disconnected_timeout);
+ nft_kpi_hnb_stop(hnbp);
+ nft_kpi_hnb_persistent_remove(hnbp);
+ osmo_stat_item_group_free(hnbp->statg);
+ rate_ctr_group_free(hnbp->ctrs);
+ llist_del(&hnbp->list);
+ hash_del(&hnbp->node_by_id);
+ talloc_free(hnbp);
+}
+
+/* return the amount of time the HNB is up (hnbp->ctx != NULL) or down (hnbp->ctx == NULL) */
+unsigned long long hnbp_get_updowntime(const struct hnb_persistent *hnbp)
+{
+ struct timespec tp;
+
+ if (!hnbp->updowntime)
+ return 0;
+
+ if (osmo_clock_gettime(CLOCK_MONOTONIC, &tp) != 0)
+ return 0;
+
+ return difftime(tp.tv_sec, hnbp->updowntime);
+}
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index c5ee2c1..c46ddad 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -1,7 +1,7 @@
/* kitchen sink for OsmoHNBGW implementation */
/* (C) 2015,2024 by Harald Welte <laforge(a)gnumonks.org>
- * (C) 2016-2023 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de>
+ * (C) 2016-2025 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de>
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@@ -40,6 +40,8 @@
#include <osmocom/pfcp/pfcp_proto.h>
#endif
+#include <osmocom/hnbgw/hnb.h>
+#include <osmocom/hnbgw/hnb_persistent.h>
#include <osmocom/hnbgw/hnbgw.h>
#include <osmocom/hnbgw/hnbgw_hnbap.h>
#include <osmocom/hnbgw/hnbgw_rua.h>
@@ -56,25 +58,17 @@
{}
};
-/* update the active RAB duration rate_ctr for given HNB */
-static void hnb_store_rab_durations(struct hnb_context *hnb)
+
+/* timer call-back: Update the HNB_STAT_UPTIME_SECONDS stat item of each hnb_persistent */
+static void hnbgw_store_hnb_uptime(void *data)
{
- struct hnbgw_context_map *map;
- struct timespec now;
- uint64_t elapsed_cs_rab_ms = 0;
+ struct hnb_persistent *hnbp;
- osmo_clock_gettime(CLOCK_MONOTONIC, &now);
-
- /* iterate over all context_maps (subscribers) */
- llist_for_each_entry(map, &hnb->map_list, hnb_list) {
- /* skip any PS maps, we care about CS RABs only here */
- if (map->is_ps)
- continue;
- elapsed_cs_rab_ms += mgw_fsm_get_elapsed_ms(map, &now);
+ llist_for_each_entry(hnbp, &g_hnbgw->hnb_persistent_list, list) {
+ HNBP_STAT_SET(hnbp, HNB_STAT_UPTIME_SECONDS, hnbp->ctx != NULL ? hnbp_get_updowntime(hnbp) : 0);
}
- /* Export to rate countes. */
- rate_ctr_add(HNBP_CTR(hnb->persistent, HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL), elapsed_cs_rab_ms);
+ osmo_timer_schedule(&g_hnbgw->store_uptime_timer, STORE_UPTIME_INTERVAL, 0);
}
static void hnbgw_store_hnb_rab_durations(void *data)
@@ -91,7 +85,6 @@
osmo_timer_schedule(&g_hnbgw->hnb_store_rab_durations_timer, HNB_STORE_RAB_DURATIONS_INTERVAL, 0);
}
-
/***********************************************************************
* UE Context
***********************************************************************/
@@ -101,764 +94,6 @@
return g_hnbgw->next_ue_ctx_id++;
}
-/***********************************************************************
- * HNB Context
- ***********************************************************************/
-
-/* look-up HNB context by id. Used from CTRL */
-static struct hnb_context *hnb_context_by_id(uint32_t cid)
-{
- struct hnb_context *hnb;
-
- llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) {
- if (hnb->id.cid == cid)
- return hnb;
- }
-
- return NULL;
-}
-
-/* look-up HNB context by identity_info. Used from VTY */
-struct hnb_context *hnb_context_by_identity_info(const char *identity_info)
-{
- struct hnb_context *hnb;
-
- llist_for_each_entry(hnb, &g_hnbgw->hnb_list, list) {
- if (strcmp(identity_info, hnb->identity_info) == 0)
- return hnb;
- }
-
- return NULL;
-}
-
-static int hnb_read_cb(struct osmo_stream_srv *conn);
-static int hnb_closed_cb(struct osmo_stream_srv *conn);
-
-static struct hnb_context *hnb_context_alloc(struct osmo_stream_srv_link *link, int new_fd)
-{
- struct hnb_context *ctx;
-
- ctx = talloc_zero(g_hnbgw, struct hnb_context);
- if (!ctx)
- return NULL;
- INIT_LLIST_HEAD(&ctx->map_list);
-
- ctx->conn = osmo_stream_srv_create(g_hnbgw, link, new_fd, hnb_read_cb, hnb_closed_cb, ctx);
- if (!ctx->conn) {
- LOGP(DMAIN, LOGL_INFO, "error while creating connection\n");
- talloc_free(ctx);
- return NULL;
- }
-
- llist_add_tail(&ctx->list, &g_hnbgw->hnb_list);
- return ctx;
-}
-
-int umts_cell_id_to_str_buf(char *buf, size_t buflen, const struct umts_cell_id *ucid)
-{
- struct osmo_strbuf sb = { .buf = buf, .len = buflen };
- OSMO_STRBUF_APPEND_NOLEN(sb, osmo_plmn_name_buf, &ucid->plmn);
- OSMO_STRBUF_PRINTF(sb, "-L%u-R%u-S%u-C%u", ucid->lac, ucid->rac, ucid->sac, ucid->cid);
- return sb.chars_needed;
-}
-
-char *umts_cell_id_to_str_c(void *ctx, const struct umts_cell_id *ucid)
-{
- OSMO_NAME_C_IMPL(ctx, 64, "ERROR", umts_cell_id_to_str_buf, ucid)
-}
-
-const char *umts_cell_id_to_str(const struct umts_cell_id *ucid)
-{
- return umts_cell_id_to_str_c(OTC_SELECT, ucid);
-}
-
-/* Useful to index a hash table by struct umts_cell_id. */
-uint32_t umts_cell_id_hash(const struct umts_cell_id *ucid)
-{
- return osmo_jhash(ucid, sizeof(*ucid), 0x423423);
-}
-
-/* parse a string representation of an umts_cell_id into its decoded representation */
-int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr)
-{
- int rc;
- char buf[4];
- const char *pos = instr;
- const char *end;
-
- /* We want to use struct umts_cell_id as hashtable key. If it ever happens to contain any padding bytes, make
- * sure everything is deterministically zero. */
- memset(ucid, 0, sizeof(*ucid));
-
- /* read MCC */
- end = strchr(pos, '-');
- if (!end || end <= pos || (end - pos) >= sizeof(buf))
- return -EINVAL;
- osmo_strlcpy(buf, pos, end - pos + 1);
- if (osmo_mcc_from_str(buf, &ucid->plmn.mcc))
- return -EINVAL;
- pos = end + 1;
-
- /* read MNC -- here the number of leading zeros matters. */
- end = strchr(pos, '-');
- if (!end || end == pos || (end - pos) >= sizeof(buf))
- return -EINVAL;
- osmo_strlcpy(buf, pos, end - pos + 1);
- if (osmo_mnc_from_str(buf, &ucid->plmn.mnc, &ucid->plmn.mnc_3_digits))
- return -EINVAL;
- pos = end + 1;
-
- /* parse the rest, where leading zeros do not matter */
- rc = sscanf(pos, "L%" SCNu16 "-R%" SCNu8 "-S%" SCNu16 "-C%" SCNu32 "",
- &ucid->lac, &ucid->rac, &ucid->sac, &ucid->cid);
- if (rc < 0)
- return -errno;
-
- if (rc != 4)
- return -EINVAL;
-
- if (ucid->lac == 0 || ucid->lac == 0xffff)
- return -EINVAL;
-
- /* CellIdentity in the ASN.1 syntax is a bit-string of 28 bits length */
- if (ucid->cid >= (1 << 28))
- return -EINVAL;
-
- return 0;
-}
-
-const char *hnb_context_name(struct hnb_context *ctx)
-{
- char *result;
- if (!ctx)
- return "NULL";
-
- if (ctx->conn) {
- char hostbuf_r[INET6_ADDRSTRLEN];
- char portbuf_r[6];
- int fd = osmo_stream_srv_get_ofd(ctx->conn)->fd;
-
- /* get remote addr */
- if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) == 0)
- result = talloc_asprintf(OTC_SELECT, "%s:%s", hostbuf_r, portbuf_r);
- else
- result = "?";
- } else {
- result = "disconnected";
- }
-
- if (g_hnbgw->config.log_prefix_hnb_id)
- result = talloc_asprintf(OTC_SELECT, "%s %s", result, ctx->identity_info);
- else
- result = talloc_asprintf(OTC_SELECT, "%s %s", result, umts_cell_id_to_str(&ctx->id));
- return result;
-}
-
-void hnb_context_release_ue_state(struct hnb_context *ctx)
-{
- struct hnbgw_context_map *map, *map2;
-
- /* deactivate all context maps */
- llist_for_each_entry_safe(map, map2, &ctx->map_list, hnb_list) {
- context_map_hnb_released(map);
- /* hnbgw_context_map will remove itself from lists when it is ready. */
- }
-}
-
-void hnb_context_release(struct hnb_context *ctx)
-{
- struct hnbgw_context_map *map;
-
- LOGHNB(ctx, DMAIN, LOGL_INFO, "Releasing HNB context\n");
-
- if (ctx->persistent) {
- struct timespec tp;
- int rc;
- rc = osmo_clock_gettime(CLOCK_MONOTONIC, &tp);
- ctx->persistent->updowntime = (rc < 0) ? 0 : tp.tv_sec;
- }
-
- /* remove from the list of HNB contexts */
- llist_del(&ctx->list);
-
- hnb_context_release_ue_state(ctx);
-
- if (ctx->conn) { /* we own a conn, we must free it: */
- LOGHNB(ctx, DMAIN, LOGL_INFO, "Closing HNB SCTP connection %s\n",
- osmo_sock_get_name2(osmo_stream_srv_get_ofd(ctx->conn)->fd));
- /* Avoid our closed_cb calling hnb_context_release() again: */
- osmo_stream_srv_set_data(ctx->conn, NULL);
- osmo_stream_srv_destroy(ctx->conn);
- } /* else: we are called from closed_cb, so conn is being freed separately */
-
- /* hnbgw_context_map are still listed in ctx->map_list, but we are freeing ctx. Remove all entries from the
- * list, but keep the hnbgw_context_map around for graceful release. They are also listed under
- * hnbgw_cnlink->map_list, and will remove themselves when ready. */
- while ((map = llist_first_entry_or_null(&ctx->map_list, struct hnbgw_context_map, hnb_list))) {
- llist_del(&map->hnb_list);
- map->hnb_ctx = NULL;
- }
-
- /* remove back reference from hnb_persistent to context */
- if (ctx->persistent)
- hnb_persistent_deregistered(ctx->persistent);
-
- talloc_free(ctx);
-}
-
-/***********************************************************************
- * HNB Persistent Data
- ***********************************************************************/
-
-const struct rate_ctr_desc hnb_ctr_description[] = {
- [HNB_CTR_IUH_ESTABLISHED] = {
- "iuh:established", "Number of times Iuh link was established" },
-
- [HNB_CTR_RANAP_PS_ERR_IND_UL] = {
- "ranap:ps:error_ind:ul", "Received ERROR Indications in Uplink (PS Domain)" },
- [HNB_CTR_RANAP_CS_ERR_IND_UL] = {
- "ranap:cs:error_ind:ul", "Received ERROR Indications in Uplink (PS Domain)" },
-
- [HNB_CTR_RANAP_PS_RESET_REQ_UL] = {
- "ranap:ps:reset_req:ul", "Received RESET Requests in Uplink (PS Domain)" },
- [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:normal", "PS RAB Release requested (by CN), normal" },
- [HNB_CTR_RANAP_CS_RAB_REL_REQ] = {
- "ranap:cs:rab_rel:req:normal", "CS RAB Release requested (by CN), normal" },
- [HNB_CTR_RANAP_PS_RAB_REL_REQ_ABNORMAL] = {
- "ranap:ps:rab_rel:req:abnormal", "PS RAB Release requested (by CN), abnormal" },
- [HNB_CTR_RANAP_CS_RAB_REL_REQ_ABNORMAL] = {
- "ranap:cs:rab_rel:req:abnormal", "CS RAB Release requested (by CN), abnormal" },
-
- [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:normal", "PS RAB Release implicit (during Iu Release), normal" },
- [HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT] = {
- "ranap:cs:rab_rel:implicit:normal", "CS RAB Release implicit (during Iu Release), normal" },
- [HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT_ABNORMAL] = {
- "ranap:ps:rab_rel:implicit:abnormal", "PS RAB Release implicit (during Iu Release), abnormal" },
- [HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT_ABNORMAL] = {
- "ranap:cs:rab_rel:implicit:abnormal", "CS RAB Release implicit (during Iu Release), abnormal" },
-
- [HNB_CTR_RUA_ERR_IND] = {
- "rua:error_ind", "Received RUA Error Indications" },
-
- [HNB_CTR_RUA_PS_CONNECT_UL] = {
- "rua:ps:connect:ul", "Received RUA Connect requests (PS Domain)" },
- [HNB_CTR_RUA_CS_CONNECT_UL] = {
- "rua:cs:connect:ul", "Received RUA Connect requests (CS Domain)" },
-
- [HNB_CTR_RUA_PS_DISCONNECT_UL] = {
- "rua:ps:disconnect:ul", "Received RUA Disconnect requests in uplink (PS Domain)" },
- [HNB_CTR_RUA_CS_DISCONNECT_UL] = {
- "rua:cs:disconnect:ul", "Received RUA Disconnect requests in uplink (CS Domain)" },
- [HNB_CTR_RUA_PS_DISCONNECT_DL] = {
- "rua:ps:disconnect:dl", "Transmitted RUA Disconnect requests in downlink (PS Domain)" },
- [HNB_CTR_RUA_CS_DISCONNECT_DL] = {
- "rua:cs:disconnect:dl", "Transmitted RUA Disconnect requests in downlink (CS Domain)" },
-
- [HNB_CTR_RUA_PS_DT_UL] = {
- "rua:ps:direct_transfer:ul", "Received RUA DirectTransfer in uplink (PS Domain)" },
- [HNB_CTR_RUA_CS_DT_UL] = {
- "rua:cs:direct_transfer:ul", "Received RUA DirectTransfer in uplink (CS Domain)" },
- [HNB_CTR_RUA_PS_DT_DL] = {
- "rua:ps:direct_transfer:dl", "Transmitted RUA DirectTransfer in downlink (PS Domain)" },
- [HNB_CTR_RUA_CS_DT_DL] = {
- "rua:cs:direct_transfer:dl", "Transmitted RUA DirectTransfer in downlink (CS Domain)" },
-
- [HNB_CTR_RUA_UDT_UL] = {
- "rua:unit_data:ul", "Received RUA UnitData (UDT) in uplink" },
- [HNB_CTR_RUA_UDT_DL] = {
- "rua:unit_data:dl", "Transmitted RUA UnitData (UDT) in downlink" },
-
- [HNB_CTR_PS_PAGING_ATTEMPTED] = {
- "paging:ps:attempted", "Transmitted PS Paging requests" },
- [HNB_CTR_CS_PAGING_ATTEMPTED] = {
- "paging:cs:attempted", "Transmitted CS Paging requests" },
-
- [HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL] = {
- "rab:cs:active_milliseconds:total", "Cumulative number of milliseconds of CS RAB activity" },
-
- [HNB_CTR_DTAP_CS_LU_REQ] = { "dtap:cs:location_update:req", "CS Location Update Requests" },
- [HNB_CTR_DTAP_CS_LU_ACC] = { "dtap:cs:location_update:accept", "CS Location Update Accepts" },
- [HNB_CTR_DTAP_CS_LU_REJ] = { "dtap:cs:location_update:reject", "CS Location Update Rejects" },
-
- [HNB_CTR_DTAP_PS_ATT_REQ] = { "dtap:ps:attach:req", "PS Attach Requests" },
- [HNB_CTR_DTAP_PS_ATT_ACK] = { "dtap:ps:attach:accept", "PS Attach Accepts" },
- [HNB_CTR_DTAP_PS_ATT_REJ] = { "dtap:ps:attach:reject", "PS Attach Rejects" },
-
- [HNB_CTR_DTAP_PS_RAU_REQ] = { "dtap:ps:routing_area_update:req", "PS Routing Area Update Requests" },
- [HNB_CTR_DTAP_PS_RAU_ACK] = { "dtap:ps:routing_area_update:accept", "PS Routing Area Update Accepts" },
- [HNB_CTR_DTAP_PS_RAU_REJ] = { "dtap:ps:routing_area_update:reject", "PS Routing Area Update Rejects" },
-
- [HNB_CTR_GTPU_PACKETS_UL] = {
- "gtpu:packets:ul",
- "Count of GTP-U packets received from the HNB",
- },
- [HNB_CTR_GTPU_TOTAL_BYTES_UL] = {
- "gtpu:total_bytes:ul",
- "Count of total GTP-U bytes received from the HNB, including the GTP-U/UDP/IP headers",
- },
- [HNB_CTR_GTPU_UE_BYTES_UL] = {
- "gtpu:ue_bytes:ul",
- "Assuming an IP header length of 20 bytes, GTP-U bytes received from the HNB, excluding the GTP-U/UDP/IP headers",
- },
- [HNB_CTR_GTPU_PACKETS_DL] = {
- "gtpu:packets:dl",
- "Count of GTP-U packets sent to the HNB",
- },
- [HNB_CTR_GTPU_TOTAL_BYTES_DL] = {
- "gtpu:total_bytes:dl",
- "Count of total GTP-U bytes sent to the HNB, including the GTP-U/UDP/IP headers",
- },
- [HNB_CTR_GTPU_UE_BYTES_DL] = {
- "gtpu:ue_bytes:dl",
- "Assuming an IP header length of 20 bytes, GTP-U bytes sent to the HNB, excluding the GTP-U/UDP/IP headers",
- },
-
-};
-
-const struct rate_ctr_group_desc hnb_ctrg_desc = {
- "hnb",
- "hNodeB",
- OSMO_STATS_CLASS_GLOBAL,
- ARRAY_SIZE(hnb_ctr_description),
- hnb_ctr_description,
-};
-
-const struct osmo_stat_item_desc hnb_stat_desc[] = {
- [HNB_STAT_UPTIME_SECONDS] = { "uptime:seconds", "Seconds of uptime", "s", 60, 0 },
-};
-
-const struct osmo_stat_item_group_desc hnb_statg_desc = {
- .group_name_prefix = "hnb",
- .group_description = "hNodeB",
- .class_id = OSMO_STATS_CLASS_GLOBAL,
- .num_items = ARRAY_SIZE(hnb_stat_desc),
- .item_desc = hnb_stat_desc,
-};
-
-static void hnb_persistent_disconnected_timeout_cb(void *data)
-{
- hnb_persistent_free(data);
-}
-
-static void hnb_persistent_disconnected_timeout_schedule(struct hnb_persistent *hnbp)
-{
- unsigned long period_s = osmo_tdef_get(hnbgw_T_defs, -35, OSMO_TDEF_S, 60*60*24*7);
- if (period_s < 1) {
- LOG_HNBP(hnbp, LOGL_INFO,
- "timer X35 is zero, not setting a disconnected timeout for this hnb-persistent instance.\n");
- return;
- }
- /* It is fine if the timer is already active, osmo_timer_del() is done implicitly by the osmo_timer API. */
- osmo_timer_setup(&hnbp->disconnected_timeout, hnb_persistent_disconnected_timeout_cb, hnbp);
- osmo_timer_schedule(&hnbp->disconnected_timeout, period_s, 0);
-}
-
-struct hnb_persistent *hnb_persistent_alloc(const struct umts_cell_id *id)
-{
- struct hnb_persistent *hnbp = talloc_zero(g_hnbgw, struct hnb_persistent);
- if (!hnbp)
- return NULL;
-
- hnbp->id = *id;
- hnbp->id_str = talloc_strdup(hnbp, umts_cell_id_to_str(id));
- hnbp->ctrs = rate_ctr_group_alloc(hnbp, &hnb_ctrg_desc, 0);
- if (!hnbp->ctrs)
- goto out_free;
- rate_ctr_group_set_name(hnbp->ctrs, hnbp->id_str);
- hnbp->statg = osmo_stat_item_group_alloc(hnbp, &hnb_statg_desc, 0);
- if (!hnbp->statg)
- goto out_free_ctrs;
- osmo_stat_item_group_set_name(hnbp->statg, hnbp->id_str);
-
- 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));
-
- if (g_hnbgw->nft_kpi.active)
- nft_kpi_hnb_persistent_add(hnbp);
-
- /* Normally the disconnected timer runs only when the hNodeB is not currently connected on Iuh. This here is paranoia:
- * In case we have to HNBAP HNB Register Reject, the disconnected timer should be active on this unused hnbp.
- * On success, hnb_persistent_registered() will stop the disconnected timer directly after this. */
- hnb_persistent_disconnected_timeout_schedule(hnbp);
-
- return hnbp;
-
-out_free_ctrs:
- rate_ctr_group_free(hnbp->ctrs);
-out_free:
- talloc_free(hnbp);
- return NULL;
-}
-
-struct hnb_persistent *hnb_persistent_find_by_id(const struct umts_cell_id *id)
-{
- struct hnb_persistent *hnbp;
- uint32_t id_hash = umts_cell_id_hash(id);
- hash_for_each_possible (g_hnbgw->hnb_persistent_by_id, hnbp, node_by_id, id_hash) {
- if (umts_cell_id_equal(&hnbp->id, id))
- return hnbp;
- }
- return NULL;
-}
-
-/* Read the peer's remote IP address from the Iuh conn's fd, and set up GTP-U counters for that remote address. */
-static void hnb_persistent_update_remote_addr(struct hnb_persistent *hnbp)
-{
- socklen_t socklen;
- struct osmo_sockaddr osa;
- struct osmo_sockaddr_str remote_str;
- int fd;
-
- fd = osmo_stream_srv_get_fd(hnbp->ctx->conn);
- if (fd < 0) {
- LOG_HNBP(hnbp, LOGL_ERROR, "no active socket fd, cannot set up traffic counters\n");
- return;
- }
-
- socklen = sizeof(struct osmo_sockaddr);
- if (getpeername(fd, &osa.u.sa, &socklen)) {
- LOG_HNBP(hnbp, LOGL_ERROR, "cannot read remote address, cannot set up traffic counters\n");
- return;
- }
- if (osmo_sockaddr_str_from_osa(&remote_str, &osa)) {
- LOG_HNBP(hnbp, LOGL_ERROR, "cannot parse remote address, cannot set up traffic counters\n");
- return;
- }
-
- /* We got the remote address from the Iuh link (RUA), and now we are blatantly assuming that the hNodeB has its
- * GTP endpoint on the same IP address, just with UDP port 2152 (the fixed GTP port as per 3GPP spec). */
- remote_str.port = 2152;
-
- if (nft_kpi_hnb_start(hnbp, &remote_str))
- LOG_HNBP(hnbp, LOGL_ERROR, "failed to set up traffic counters\n");
-}
-
-/* Whenever HNBAP registers a HNB, hnbgw_hnbap.c calls this function to let the hnb_persistent update its state to the
- * (new) remote address being active. When calling this function, a hnbp->ctx should be present, with an active
- * osmo_stream_srv conn. */
-void hnb_persistent_registered(struct hnb_persistent *hnbp)
-{
- if (!hnbp->ctx) {
- LOG_HNBP(hnbp, LOGL_ERROR, "hnb_persistent_registered() invoked, but there is no hnb_ctx\n");
- return;
- }
-
- /* The hNodeB is now connected, i.e. not disconnected. */
- osmo_timer_del(&hnbp->disconnected_timeout);
-
- /* start counting traffic */
- if (g_hnbgw->nft_kpi.active)
- hnb_persistent_update_remote_addr(hnbp);
-}
-
-/* Whenever a HNB is regarded as no longer registered (HNBAP HNB De-Register, or the Iuh link drops), this function is
- * called to to let the hnb_persistent update its state to the hNodeB being disconnected. Clear the ctx->persistent and
- * hnbp->ctx relations; do not delete the hnb_persistent instance. */
-void hnb_persistent_deregistered(struct hnb_persistent *hnbp)
-{
- /* clear out cross references of hnb_context and hnb_persistent */
- if (hnbp->ctx) {
- if (hnbp->ctx->persistent == hnbp)
- hnbp->ctx->persistent = NULL;
- hnbp->ctx = NULL;
- }
-
- /* stop counting traffic */
- nft_kpi_hnb_stop(hnbp);
-
- /* The hNodeB is now disconnected. Clear out hnb_persistent when the disconnected timeout has passed. */
- hnb_persistent_disconnected_timeout_schedule(hnbp);
-}
-
-void hnb_persistent_free(struct hnb_persistent *hnbp)
-{
- /* FIXME: check if in use? */
- osmo_timer_del(&hnbp->disconnected_timeout);
- nft_kpi_hnb_stop(hnbp);
- nft_kpi_hnb_persistent_remove(hnbp);
- osmo_stat_item_group_free(hnbp->statg);
- rate_ctr_group_free(hnbp->ctrs);
- llist_del(&hnbp->list);
- hash_del(&hnbp->node_by_id);
- talloc_free(hnbp);
-}
-
-/* return the amount of time the HNB is up (hnbp->ctx != NULL) or down (hnbp->ctx == NULL) */
-static unsigned long long hnbp_get_updowntime(const struct hnb_persistent *hnbp)
-{
- struct timespec tp;
-
- if (!hnbp->updowntime)
- return 0;
-
- if (osmo_clock_gettime(CLOCK_MONOTONIC, &tp) != 0)
- return 0;
-
- return difftime(tp.tv_sec, hnbp->updowntime);
-}
-
-unsigned long long hnb_get_updowntime(const struct hnb_context *ctx)
-{
- if (!ctx->persistent)
- return 0;
- return hnbp_get_updowntime(ctx->persistent);
-}
-
-/* timer call-back: Update the HNB_STAT_UPTIME_SECONDS stat item of each hnb_persistent */
-static void hnbgw_store_hnb_uptime(void *data)
-{
- struct hnb_persistent *hnbp;
-
- llist_for_each_entry(hnbp, &g_hnbgw->hnb_persistent_list, list) {
- HNBP_STAT_SET(hnbp, HNB_STAT_UPTIME_SECONDS, hnbp->ctx != NULL ? hnbp_get_updowntime(hnbp) : 0);
- }
-
- osmo_timer_schedule(&g_hnbgw->store_uptime_timer, STORE_UPTIME_INTERVAL, 0);
-}
-
-/***********************************************************************
- * SCTP Socket / stream handling
- ***********************************************************************/
-
-static int hnb_read_cb(struct osmo_stream_srv *conn)
-{
- struct hnb_context *hnb = osmo_stream_srv_get_data(conn);
- struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn);
- struct msgb *msg = msgb_alloc(IUH_MSGB_SIZE, "Iuh rx");
- int rc;
-
- if (!msg)
- return -ENOMEM;
-
- OSMO_ASSERT(hnb);
- /* we store a reference to the HomeNodeB in the msg->dest for the
- * benefit of various downstream processing functions */
- msg->dst = hnb;
-
- rc = osmo_stream_srv_recv(conn, msg);
- /* Notification received */
- if (msgb_sctp_msg_flags(msg) & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) {
- union sctp_notification *notif = (union sctp_notification *)msgb_data(msg);
- rc = 0;
- switch (notif->sn_header.sn_type) {
- case SCTP_ASSOC_CHANGE:
- switch (notif->sn_assoc_change.sac_state) {
- case SCTP_COMM_LOST:
- LOGHNB(hnb, DMAIN, LOGL_NOTICE,
- "sctp_recvmsg(%s) = SCTP_COMM_LOST, closing conn\n",
- osmo_sock_get_name2(ofd->fd));
- osmo_stream_srv_destroy(conn);
- rc = -EBADF;
- break;
- case SCTP_RESTART:
- LOGHNB(hnb, DMAIN, LOGL_NOTICE, "HNB SCTP conn RESTARTed, marking as HNBAP-unregistered\n");
- hnb->hnb_registered = false;
- hnb_context_release_ue_state(hnb);
- /* The tx queue may be quite full after an SCTP RESTART: (SYS#6113)
- * The link may have been flaky (a possible reason for the peer restarting the conn) and
- * hence the kernel socket Tx queue may be full (no ACKs coming back) and our own userspace
- * queue may contain plenty of oldish messages to be sent. Since the HNB will re-register after
- * this, we simply drop all those old messages: */
- osmo_stream_srv_clear_tx_queue(conn);
- break;
- }
- break;
- case SCTP_SHUTDOWN_EVENT:
- LOGHNB(hnb, DMAIN, LOGL_NOTICE,
- "sctp_recvmsg(%s) = SCTP_SHUTDOWN_EVENT, closing conn\n",
- osmo_sock_get_name2(ofd->fd));
- osmo_stream_srv_destroy(conn);
- rc = -EBADF;
- break;
- }
- goto out;
- } else if (rc == -EAGAIN) {
- /* Older versions of osmo_stream_srv_recv() not supporting
- * msgb_sctp_msg_flags() may still return -EAGAIN when an sctp
- * notification is received. */
- rc = 0;
- goto out;
- } else if (rc < 0) {
- LOGHNB(hnb, DMAIN, LOGL_ERROR, "Error during sctp_recvmsg(%s)\n",
- osmo_sock_get_name2(ofd->fd));
- osmo_stream_srv_destroy(conn);
- rc = -EBADF;
- goto out;
- } else if (rc == 0) {
- LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Connection closed sctp_recvmsg(%s) = 0\n",
- osmo_sock_get_name2(ofd->fd));
- osmo_stream_srv_destroy(conn);
- rc = -EBADF;
- goto out;
- } else {
- msgb_put(msg, rc);
- }
-
- switch (msgb_sctp_ppid(msg)) {
- case IUH_PPI_HNBAP:
- hnb->hnbap_stream = msgb_sctp_stream(msg);
- rc = hnbgw_hnbap_rx(hnb, msg);
- break;
- case IUH_PPI_RUA:
- if (!hnb->hnb_registered) {
- LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Discarding RUA as HNB is not registered\n");
- goto out;
- }
- hnb->rua_stream = msgb_sctp_stream(msg);
- rc = hnbgw_rua_rx(hnb, msg);
- break;
- case IUH_PPI_SABP:
- case IUH_PPI_RNA:
- case IUH_PPI_PUA:
- LOGHNB(hnb, DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%lu received\n", msgb_sctp_ppid(msg));
- rc = 0;
- break;
- default:
- LOGHNB(hnb, DMAIN, LOGL_ERROR, "Unknown SCTP PPID=%lu received\n", msgb_sctp_ppid(msg));
- rc = 0;
- break;
- }
-
-out:
- msgb_free(msg);
- return rc;
-}
-
-static int hnb_closed_cb(struct osmo_stream_srv *conn)
-{
- struct hnb_context *hnb = osmo_stream_srv_get_data(conn);
- if (!hnb)
- return 0; /* hnb_context is being freed, nothing do be done */
-
- /* hnb: conn became broken, let's release the associated hnb.
- * conn object is being freed after closed_cb(), so unassign it from hnb
- * if available to avoid it freeing it again: */
- hnb->conn = NULL;
- hnb_context_release(hnb);
-
- return 0;
-}
-
-/*! call-back when the listen FD has something to read */
-int hnbgw_rua_accept_cb(struct osmo_stream_srv_link *srv, int fd)
-{
- struct hnb_context *ctx;
-
- LOGP(DMAIN, LOGL_INFO, "New HNB SCTP connection %s\n",
- osmo_sock_get_name2(fd));
-
- ctx = hnb_context_alloc(srv, fd);
- if (!ctx)
- return -ENOMEM;
-
- return 0;
-}
-
-CTRL_CMD_DEFINE_RO(hnb_info, "info");
-static int get_hnb_info(struct ctrl_cmd *cmd, void *data)
-{
- struct hnb_context *hnb = data;
-
- cmd->reply = talloc_strdup(cmd, hnb->identity_info);
-
- return CTRL_CMD_REPLY;
-}
-
-CTRL_CMD_DEFINE_RO(hnbs, "num-hnb");
-static int get_hnbs(struct ctrl_cmd *cmd, void *data)
-{
- cmd->reply = talloc_asprintf(cmd, "%u", llist_count(&g_hnbgw->hnb_list));
-
- return CTRL_CMD_REPLY;
-}
-
-int hnb_ctrl_cmds_install(void)
-{
- int rc = 0;
-
- rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_hnbs);
- rc |= ctrl_cmd_install(CTRL_NODE_HNB, &cmd_hnb_info);
-
- return rc;
-}
-
-int hnb_ctrl_node_lookup(void *data, vector vline, int *node_type, void **node_data, int *i)
-{
- const char *token = vector_slot(vline, *i);
- struct hnb_context *hnb;
- long num;
-
- switch (*node_type) {
- case CTRL_NODE_ROOT:
- if (strcmp(token, "hnb") != 0)
- return 0;
-
- (*i)++;
-
- if (!ctrl_parse_get_num(vline, *i, &num))
- return -ERANGE;
-
- hnb = hnb_context_by_id(num);
- if (!hnb)
- return -ENODEV;
-
- *node_data = hnb;
- *node_type = CTRL_NODE_HNB;
- break;
- default:
- return 0;
- }
-
- return 1;
-}
-
int hnbgw_mgw_setup(void)
{
struct mgcp_client *mgcp_client_single;
diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c
index 5874457..b291513 100644
--- a/src/osmo-hnbgw/hnbgw_hnbap.c
+++ b/src/osmo-hnbgw/hnbgw_hnbap.c
@@ -33,6 +33,8 @@
#include <osmocom/hnbap/hnbap_common.h>
#include <osmocom/ranap/iu_helpers.h>
+#include <osmocom/hnbgw/hnb.h>
+#include <osmocom/hnbgw/hnb_persistent.h>
#include <osmocom/hnbgw/hnbgw.h>
#include <osmocom/hnbap/hnbap_ies_defs.h>
diff --git a/src/osmo-hnbgw/hnbgw_ranap.c b/src/osmo-hnbgw/hnbgw_ranap.c
index 6dc1f06..efa46d4 100644
--- a/src/osmo-hnbgw/hnbgw_ranap.c
+++ b/src/osmo-hnbgw/hnbgw_ranap.c
@@ -39,6 +39,8 @@
#include <osmocom/pfcp/pfcp_cp_peer.h>
#endif
+#include <osmocom/hnbgw/hnb.h>
+#include <osmocom/hnbgw/hnb_persistent.h>
#include <osmocom/hnbgw/hnbgw.h>
#include <osmocom/hnbgw/hnbgw_rua.h>
#include <osmocom/hnbgw/hnbgw_cn.h>
diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c
index 7a51c8d..40e65f4 100644
--- a/src/osmo-hnbgw/hnbgw_rua.c
+++ b/src/osmo-hnbgw/hnbgw_rua.c
@@ -33,6 +33,8 @@
#include "asn1helpers.h"
+#include <osmocom/hnbgw/hnb.h>
+#include <osmocom/hnbgw/hnb_persistent.h>
#include <osmocom/hnbgw/hnbgw_cn.h>
#include <osmocom/hnbgw/hnbgw_ranap.h>
#include <osmocom/rua/rua_common.h>
diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c
index d99a998..e2c3d8f 100644
--- a/src/osmo-hnbgw/hnbgw_vty.c
+++ b/src/osmo-hnbgw/hnbgw_vty.c
@@ -31,6 +31,8 @@
#include <osmocom/hnbgw/vty.h>
+#include <osmocom/hnbgw/hnb.h>
+#include <osmocom/hnbgw/hnb_persistent.h>
#include <osmocom/hnbgw/hnbgw.h>
#include <osmocom/hnbgw/hnbgw_cn.h>
#include <osmocom/hnbgw/context_map.h>
diff --git a/src/osmo-hnbgw/kpi_dtap.c b/src/osmo-hnbgw/kpi_dtap.c
index 8d47208..36c9c91 100644
--- a/src/osmo-hnbgw/kpi_dtap.c
+++ b/src/osmo-hnbgw/kpi_dtap.c
@@ -26,6 +26,7 @@
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
+#include <osmocom/hnbgw/hnb_persistent.h>
#include <osmocom/hnbgw/hnbgw.h>
#include <osmocom/hnbgw/context_map.h>
#include <osmocom/hnbgw/kpi.h>
diff --git a/src/osmo-hnbgw/kpi_ranap.c b/src/osmo-hnbgw/kpi_ranap.c
index 3f2c1b3..c1c77bf 100644
--- a/src/osmo-hnbgw/kpi_ranap.c
+++ b/src/osmo-hnbgw/kpi_ranap.c
@@ -24,6 +24,7 @@
#include <osmocom/ranap/ranap_common_ran.h>
+#include <osmocom/hnbgw/hnb_persistent.h>
#include <osmocom/hnbgw/hnbgw_cn.h>
#include <osmocom/hnbgw/context_map.h>
#include <osmocom/hnbgw/kpi.h>
diff --git a/src/osmo-hnbgw/nft_kpi.c b/src/osmo-hnbgw/nft_kpi.c
index 9dd8608..f8671fc 100644
--- a/src/osmo-hnbgw/nft_kpi.c
+++ b/src/osmo-hnbgw/nft_kpi.c
@@ -19,8 +19,10 @@
#include <osmocom/core/logging.h>
#include <osmocom/core/it_q.h>
+#include <osmocom/hnbgw/hnb_persistent.h>
#include <osmocom/hnbgw/hnbgw.h>
#include <osmocom/hnbgw/nft_kpi.h>
+#include <osmocom/hnbgw/umts_cell_id.h>
#include "config.h"
diff --git a/src/osmo-hnbgw/osmo_hnbgw_main.c b/src/osmo-hnbgw/osmo_hnbgw_main.c
index 2034490..845002f 100644
--- a/src/osmo-hnbgw/osmo_hnbgw_main.c
+++ b/src/osmo-hnbgw/osmo_hnbgw_main.c
@@ -45,6 +45,7 @@
#include <osmocom/ranap/ranap_common.h>
+#include <osmocom/hnbgw/hnb.h>
#include <osmocom/hnbgw/hnbgw.h>
#include <osmocom/hnbgw/hnbgw_cn.h>
#include <osmocom/hnbgw/hnbgw_pfcp.h>
diff --git a/src/osmo-hnbgw/umts_cell_id.c b/src/osmo-hnbgw/umts_cell_id.c
new file mode 100644
index 0000000..2e2af2d
--- /dev/null
+++ b/src/osmo-hnbgw/umts_cell_id.c
@@ -0,0 +1,107 @@
+/* UMTS Cell ID */
+
+/* (C) 2015,2024 by Harald Welte <laforge(a)gnumonks.org>
+ * (C) 2016-2025 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved
+ *
+ * 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 <unistd.h>
+#include <errno.h>
+#include <inttypes.h>
+
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/jhash.h>
+
+#include <osmocom/gsm/gsm23003.h>
+
+#include <osmocom/hnbgw/umts_cell_id.h>
+
+int umts_cell_id_to_str_buf(char *buf, size_t buflen, const struct umts_cell_id *ucid)
+{
+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+ OSMO_STRBUF_APPEND_NOLEN(sb, osmo_plmn_name_buf, &ucid->plmn);
+ OSMO_STRBUF_PRINTF(sb, "-L%u-R%u-S%u-C%u", ucid->lac, ucid->rac, ucid->sac, ucid->cid);
+ return sb.chars_needed;
+}
+
+char *umts_cell_id_to_str_c(void *ctx, const struct umts_cell_id *ucid)
+{
+ OSMO_NAME_C_IMPL(ctx, 64, "ERROR", umts_cell_id_to_str_buf, ucid)
+}
+
+const char *umts_cell_id_to_str(const struct umts_cell_id *ucid)
+{
+ return umts_cell_id_to_str_c(OTC_SELECT, ucid);
+}
+
+/* Useful to index a hash table by struct umts_cell_id. */
+uint32_t umts_cell_id_hash(const struct umts_cell_id *ucid)
+{
+ return osmo_jhash(ucid, sizeof(*ucid), 0x423423);
+}
+
+/* parse a string representation of an umts_cell_id into its decoded representation */
+int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr)
+{
+ int rc;
+ char buf[4];
+ const char *pos = instr;
+ const char *end;
+
+ /* We want to use struct umts_cell_id as hashtable key. If it ever happens to contain any padding bytes, make
+ * sure everything is deterministically zero. */
+ memset(ucid, 0, sizeof(*ucid));
+
+ /* read MCC */
+ end = strchr(pos, '-');
+ if (!end || end <= pos || (end - pos) >= sizeof(buf))
+ return -EINVAL;
+ osmo_strlcpy(buf, pos, end - pos + 1);
+ if (osmo_mcc_from_str(buf, &ucid->plmn.mcc))
+ return -EINVAL;
+ pos = end + 1;
+
+ /* read MNC -- here the number of leading zeros matters. */
+ end = strchr(pos, '-');
+ if (!end || end == pos || (end - pos) >= sizeof(buf))
+ return -EINVAL;
+ osmo_strlcpy(buf, pos, end - pos + 1);
+ if (osmo_mnc_from_str(buf, &ucid->plmn.mnc, &ucid->plmn.mnc_3_digits))
+ return -EINVAL;
+ pos = end + 1;
+
+ /* parse the rest, where leading zeros do not matter */
+ rc = sscanf(pos, "L%" SCNu16 "-R%" SCNu8 "-S%" SCNu16 "-C%" SCNu32 "",
+ &ucid->lac, &ucid->rac, &ucid->sac, &ucid->cid);
+ if (rc < 0)
+ return -errno;
+
+ if (rc != 4)
+ return -EINVAL;
+
+ if (ucid->lac == 0 || ucid->lac == 0xffff)
+ return -EINVAL;
+
+ /* CellIdentity in the ASN.1 syntax is a bit-string of 28 bits length */
+ if (ucid->cid >= (1 << 28))
+ return -EINVAL;
+
+ return 0;
+}
diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c
index 76a3430..a656776 100644
--- a/tests/ranap_rab_ass/ranap_rab_ass_test.c
+++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c
@@ -24,15 +24,18 @@
#include <osmocom/core/utils.h>
#include <osmocom/core/socket.h>
#include <osmocom/core/sockaddr_str.h>
-#include <osmocom/hnbgw/hnbgw.h>
+
#include <osmocom/ranap/ranap_ies_defs.h>
#include <osmocom/ranap/iu_helpers.h>
-#include <osmocom/hnbgw/ranap_rab_ass.h>
#include <osmocom/ranap/ranap_common.h>
#include <osmocom/ranap/ranap_common_cn.h>
#include <osmocom/ranap/ranap_common_ran.h>
+#include <osmocom/hnbgw/hnb.h>
+#include <osmocom/hnbgw/hnbgw.h>
+#include <osmocom/hnbgw/ranap_rab_ass.h>
+
static void *msgb_ctx;
extern void *talloc_asn1_ctx;
diff --git a/tests/umts_cell_id/umts_cell_id_test.c b/tests/umts_cell_id/umts_cell_id_test.c
index 18c176a..0dbdd84 100644
--- a/tests/umts_cell_id/umts_cell_id_test.c
+++ b/tests/umts_cell_id/umts_cell_id_test.c
@@ -1,6 +1,9 @@
#include <stdio.h>
+#include <errno.h>
-#include <osmocom/hnbgw/hnbgw.h>
+#include <osmocom/core/utils.h>
+
+#include <osmocom/hnbgw/umts_cell_id.h>
struct test {
const char *id_str;
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40254?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: I4ff65d14f94d99a57316c2483c92244078bb5dd9
Gerrit-Change-Number: 40254
Gerrit-PatchSet: 2
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 month, 2 weeks
- 1
- 0
[M] Change in osmo-hnbgw[master]: Split struct hnbgw_sccp_user allocation & setup to its own function
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40242?usp=email )
Change subject: Split struct hnbgw_sccp_user allocation & setup to its own function
......................................................................
Split struct hnbgw_sccp_user allocation & setup to its own function
Preparation for follow-up commit splitting whole SCCP handling to its
own file.
Change-Id: I04c36bc0193554fcaf6be5e20573052c421af49d
---
M src/osmo-hnbgw/hnbgw_cn.c
1 file changed, 56 insertions(+), 49 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c
index 686a0e5..49ae9ae 100644
--- a/src/osmo-hnbgw/hnbgw_cn.c
+++ b/src/osmo-hnbgw/hnbgw_cn.c
@@ -423,15 +423,67 @@
cnlink->name, cnlink->use.remote_addr_name ? : "(default remote point-code)");
}
+static struct hnbgw_sccp_user *hnbgw_sccp_user_alloc(const struct hnbgw_cnlink *cnlink, int ss7_id)
+{
+ struct osmo_ss7_instance *ss7 = NULL;
+ struct osmo_sccp_instance *sccp;
+ struct osmo_sccp_user *sccp_user;
+ uint32_t local_pc;
+ struct hnbgw_sccp_user *hsu;
+
+ sccp = osmo_sccp_simple_client_on_ss7_id(g_hnbgw,
+ ss7_id,
+ cnlink->name,
+ DEFAULT_PC_HNBGW,
+ OSMO_SS7_ASP_PROT_M3UA,
+ 0,
+ "localhost",
+ -1,
+ "localhost");
+ if (!sccp) {
+ LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "Failed to configure SCCP on 'cs7 instance %u'\n",
+ ss7_id);
+ return NULL;
+ }
+ ss7 = osmo_sccp_get_ss7(sccp);
+ LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "created SCCP instance on cs7 instance %u\n", osmo_ss7_instance_get_id(ss7));
+
+ /* Bind the SCCP user, using the cs7 instance's default point-code if one is configured, or osmo-hnbgw's default
+ * local PC. */
+ local_pc = osmo_ss7_instance_get_primary_pc(ss7);
+ if (!osmo_ss7_pc_is_valid(local_pc))
+ local_pc = DEFAULT_PC_HNBGW;
+
+ LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "binding OsmoHNBGW user to cs7 instance %u, local PC %u = %s\n",
+ osmo_ss7_instance_get_id(ss7), local_pc, osmo_ss7_pointcode_print(ss7, local_pc));
+
+ sccp_user = osmo_sccp_user_bind_pc(sccp, "OsmoHNBGW", sccp_sap_up, OSMO_SCCP_SSN_RANAP, local_pc);
+ if (!sccp_user) {
+ LOGP(DCN, LOGL_ERROR, "Failed to init SCCP User\n");
+ return NULL;
+ }
+
+ hsu = talloc_zero(cnlink, struct hnbgw_sccp_user);
+ *hsu = (struct hnbgw_sccp_user){
+ .name = talloc_asprintf(hsu, "cs7-%u.sccp", osmo_ss7_instance_get_id(ss7)),
+ .ss7 = ss7,
+ .sccp_user = sccp_user,
+ };
+ osmo_sccp_make_addr_pc_ssn(&hsu->local_addr, local_pc, OSMO_SCCP_SSN_RANAP);
+ hash_init(hsu->hnbgw_context_map_by_conn_id);
+ osmo_sccp_user_set_priv(sccp_user, hsu);
+
+ llist_add_tail(&hsu->entry, &g_hnbgw->sccp.users);
+
+ return hsu;
+}
+
/* If not present yet, set up all of osmo_ss7_instance, osmo_sccp_instance and hnbgw_sccp_user for the given cnlink.
* The cs7 instance nr to use is determined by cnlink->remote_addr_name, or cs7 instance 0 if that is not present.
* Set cnlink->hnbgw_sccp_user to the new SCCP instance. Return 0 on success, negative on error. */
int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink)
{
struct osmo_ss7_instance *ss7 = NULL;
- struct osmo_sccp_instance *sccp;
- struct osmo_sccp_user *sccp_user;
- uint32_t local_pc;
struct hnbgw_sccp_user *hsu;
/* If a hnbgw_sccp_user has already been set up, use that. */
@@ -492,52 +544,7 @@
/* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a
* particular cs7 instance above, use 'cs7 instance 0'. */
- sccp = osmo_sccp_simple_client_on_ss7_id(g_hnbgw,
- ss7 ? osmo_ss7_instance_get_id(ss7) : 0,
- cnlink->name,
- DEFAULT_PC_HNBGW,
- OSMO_SS7_ASP_PROT_M3UA,
- 0,
- "localhost",
- -1,
- "localhost");
- if (!sccp) {
- LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "Failed to configure SCCP on 'cs7 instance %u'\n",
- ss7 ? osmo_ss7_instance_get_id(ss7) : 0);
- return -1;
- }
- ss7 = osmo_sccp_get_ss7(sccp);
- LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "created SCCP instance on cs7 instance %u\n", osmo_ss7_instance_get_id(ss7));
-
- /* Bind the SCCP user, using the cs7 instance's default point-code if one is configured, or osmo-hnbgw's default
- * local PC. */
- local_pc = osmo_ss7_instance_get_primary_pc(ss7);
- if (!osmo_ss7_pc_is_valid(local_pc))
- local_pc = DEFAULT_PC_HNBGW;
-
- LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "binding OsmoHNBGW user to cs7 instance %u, local PC %u = %s\n",
- osmo_ss7_instance_get_id(ss7), local_pc, osmo_ss7_pointcode_print(ss7, local_pc));
-
- sccp_user = osmo_sccp_user_bind_pc(sccp, "OsmoHNBGW", sccp_sap_up, OSMO_SCCP_SSN_RANAP, local_pc);
- if (!sccp_user) {
- LOGP(DCN, LOGL_ERROR, "Failed to init SCCP User\n");
- return -1;
- }
-
- hsu = talloc_zero(cnlink, struct hnbgw_sccp_user);
- *hsu = (struct hnbgw_sccp_user){
- .name = talloc_asprintf(hsu, "cs7-%u.sccp", osmo_ss7_instance_get_id(ss7)),
- .ss7 = ss7,
- .sccp_user = sccp_user,
- };
- osmo_sccp_make_addr_pc_ssn(&hsu->local_addr, local_pc, OSMO_SCCP_SSN_RANAP);
- hash_init(hsu->hnbgw_context_map_by_conn_id);
- osmo_sccp_user_set_priv(sccp_user, hsu);
-
- llist_add_tail(&hsu->entry, &g_hnbgw->sccp.users);
-
- cnlink->hnbgw_sccp_user = hsu;
-
+ cnlink->hnbgw_sccp_user = hnbgw_sccp_user_alloc(cnlink, ss7 ? osmo_ss7_instance_get_id(ss7) : 0);
hnbgw_cnlink_log_self(cnlink);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40242?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: I04c36bc0193554fcaf6be5e20573052c421af49d
Gerrit-Change-Number: 40242
Gerrit-PatchSet: 2
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: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 month, 2 weeks
- 1
- 0
[XS] Change in osmo-hnbgw[master]: sccp: Use proper wording s/LOG_HSI/LOG_HSU
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40245?usp=email )
Change subject: sccp: Use proper wording s/LOG_HSI/LOG_HSU
......................................................................
sccp: Use proper wording s/LOG_HSI/LOG_HSU
Change-Id: I9b543416488a8396c3b548c63169374f999f32fc
---
M include/osmocom/hnbgw/hnbgw_sccp.h
M src/osmo-hnbgw/hnbgw_sccp.c
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/include/osmocom/hnbgw/hnbgw_sccp.h b/include/osmocom/hnbgw/hnbgw_sccp.h
index 8188b55..7cf67a5 100644
--- a/include/osmocom/hnbgw/hnbgw_sccp.h
+++ b/include/osmocom/hnbgw/hnbgw_sccp.h
@@ -32,7 +32,7 @@
DECLARE_HASHTABLE(hnbgw_context_map_by_conn_id, 6);
};
-#define LOG_HSI(HNBGW_SCCP_INST, SUBSYS, LEVEL, FMT, ARGS...) \
- LOGP(SUBSYS, LEVEL, "(%s) " FMT, (HNBGW_SCCP_INST) ? (HNBGW_SCCP_INST)->name : "null", ##ARGS)
+#define LOG_HSU(HSU, SUBSYS, LEVEL, FMT, ARGS...) \
+ LOGP(SUBSYS, LEVEL, "(%s) " FMT, (HSU) ? (HSU)->name : "null", ##ARGS)
struct hnbgw_sccp_user *hnbgw_sccp_user_alloc(const struct hnbgw_cnlink *cnlink, int ss7_inst_id);
diff --git a/src/osmo-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c
index 8570f51..67e0a53 100644
--- a/src/osmo-hnbgw/hnbgw_sccp.c
+++ b/src/osmo-hnbgw/hnbgw_sccp.c
@@ -71,7 +71,7 @@
struct hnbgw_cnlink *cnlink = NULL;
cnlink = hnbgw_cnlink_find_by_addr(hsu, calling_addr);
if (!cnlink) {
- LOG_HSI(hsu, DRANAP, LOGL_ERROR, "Rx from unknown SCCP peer: %s: %s\n",
+ LOG_HSU(hsu, DRANAP, LOGL_ERROR, "Rx from unknown SCCP peer: %s: %s\n",
osmo_sccp_inst_addr_name(osmo_ss7_get_sccp(hsu->ss7), calling_addr),
osmo_scu_prim_hdr_name_c(OTC_SELECT, oph));
return NULL;
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40245?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: I9b543416488a8396c3b548c63169374f999f32fc
Gerrit-Change-Number: 40245
Gerrit-PatchSet: 1
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 month, 2 weeks
- 1
- 0
[L] Change in osmo-hnbgw[master]: Move SCCP prim handling to its own hnbgw_sccp.{c,h} file
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40243?usp=email )
Change subject: Move SCCP prim handling to its own hnbgw_sccp.{c,h} file
......................................................................
Move SCCP prim handling to its own hnbgw_sccp.{c,h} file
Similar to what we already have for other protocols; helps properly
splitting logic per layer.
Change-Id: Idb45a25f7ff4bcd38ffd27bf1d3360b9d34149b3
---
M include/osmocom/hnbgw/Makefile.am
M include/osmocom/hnbgw/hnbgw.h
M include/osmocom/hnbgw/hnbgw_cn.h
A include/osmocom/hnbgw/hnbgw_sccp.h
M src/osmo-hnbgw/Makefile.am
M src/osmo-hnbgw/hnbgw_cn.c
A src/osmo-hnbgw/hnbgw_sccp.c
7 files changed, 432 insertions(+), 376 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/hnbgw/Makefile.am b/include/osmocom/hnbgw/Makefile.am
index 03821d5..d3fbb07 100644
--- a/include/osmocom/hnbgw/Makefile.am
+++ b/include/osmocom/hnbgw/Makefile.am
@@ -6,6 +6,7 @@
hnbgw_pfcp.h \
hnbgw_ranap.h \
hnbgw_rua.h \
+ hnbgw_sccp.h \
kpi.h \
mgw_fsm.h \
nft_kpi.h \
diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h
index 23857d5..3995294 100644
--- a/include/osmocom/hnbgw/hnbgw.h
+++ b/include/osmocom/hnbgw/hnbgw.h
@@ -8,7 +8,6 @@
#include <osmocom/core/rate_ctr.h>
#include <osmocom/core/sockaddr_str.h>
#include <osmocom/gsm/gsm23003.h>
-#include <osmocom/sigtran/sccp_sap.h>
#include <osmocom/sigtran/osmo_ss7.h>
#include <osmocom/ctrl/control_if.h>
#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
@@ -20,6 +19,7 @@
#include <osmocom/mgcp_client/mgcp_client_pool.h>
#include <osmocom/hnbgw/nft_kpi.h>
+#include <osmocom/hnbgw/hnbgw_sccp.h>
#define STORE_UPTIME_INTERVAL 10 /* seconds */
#define HNB_STORE_RAB_DURATIONS_INTERVAL 1 /* seconds */
@@ -202,32 +202,6 @@
struct hnbgw_context_map;
-/* osmo-hnbgw keeps a single hnbgw_sccp_user per osmo_sccp_instance, for the local point-code and SSN == RANAP.
- * This relates the (opaque) osmo_sccp_user to osmo-hnbgw's per-ss7 state. */
-struct hnbgw_sccp_user {
- /* entry in g_hnbgw->sccp.users */
- struct llist_head entry;
-
- /* logging context */
- char *name;
-
- /* Which 'cs7 instance' is this for? Below sccp_user is registered at the osmo_sccp_instance ss7->sccp. */
- struct osmo_ss7_instance *ss7;
-
- /* Local address: cs7 instance's primary PC if present, else the default HNBGW PC; with SSN == RANAP. */
- struct osmo_sccp_addr local_addr;
-
- /* osmo_sccp API state for above local address on above ss7 instance. */
- struct osmo_sccp_user *sccp_user;
-
- /* Fast access to the hnbgw_context_map responsible for a given SCCP conn_id of the ss7->sccp instance.
- * hlist_node: hnbgw_context_map->hnbgw_sccp_user_entry. */
- DECLARE_HASHTABLE(hnbgw_context_map_by_conn_id, 6);
-};
-
-#define LOG_HSI(HNBGW_SCCP_INST, SUBSYS, LEVEL, FMT, ARGS...) \
- LOGP(SUBSYS, LEVEL, "(%s) " FMT, (HNBGW_SCCP_INST) ? (HNBGW_SCCP_INST)->name : "null", ##ARGS)
-
/* User provided configuration for struct hnbgw_cnpool. */
struct hnbgw_cnpool_cfg {
uint8_t nri_bitlen;
diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h
index a5fa132..78b82b7 100644
--- a/include/osmocom/hnbgw/hnbgw_cn.h
+++ b/include/osmocom/hnbgw/hnbgw_cn.h
@@ -8,8 +8,6 @@
#include <osmocom/hnbgw/hnbgw.h>
struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr);
-struct hnbgw_cnlink *hnbgw_cnlink_find_by_addr(const struct hnbgw_sccp_user *hsu,
- const struct osmo_sccp_addr *remote_addr);
struct hnbgw_cnlink *hnbgw_cnlink_select(struct hnbgw_context_map *map);
void hnbgw_cnpool_start(struct hnbgw_cnpool *cnpool);
diff --git a/include/osmocom/hnbgw/hnbgw_sccp.h b/include/osmocom/hnbgw/hnbgw_sccp.h
new file mode 100644
index 0000000..8188b55
--- /dev/null
+++ b/include/osmocom/hnbgw/hnbgw_sccp.h
@@ -0,0 +1,38 @@
+/* SCCP, ITU Q.711 - Q.714 */
+#pragma once
+
+#include <osmocom/core/hashtable.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/prim.h>
+
+#include <osmocom/sigtran/sccp_sap.h>
+
+struct hnbgw_cnlink;
+
+/* osmo-hnbgw keeps a single hnbgw_sccp_user per osmo_sccp_instance, for the local point-code and SSN == RANAP.
+ * This relates the (opaque) osmo_sccp_user to osmo-hnbgw's per-ss7 state. */
+struct hnbgw_sccp_user {
+ /* entry in g_hnbgw->sccp.users */
+ struct llist_head entry;
+
+ /* logging context */
+ char *name;
+
+ /* Which 'cs7 instance' is this for? Below sccp_user is registered at the osmo_sccp_instance ss7->sccp. */
+ struct osmo_ss7_instance *ss7;
+
+ /* Local address: cs7 instance's primary PC if present, else the default HNBGW PC; with SSN == RANAP. */
+ struct osmo_sccp_addr local_addr;
+
+ /* osmo_sccp API state for above local address on above ss7 instance. */
+ struct osmo_sccp_user *sccp_user;
+
+ /* Fast access to the hnbgw_context_map responsible for a given SCCP conn_id of the ss7->sccp instance.
+ * hlist_node: hnbgw_context_map->hnbgw_sccp_user_entry. */
+ DECLARE_HASHTABLE(hnbgw_context_map_by_conn_id, 6);
+};
+
+#define LOG_HSI(HNBGW_SCCP_INST, SUBSYS, LEVEL, FMT, ARGS...) \
+ LOGP(SUBSYS, LEVEL, "(%s) " FMT, (HNBGW_SCCP_INST) ? (HNBGW_SCCP_INST)->name : "null", ##ARGS)
+
+struct hnbgw_sccp_user *hnbgw_sccp_user_alloc(const struct hnbgw_cnlink *cnlink, int ss7_inst_id);
diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am
index e108906..df2bb23 100644
--- a/src/osmo-hnbgw/Makefile.am
+++ b/src/osmo-hnbgw/Makefile.am
@@ -37,6 +37,7 @@
hnbgw_l3.c \
hnbgw_rua.c \
hnbgw_ranap.c \
+ hnbgw_sccp.c \
hnbgw_vty.c \
context_map.c \
context_map_rua.c \
diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c
index 49ae9ae..7b5c575 100644
--- a/src/osmo-hnbgw/hnbgw_cn.c
+++ b/src/osmo-hnbgw/hnbgw_cn.c
@@ -37,7 +37,7 @@
#include <osmocom/sigtran/sccp_helpers.h>
#include <osmocom/hnbgw/hnbgw.h>
-#include <osmocom/hnbgw/hnbgw_rua.h>
+#include <osmocom/hnbgw/hnbgw_sccp.h>
#include <osmocom/hnbgw/hnbgw_ranap.h>
#include <osmocom/hnbgw/hnbgw_cn.h>
#include <osmocom/hnbgw/context_map.h>
@@ -46,273 +46,6 @@
* Incoming primitives from SCCP User SAP
***********************************************************************/
-static struct hnbgw_cnlink *cnlink_from_addr(struct hnbgw_sccp_user *hsu, const struct osmo_sccp_addr *calling_addr,
- const struct osmo_prim_hdr *oph)
-{
- struct hnbgw_cnlink *cnlink = NULL;
- cnlink = hnbgw_cnlink_find_by_addr(hsu, calling_addr);
- if (!cnlink) {
- LOG_HSI(hsu, DRANAP, LOGL_ERROR, "Rx from unknown SCCP peer: %s: %s\n",
- osmo_sccp_inst_addr_name(osmo_ss7_get_sccp(hsu->ss7), calling_addr),
- osmo_scu_prim_hdr_name_c(OTC_SELECT, oph));
- return NULL;
- }
- return cnlink;
-}
-
-static struct hnbgw_context_map *map_from_conn_id(struct hnbgw_sccp_user *hsu, uint32_t conn_id,
- const struct osmo_prim_hdr *oph)
-{
- struct hnbgw_context_map *map;
- hash_for_each_possible(hsu->hnbgw_context_map_by_conn_id, map, hnbgw_sccp_user_entry, conn_id) {
- if (map->scu_conn_id == conn_id)
- return map;
- }
- LOGP(DRANAP, LOGL_ERROR, "Rx for unknown SCCP connection ID: %u: %s\n",
- conn_id, osmo_scu_prim_hdr_name_c(OTC_SELECT, oph));
- return NULL;
-}
-
-static int handle_cn_unitdata(struct hnbgw_sccp_user *hsu,
- const struct osmo_scu_unitdata_param *param,
- struct osmo_prim_hdr *oph)
-{
- struct hnbgw_cnlink *cnlink = cnlink_from_addr(hsu, ¶m->calling_addr, oph);
- if (!cnlink)
- return -ENOENT;
-
- if (param->called_addr.ssn != OSMO_SCCP_SSN_RANAP) {
- LOGP(DCN, LOGL_NOTICE, "N-UNITDATA.ind for unknown SSN %u\n",
- param->called_addr.ssn);
- return -1;
- }
-
- return hnbgw_ranap_rx_udt_dl(cnlink, param, msgb_l2(oph->msg), msgb_l2len(oph->msg));
-}
-
-static int handle_cn_conn_conf(struct hnbgw_sccp_user *hsu,
- const struct osmo_scu_connect_param *param,
- struct osmo_prim_hdr *oph)
-{
- struct hnbgw_context_map *map;
-
- map = map_from_conn_id(hsu, param->conn_id, oph);
- if (!map || !map->cnlink)
- return -ENOENT;
-
- LOGP(DCN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d, addrs: called=%s calling=%s responding=%s\n",
- param->conn_id,
- cnlink_sccp_addr_to_str(map->cnlink, ¶m->called_addr),
- cnlink_sccp_addr_to_str(map->cnlink, ¶m->calling_addr),
- cnlink_sccp_addr_to_str(map->cnlink, ¶m->responding_addr));
-
- map_sccp_dispatch(map, MAP_SCCP_EV_RX_CONNECTION_CONFIRM, oph->msg);
- return 0;
-}
-
-static int handle_cn_data_ind(struct hnbgw_sccp_user *hsu,
- const struct osmo_scu_data_param *param,
- struct osmo_prim_hdr *oph)
-{
- struct hnbgw_context_map *map;
-
- map = map_from_conn_id(hsu, param->conn_id, oph);
- if (!map || !map->cnlink)
- return -ENOENT;
-
- return map_sccp_dispatch(map, MAP_SCCP_EV_RX_DATA_INDICATION, oph->msg);
-}
-
-static int handle_cn_disc_ind(struct hnbgw_sccp_user *hsu,
- const struct osmo_scu_disconn_param *param,
- struct osmo_prim_hdr *oph)
-{
- struct hnbgw_context_map *map;
- char cause_buf[128];
-
- map = map_from_conn_id(hsu, param->conn_id, oph);
- if (!map || !map->cnlink)
- return -ENOENT;
-
- LOGP(DCN, LOGL_DEBUG, "handle_cn_disc_ind() conn_id=%u responding_addr=%s cause=%s\n",
- param->conn_id,
- cnlink_sccp_addr_to_str(map->cnlink, ¶m->responding_addr),
- osmo_sua_sccp_cause_name(param->cause, cause_buf, sizeof(cause_buf)));
-
- return map_sccp_dispatch(map, MAP_SCCP_EV_RX_RELEASED, oph->msg);
-}
-
-static struct hnbgw_cnlink *_cnlink_find_by_remote_pc(struct hnbgw_cnpool *cnpool, struct osmo_ss7_instance *cs7, uint32_t pc)
-{
- struct hnbgw_cnlink *cnlink;
- llist_for_each_entry(cnlink, &cnpool->cnlinks, entry) {
- if (!cnlink->hnbgw_sccp_user)
- continue;
- if (cnlink->hnbgw_sccp_user->ss7 != cs7)
- continue;
- if ((cnlink->remote_addr.presence & OSMO_SCCP_ADDR_T_PC) == 0)
- continue;
- if (cnlink->remote_addr.pc != pc)
- continue;
- return cnlink;
- }
- return NULL;
-}
-
-/* Find a cnlink by its remote sigtran point code on a given cs7 instance. */
-static struct hnbgw_cnlink *cnlink_find_by_remote_pc(struct osmo_ss7_instance *cs7, uint32_t pc)
-{
- struct hnbgw_cnlink *cnlink;
- cnlink = _cnlink_find_by_remote_pc(&g_hnbgw->sccp.cnpool_iucs, cs7, pc);
- if (!cnlink)
- cnlink = _cnlink_find_by_remote_pc(&g_hnbgw->sccp.cnpool_iups, cs7, pc);
- return cnlink;
-}
-
-static void handle_pcstate_ind(struct hnbgw_sccp_user *hsu, const struct osmo_scu_pcstate_param *pcst)
-{
- struct hnbgw_cnlink *cnlink;
- bool connected;
- bool disconnected;
- struct osmo_ss7_instance *cs7 = hsu->ss7;
-
- LOGP(DCN, LOGL_DEBUG, "N-PCSTATE ind: affected_pc=%u sp_status=%s remote_sccp_status=%s\n",
- pcst->affected_pc, osmo_sccp_sp_status_name(pcst->sp_status),
- osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status));
-
- /* If we don't care about that point-code, ignore PCSTATE. */
- cnlink = cnlink_find_by_remote_pc(cs7, pcst->affected_pc);
- if (!cnlink)
- return;
-
- /* See if this marks the point code to have become available, or to have been lost.
- *
- * I want to detect two events:
- * - connection event (both indicators say PC is reachable).
- * - disconnection event (at least one indicator says the PC is not reachable).
- *
- * There are two separate incoming indicators with various possible values -- the incoming events can be:
- *
- * - neither connection nor disconnection indicated -- just indicating congestion
- * connected == false, disconnected == false --> do nothing.
- * - both incoming values indicate that we are connected
- * --> trigger connected
- * - both indicate we are disconnected
- * --> trigger disconnected
- * - one value indicates 'connected', the other indicates 'disconnected'
- * --> trigger disconnected
- *
- * Congestion could imply that we're connected, but it does not indicate that a PC's reachability changed, so no need to
- * trigger on that.
- */
- connected = false;
- disconnected = false;
-
- switch (pcst->sp_status) {
- case OSMO_SCCP_SP_S_ACCESSIBLE:
- connected = true;
- break;
- case OSMO_SCCP_SP_S_INACCESSIBLE:
- disconnected = true;
- break;
- default:
- case OSMO_SCCP_SP_S_CONGESTED:
- /* Neither connecting nor disconnecting */
- break;
- }
-
- switch (pcst->remote_sccp_status) {
- case OSMO_SCCP_REM_SCCP_S_AVAILABLE:
- if (!disconnected)
- connected = true;
- break;
- case OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN:
- case OSMO_SCCP_REM_SCCP_S_UNEQUIPPED:
- case OSMO_SCCP_REM_SCCP_S_INACCESSIBLE:
- disconnected = true;
- connected = false;
- break;
- default:
- case OSMO_SCCP_REM_SCCP_S_CONGESTED:
- /* Neither connecting nor disconnecting */
- break;
- }
-
- if (disconnected && cnlink_is_conn_ready(cnlink)) {
- LOG_CNLINK(cnlink, DCN, LOGL_NOTICE,
- "now unreachable: N-PCSTATE ind: pc=%u sp_status=%s remote_sccp_status=%s\n",
- pcst->affected_pc,
- osmo_sccp_sp_status_name(pcst->sp_status),
- osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status));
- /* A previously usable cnlink has disconnected. Kick it back to DISC state. */
- cnlink_set_disconnected(cnlink);
- } else if (connected && !cnlink_is_conn_ready(cnlink)) {
- LOG_CNLINK(cnlink, DCN, LOGL_NOTICE,
- "now available: N-PCSTATE ind: pc=%u sp_status=%s remote_sccp_status=%s\n",
- pcst->affected_pc,
- osmo_sccp_sp_status_name(pcst->sp_status),
- osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status));
- /* A previously unusable cnlink has become reachable. Trigger immediate RANAP RESET -- we would resend a
- * RESET either way, but we might as well do it now to speed up connecting. */
- cnlink_resend_reset(cnlink);
- }
-}
-
-/* Entry point for primitives coming up from SCCP User SAP.
- * Ownership of oph->msg is transferred to us. */
-static int sccp_sap_up(struct osmo_prim_hdr *oph, void *ctx)
-{
- struct osmo_sccp_user *scu = ctx;
- struct hnbgw_sccp_user *hsu;
- struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph;
- int rc = 0;
-
- LOGP(DCN, LOGL_DEBUG, "sccp_sap_up(%s)\n", osmo_scu_prim_name(oph));
-
- if (!scu) {
- LOGP(DCN, LOGL_ERROR,
- "sccp_sap_up(): NULL osmo_sccp_user, cannot send prim (sap %u prim %u op %d)\n",
- oph->sap, oph->primitive, oph->operation);
- return -1;
- }
-
- hsu = osmo_sccp_user_get_priv(scu);
- if (!hsu) {
- LOGP(DCN, LOGL_ERROR,
- "sccp_sap_up(): NULL hnbgw_sccp_user, cannot send prim (sap %u prim %u op %d)\n",
- oph->sap, oph->primitive, oph->operation);
- return -1;
- }
-
- talloc_steal(OTC_SELECT, oph->msg);
-
- switch (OSMO_PRIM_HDR(oph)) {
- case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION):
- rc = handle_cn_unitdata(hsu, &prim->u.unitdata, oph);
- break;
- case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM):
- rc = handle_cn_conn_conf(hsu, &prim->u.connect, oph);
- break;
- case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION):
- rc = handle_cn_data_ind(hsu, &prim->u.data, oph);
- break;
- case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION):
- rc = handle_cn_disc_ind(hsu, &prim->u.disconnect, oph);
- break;
- case OSMO_PRIM(OSMO_SCU_PRIM_N_PCSTATE, PRIM_OP_INDICATION):
- handle_pcstate_ind(hsu, &prim->u.pcstate);
- break;
-
- default:
- LOGP(DCN, LOGL_ERROR,
- "Received unknown prim %u from SCCP USER SAP\n",
- OSMO_PRIM_HDR(oph));
- break;
- }
-
- return rc;
-}
-
static bool addr_has_pc_and_ssn(const struct osmo_sccp_addr *addr)
{
if (!(addr->presence & OSMO_SCCP_ADDR_T_SSN))
@@ -423,61 +156,6 @@
cnlink->name, cnlink->use.remote_addr_name ? : "(default remote point-code)");
}
-static struct hnbgw_sccp_user *hnbgw_sccp_user_alloc(const struct hnbgw_cnlink *cnlink, int ss7_id)
-{
- struct osmo_ss7_instance *ss7 = NULL;
- struct osmo_sccp_instance *sccp;
- struct osmo_sccp_user *sccp_user;
- uint32_t local_pc;
- struct hnbgw_sccp_user *hsu;
-
- sccp = osmo_sccp_simple_client_on_ss7_id(g_hnbgw,
- ss7_id,
- cnlink->name,
- DEFAULT_PC_HNBGW,
- OSMO_SS7_ASP_PROT_M3UA,
- 0,
- "localhost",
- -1,
- "localhost");
- if (!sccp) {
- LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "Failed to configure SCCP on 'cs7 instance %u'\n",
- ss7_id);
- return NULL;
- }
- ss7 = osmo_sccp_get_ss7(sccp);
- LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "created SCCP instance on cs7 instance %u\n", osmo_ss7_instance_get_id(ss7));
-
- /* Bind the SCCP user, using the cs7 instance's default point-code if one is configured, or osmo-hnbgw's default
- * local PC. */
- local_pc = osmo_ss7_instance_get_primary_pc(ss7);
- if (!osmo_ss7_pc_is_valid(local_pc))
- local_pc = DEFAULT_PC_HNBGW;
-
- LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "binding OsmoHNBGW user to cs7 instance %u, local PC %u = %s\n",
- osmo_ss7_instance_get_id(ss7), local_pc, osmo_ss7_pointcode_print(ss7, local_pc));
-
- sccp_user = osmo_sccp_user_bind_pc(sccp, "OsmoHNBGW", sccp_sap_up, OSMO_SCCP_SSN_RANAP, local_pc);
- if (!sccp_user) {
- LOGP(DCN, LOGL_ERROR, "Failed to init SCCP User\n");
- return NULL;
- }
-
- hsu = talloc_zero(cnlink, struct hnbgw_sccp_user);
- *hsu = (struct hnbgw_sccp_user){
- .name = talloc_asprintf(hsu, "cs7-%u.sccp", osmo_ss7_instance_get_id(ss7)),
- .ss7 = ss7,
- .sccp_user = sccp_user,
- };
- osmo_sccp_make_addr_pc_ssn(&hsu->local_addr, local_pc, OSMO_SCCP_SSN_RANAP);
- hash_init(hsu->hnbgw_context_map_by_conn_id);
- osmo_sccp_user_set_priv(sccp_user, hsu);
-
- llist_add_tail(&hsu->entry, &g_hnbgw->sccp.users);
-
- return hsu;
-}
-
/* If not present yet, set up all of osmo_ss7_instance, osmo_sccp_instance and hnbgw_sccp_user for the given cnlink.
* The cs7 instance nr to use is determined by cnlink->remote_addr_name, or cs7 instance 0 if that is not present.
* Set cnlink->hnbgw_sccp_user to the new SCCP instance. Return 0 on success, negative on error. */
@@ -581,30 +259,6 @@
return cnlink_alloc(cnpool, nr);
}
-static bool cnlink_matches(const struct hnbgw_cnlink *cnlink, const struct hnbgw_sccp_user *hsu, const struct osmo_sccp_addr *remote_addr)
-{
- if (cnlink->hnbgw_sccp_user != hsu)
- return false;
- if (osmo_sccp_addr_cmp(&cnlink->remote_addr, remote_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC))
- return false;
- return true;
-}
-
-struct hnbgw_cnlink *hnbgw_cnlink_find_by_addr(const struct hnbgw_sccp_user *hsu,
- const struct osmo_sccp_addr *remote_addr)
-{
- struct hnbgw_cnlink *cnlink;
- llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iucs.cnlinks, entry) {
- if (cnlink_matches(cnlink, hsu, remote_addr))
- return cnlink;
- }
- llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iups.cnlinks, entry) {
- if (cnlink_matches(cnlink, hsu, remote_addr))
- return cnlink;
- }
- return NULL;
-}
-
static bool is_cnlink_usable(struct hnbgw_cnlink *cnlink, bool is_emerg)
{
if (is_emerg && !cnlink->allow_emerg)
diff --git a/src/osmo-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c
new file mode 100644
index 0000000..8570f51
--- /dev/null
+++ b/src/osmo-hnbgw/hnbgw_sccp.c
@@ -0,0 +1,390 @@
+/* hnb-gw specific code for SCCP, ITU Q.711 - Q.714 */
+
+/* (C) 2015 by Harald Welte <laforge(a)gnumonks.org>
+ * (C) 2025 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved
+ *
+ * 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 <unistd.h>
+#include <errno.h>
+#include <string.h>
+
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/netif/stream.h>
+
+#include <osmocom/sigtran/sccp_sap.h>
+#include <osmocom/sigtran/sccp_helpers.h>
+#include <osmocom/sigtran/protocol/sua.h>
+
+#include <osmocom/hnbgw/hnbgw_cn.h>
+#include <osmocom/hnbgw/context_map.h>
+#include <osmocom/hnbgw/hnbgw_ranap.h>
+
+/***********************************************************************
+ * Incoming primitives from SCCP User SAP
+ ***********************************************************************/
+
+static bool cnlink_matches(const struct hnbgw_cnlink *cnlink, const struct hnbgw_sccp_user *hsu, const struct osmo_sccp_addr *remote_addr)
+{
+ if (cnlink->hnbgw_sccp_user != hsu)
+ return false;
+ if (osmo_sccp_addr_cmp(&cnlink->remote_addr, remote_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC))
+ return false;
+ return true;
+}
+
+static struct hnbgw_cnlink *hnbgw_cnlink_find_by_addr(const struct hnbgw_sccp_user *hsu,
+ const struct osmo_sccp_addr *remote_addr)
+{
+ struct hnbgw_cnlink *cnlink;
+ llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iucs.cnlinks, entry) {
+ if (cnlink_matches(cnlink, hsu, remote_addr))
+ return cnlink;
+ }
+ llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iups.cnlinks, entry) {
+ if (cnlink_matches(cnlink, hsu, remote_addr))
+ return cnlink;
+ }
+ return NULL;
+}
+
+static struct hnbgw_cnlink *cnlink_from_addr(struct hnbgw_sccp_user *hsu, const struct osmo_sccp_addr *calling_addr,
+ const struct osmo_prim_hdr *oph)
+{
+ struct hnbgw_cnlink *cnlink = NULL;
+ cnlink = hnbgw_cnlink_find_by_addr(hsu, calling_addr);
+ if (!cnlink) {
+ LOG_HSI(hsu, DRANAP, LOGL_ERROR, "Rx from unknown SCCP peer: %s: %s\n",
+ osmo_sccp_inst_addr_name(osmo_ss7_get_sccp(hsu->ss7), calling_addr),
+ osmo_scu_prim_hdr_name_c(OTC_SELECT, oph));
+ return NULL;
+ }
+ return cnlink;
+}
+
+static struct hnbgw_context_map *map_from_conn_id(struct hnbgw_sccp_user *hsu, uint32_t conn_id,
+ const struct osmo_prim_hdr *oph)
+{
+ struct hnbgw_context_map *map;
+ hash_for_each_possible(hsu->hnbgw_context_map_by_conn_id, map, hnbgw_sccp_user_entry, conn_id) {
+ if (map->scu_conn_id == conn_id)
+ return map;
+ }
+ LOGP(DRANAP, LOGL_ERROR, "Rx for unknown SCCP connection ID: %u: %s\n",
+ conn_id, osmo_scu_prim_hdr_name_c(OTC_SELECT, oph));
+ return NULL;
+}
+
+static int handle_cn_unitdata(struct hnbgw_sccp_user *hsu,
+ const struct osmo_scu_unitdata_param *param,
+ struct osmo_prim_hdr *oph)
+{
+ struct hnbgw_cnlink *cnlink = cnlink_from_addr(hsu, ¶m->calling_addr, oph);
+ if (!cnlink)
+ return -ENOENT;
+
+ if (param->called_addr.ssn != OSMO_SCCP_SSN_RANAP) {
+ LOGP(DCN, LOGL_NOTICE, "N-UNITDATA.ind for unknown SSN %u\n",
+ param->called_addr.ssn);
+ return -1;
+ }
+
+ return hnbgw_ranap_rx_udt_dl(cnlink, param, msgb_l2(oph->msg), msgb_l2len(oph->msg));
+}
+
+static int handle_cn_conn_conf(struct hnbgw_sccp_user *hsu,
+ const struct osmo_scu_connect_param *param,
+ struct osmo_prim_hdr *oph)
+{
+ struct hnbgw_context_map *map;
+
+ map = map_from_conn_id(hsu, param->conn_id, oph);
+ if (!map || !map->cnlink)
+ return -ENOENT;
+
+ LOGP(DCN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d, addrs: called=%s calling=%s responding=%s\n",
+ param->conn_id,
+ cnlink_sccp_addr_to_str(map->cnlink, ¶m->called_addr),
+ cnlink_sccp_addr_to_str(map->cnlink, ¶m->calling_addr),
+ cnlink_sccp_addr_to_str(map->cnlink, ¶m->responding_addr));
+
+ map_sccp_dispatch(map, MAP_SCCP_EV_RX_CONNECTION_CONFIRM, oph->msg);
+ return 0;
+}
+
+static int handle_cn_data_ind(struct hnbgw_sccp_user *hsu,
+ const struct osmo_scu_data_param *param,
+ struct osmo_prim_hdr *oph)
+{
+ struct hnbgw_context_map *map;
+
+ map = map_from_conn_id(hsu, param->conn_id, oph);
+ if (!map || !map->cnlink)
+ return -ENOENT;
+
+ return map_sccp_dispatch(map, MAP_SCCP_EV_RX_DATA_INDICATION, oph->msg);
+}
+
+static int handle_cn_disc_ind(struct hnbgw_sccp_user *hsu,
+ const struct osmo_scu_disconn_param *param,
+ struct osmo_prim_hdr *oph)
+{
+ struct hnbgw_context_map *map;
+ char cause_buf[128];
+
+ map = map_from_conn_id(hsu, param->conn_id, oph);
+ if (!map || !map->cnlink)
+ return -ENOENT;
+
+ LOGP(DCN, LOGL_DEBUG, "handle_cn_disc_ind() conn_id=%u responding_addr=%s cause=%s\n",
+ param->conn_id,
+ cnlink_sccp_addr_to_str(map->cnlink, ¶m->responding_addr),
+ osmo_sua_sccp_cause_name(param->cause, cause_buf, sizeof(cause_buf)));
+
+ return map_sccp_dispatch(map, MAP_SCCP_EV_RX_RELEASED, oph->msg);
+}
+
+static struct hnbgw_cnlink *_cnlink_find_by_remote_pc(struct hnbgw_cnpool *cnpool, struct osmo_ss7_instance *cs7, uint32_t pc)
+{
+ struct hnbgw_cnlink *cnlink;
+ llist_for_each_entry(cnlink, &cnpool->cnlinks, entry) {
+ if (!cnlink->hnbgw_sccp_user)
+ continue;
+ if (cnlink->hnbgw_sccp_user->ss7 != cs7)
+ continue;
+ if ((cnlink->remote_addr.presence & OSMO_SCCP_ADDR_T_PC) == 0)
+ continue;
+ if (cnlink->remote_addr.pc != pc)
+ continue;
+ return cnlink;
+ }
+ return NULL;
+}
+
+/* Find a cnlink by its remote sigtran point code on a given cs7 instance. */
+static struct hnbgw_cnlink *cnlink_find_by_remote_pc(struct osmo_ss7_instance *cs7, uint32_t pc)
+{
+ struct hnbgw_cnlink *cnlink;
+ cnlink = _cnlink_find_by_remote_pc(&g_hnbgw->sccp.cnpool_iucs, cs7, pc);
+ if (!cnlink)
+ cnlink = _cnlink_find_by_remote_pc(&g_hnbgw->sccp.cnpool_iups, cs7, pc);
+ return cnlink;
+}
+
+static void handle_pcstate_ind(struct hnbgw_sccp_user *hsu, const struct osmo_scu_pcstate_param *pcst)
+{
+ struct hnbgw_cnlink *cnlink;
+ bool connected;
+ bool disconnected;
+ struct osmo_ss7_instance *cs7 = hsu->ss7;
+
+ LOGP(DCN, LOGL_DEBUG, "N-PCSTATE ind: affected_pc=%u sp_status=%s remote_sccp_status=%s\n",
+ pcst->affected_pc, osmo_sccp_sp_status_name(pcst->sp_status),
+ osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status));
+
+ /* If we don't care about that point-code, ignore PCSTATE. */
+ cnlink = cnlink_find_by_remote_pc(cs7, pcst->affected_pc);
+ if (!cnlink)
+ return;
+
+ /* See if this marks the point code to have become available, or to have been lost.
+ *
+ * I want to detect two events:
+ * - connection event (both indicators say PC is reachable).
+ * - disconnection event (at least one indicator says the PC is not reachable).
+ *
+ * There are two separate incoming indicators with various possible values -- the incoming events can be:
+ *
+ * - neither connection nor disconnection indicated -- just indicating congestion
+ * connected == false, disconnected == false --> do nothing.
+ * - both incoming values indicate that we are connected
+ * --> trigger connected
+ * - both indicate we are disconnected
+ * --> trigger disconnected
+ * - one value indicates 'connected', the other indicates 'disconnected'
+ * --> trigger disconnected
+ *
+ * Congestion could imply that we're connected, but it does not indicate that a PC's reachability changed, so no need to
+ * trigger on that.
+ */
+ connected = false;
+ disconnected = false;
+
+ switch (pcst->sp_status) {
+ case OSMO_SCCP_SP_S_ACCESSIBLE:
+ connected = true;
+ break;
+ case OSMO_SCCP_SP_S_INACCESSIBLE:
+ disconnected = true;
+ break;
+ default:
+ case OSMO_SCCP_SP_S_CONGESTED:
+ /* Neither connecting nor disconnecting */
+ break;
+ }
+
+ switch (pcst->remote_sccp_status) {
+ case OSMO_SCCP_REM_SCCP_S_AVAILABLE:
+ if (!disconnected)
+ connected = true;
+ break;
+ case OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN:
+ case OSMO_SCCP_REM_SCCP_S_UNEQUIPPED:
+ case OSMO_SCCP_REM_SCCP_S_INACCESSIBLE:
+ disconnected = true;
+ connected = false;
+ break;
+ default:
+ case OSMO_SCCP_REM_SCCP_S_CONGESTED:
+ /* Neither connecting nor disconnecting */
+ break;
+ }
+
+ if (disconnected && cnlink_is_conn_ready(cnlink)) {
+ LOG_CNLINK(cnlink, DCN, LOGL_NOTICE,
+ "now unreachable: N-PCSTATE ind: pc=%u sp_status=%s remote_sccp_status=%s\n",
+ pcst->affected_pc,
+ osmo_sccp_sp_status_name(pcst->sp_status),
+ osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status));
+ /* A previously usable cnlink has disconnected. Kick it back to DISC state. */
+ cnlink_set_disconnected(cnlink);
+ } else if (connected && !cnlink_is_conn_ready(cnlink)) {
+ LOG_CNLINK(cnlink, DCN, LOGL_NOTICE,
+ "now available: N-PCSTATE ind: pc=%u sp_status=%s remote_sccp_status=%s\n",
+ pcst->affected_pc,
+ osmo_sccp_sp_status_name(pcst->sp_status),
+ osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status));
+ /* A previously unusable cnlink has become reachable. Trigger immediate RANAP RESET -- we would resend a
+ * RESET either way, but we might as well do it now to speed up connecting. */
+ cnlink_resend_reset(cnlink);
+ }
+}
+
+/* Entry point for primitives coming up from SCCP User SAP.
+ * Ownership of oph->msg is transferred to us. */
+static int sccp_sap_up(struct osmo_prim_hdr *oph, void *ctx)
+{
+ struct osmo_sccp_user *scu = ctx;
+ struct hnbgw_sccp_user *hsu;
+ struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph;
+ int rc = 0;
+
+ LOGP(DCN, LOGL_DEBUG, "sccp_sap_up(%s)\n", osmo_scu_prim_name(oph));
+
+ if (!scu) {
+ LOGP(DCN, LOGL_ERROR,
+ "sccp_sap_up(): NULL osmo_sccp_user, cannot send prim (sap %u prim %u op %d)\n",
+ oph->sap, oph->primitive, oph->operation);
+ return -1;
+ }
+
+ hsu = osmo_sccp_user_get_priv(scu);
+ if (!hsu) {
+ LOGP(DCN, LOGL_ERROR,
+ "sccp_sap_up(): NULL hnbgw_sccp_user, cannot send prim (sap %u prim %u op %d)\n",
+ oph->sap, oph->primitive, oph->operation);
+ return -1;
+ }
+
+ talloc_steal(OTC_SELECT, oph->msg);
+
+ switch (OSMO_PRIM_HDR(oph)) {
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION):
+ rc = handle_cn_unitdata(hsu, &prim->u.unitdata, oph);
+ break;
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM):
+ rc = handle_cn_conn_conf(hsu, &prim->u.connect, oph);
+ break;
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION):
+ rc = handle_cn_data_ind(hsu, &prim->u.data, oph);
+ break;
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION):
+ rc = handle_cn_disc_ind(hsu, &prim->u.disconnect, oph);
+ break;
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_PCSTATE, PRIM_OP_INDICATION):
+ handle_pcstate_ind(hsu, &prim->u.pcstate);
+ break;
+
+ default:
+ LOGP(DCN, LOGL_ERROR,
+ "Received unknown prim %u from SCCP USER SAP\n",
+ OSMO_PRIM_HDR(oph));
+ break;
+ }
+
+ return rc;
+}
+
+
+struct hnbgw_sccp_user *hnbgw_sccp_user_alloc(const struct hnbgw_cnlink *cnlink, int ss7_id)
+{
+ struct osmo_ss7_instance *ss7 = NULL;
+ struct osmo_sccp_instance *sccp;
+ struct osmo_sccp_user *sccp_user;
+ uint32_t local_pc;
+ struct hnbgw_sccp_user *hsu;
+
+ sccp = osmo_sccp_simple_client_on_ss7_id(g_hnbgw,
+ ss7_id,
+ cnlink->name,
+ DEFAULT_PC_HNBGW,
+ OSMO_SS7_ASP_PROT_M3UA,
+ 0,
+ "localhost",
+ -1,
+ "localhost");
+ if (!sccp) {
+ LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "Failed to configure SCCP on 'cs7 instance %u'\n",
+ ss7_id);
+ return NULL;
+ }
+ ss7 = osmo_sccp_get_ss7(sccp);
+ LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "created SCCP instance on cs7 instance %u\n", osmo_ss7_instance_get_id(ss7));
+
+ /* Bind the SCCP user, using the cs7 instance's default point-code if one is configured, or osmo-hnbgw's default
+ * local PC. */
+ local_pc = osmo_ss7_instance_get_primary_pc(ss7);
+ if (!osmo_ss7_pc_is_valid(local_pc))
+ local_pc = DEFAULT_PC_HNBGW;
+
+ LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "binding OsmoHNBGW user to cs7 instance %u, local PC %u = %s\n",
+ osmo_ss7_instance_get_id(ss7), local_pc, osmo_ss7_pointcode_print(ss7, local_pc));
+
+ sccp_user = osmo_sccp_user_bind_pc(sccp, "OsmoHNBGW", sccp_sap_up, OSMO_SCCP_SSN_RANAP, local_pc);
+ if (!sccp_user) {
+ LOGP(DCN, LOGL_ERROR, "Failed to init SCCP User\n");
+ return NULL;
+ }
+
+ hsu = talloc_zero(cnlink, struct hnbgw_sccp_user);
+ *hsu = (struct hnbgw_sccp_user){
+ .name = talloc_asprintf(hsu, "cs7-%u.sccp", osmo_ss7_instance_get_id(ss7)),
+ .ss7 = ss7,
+ .sccp_user = sccp_user,
+ };
+ osmo_sccp_make_addr_pc_ssn(&hsu->local_addr, local_pc, OSMO_SCCP_SSN_RANAP);
+ hash_init(hsu->hnbgw_context_map_by_conn_id);
+ osmo_sccp_user_set_priv(sccp_user, hsu);
+
+ llist_add_tail(&hsu->entry, &g_hnbgw->sccp.users);
+
+ return hsu;
+}
+
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40243?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: Idb45a25f7ff4bcd38ffd27bf1d3360b9d34149b3
Gerrit-Change-Number: 40243
Gerrit-PatchSet: 2
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 month, 2 weeks
- 1
- 0
[XL] Change in osmo-hnbgw[master]: Split hnb_context,hnb_persistent,umts_cell_id to their own files
by osmith
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40254?usp=email )
Change subject: Split hnb_context,hnb_persistent,umts_cell_id to their own files
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40254?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I4ff65d14f94d99a57316c2483c92244078bb5dd9
Gerrit-Change-Number: 40254
Gerrit-PatchSet: 2
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-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 May 2025 09:12:58 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
1 month, 2 weeks
- 1
- 0
[L] Change in osmo-hnbgw[master]: Move hnbgw_cnlink to cnlink.h and hnbgw_cnpool to hnbgw_cn.h
by osmith
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40253?usp=email )
Change subject: Move hnbgw_cnlink to cnlink.h and hnbgw_cnpool to hnbgw_cn.h
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40253?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I75988112cff6c8c17d2bdb166a0934934c523dfc
Gerrit-Change-Number: 40253
Gerrit-PatchSet: 1
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-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 May 2025 09:11:40 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
1 month, 2 weeks
- 1
- 0
[S] Change in osmo-hnbgw[master]: sccp: Introduce UL-related cnlink rate counters
by pespin
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40252?usp=email )
Change subject: sccp: Introduce UL-related cnlink rate counters
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40252?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I1878fcc8c265dc4d457332e16556d3ece769ea3e
Gerrit-Change-Number: 40252
Gerrit-PatchSet: 1
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>
Gerrit-Comment-Date: Thu, 08 May 2025 09:08:28 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
1 month, 2 weeks
- 1
- 0
[S] Change in osmo-hnbgw[master]: sccp: Introduce UL-related cnlink rate counters
by osmith
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40252?usp=email )
Change subject: sccp: Introduce UL-related cnlink rate counters
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40252?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I1878fcc8c265dc4d457332e16556d3ece769ea3e
Gerrit-Change-Number: 40252
Gerrit-PatchSet: 1
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-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 May 2025 09:07:05 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
1 month, 2 weeks
- 1
- 0
[M] Change in osmo-hnbgw[master]: sccp: Unify path submitting N-*.req
by pespin
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40251?usp=email )
Change subject: sccp: Unify path submitting N-*.req
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40251?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I37b414cf769a16b7c7f596df3bb91a6a91a06298
Gerrit-Change-Number: 40251
Gerrit-PatchSet: 1
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>
Gerrit-Comment-Date: Thu, 08 May 2025 09:06:21 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
1 month, 2 weeks
- 1
- 0