From f954bb7700f3cf7481a85db9d3340eeb4479ba92 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Tue, 3 Jul 2018 15:45:47 +0200
Subject: [PATCH] S1AP MME data: Pass and store Broadcast PLMN index
---
openair3/S1AP/s1ap_eNB.c | 11 +++++++++--
openair3/S1AP/s1ap_eNB_defs.h | 5 +++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/openair3/S1AP/s1ap_eNB.c b/openair3/S1AP/s1ap_eNB.c
index 6e9e6522d1..2ae2733cab 100644
--- a/openair3/S1AP/s1ap_eNB.c
+++ b/openair3/S1AP/s1ap_eNB.c
@@ -97,7 +97,9 @@ static void s1ap_eNB_register_mme(s1ap_eNB_instance_t *instance_p,
net_ip_address_t *mme_ip_address,
net_ip_address_t *local_ip_addr,
uint16_t in_streams,
- uint16_t out_streams)
+ uint16_t out_streams,
+ uint8_t broadcast_plmn_num,
+ uint8_t broadcast_plmn_index[PLMN_LIST_MAX_SIZE])
{
MessageDef *message_p = NULL;
sctp_new_association_req_t *sctp_new_association_req_p = NULL;
@@ -139,6 +141,9 @@ static void s1ap_eNB_register_mme(s1ap_eNB_instance_t *instance_p,
sctp_new_association_req_p->ulp_cnx_id = s1ap_mme_data_p->cnx_id;
s1ap_mme_data_p->assoc_id = -1;
+ s1ap_mme_data_p->broadcast_plmn_num = broadcast_plmn_num;
+ for (int i = 0; i < broadcast_plmn_num; ++i)
+ s1ap_mme_data_p->broadcast_plmn_index[i] = broadcast_plmn_index[i];
s1ap_mme_data_p->s1ap_eNB_instance = instance_p;
STAILQ_INIT(&s1ap_mme_data_p->served_gummei);
@@ -239,7 +244,9 @@ void s1ap_eNB_handle_register_eNB(instance_t instance, s1ap_register_enb_req_t *
&s1ap_register_eNB->mme_ip_address[index],
&s1ap_register_eNB->enb_ip_address,
s1ap_register_eNB->sctp_in_streams,
- s1ap_register_eNB->sctp_out_streams);
+ s1ap_register_eNB->sctp_out_streams,
+ s1ap_register_eNB->broadcast_plmn_num[index],
+ s1ap_register_eNB->broadcast_plmn_index[index]);
}
}
diff --git a/openair3/S1AP/s1ap_eNB_defs.h b/openair3/S1AP/s1ap_eNB_defs.h
index 75ea27f635..5bffa0df0c 100644
--- a/openair3/S1AP/s1ap_eNB_defs.h
+++ b/openair3/S1AP/s1ap_eNB_defs.h
@@ -154,6 +154,11 @@ typedef struct s1ap_eNB_mme_data_s {
/* SCTP association id */
int32_t assoc_id;
+ /* This is served PLMN IDs communicated to the MME via an index over the
+ * MCC/MNC array in s1ap_eNB_instance */
+ uint8_t broadcast_plmn_num;
+ uint8_t broadcast_plmn_index[PLMN_LIST_MAX_SIZE];
+
/* Only meaningfull in virtual mode */
struct s1ap_eNB_instance_s *s1ap_eNB_instance;
} s1ap_eNB_mme_data_t;
--
GitLab