Modified code to port s1ap_state

Signed-off-by: Rashmi <[email protected]>

Author: rsarwad

lte/gateway/c/core/oai/include/s1ap_state.hpp

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include "lte/gateway/c/core/oai/include/s1ap_types.hpp"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -26,18 +25,20 @@ extern "C" {
 }
 #endif
 
+#include "lte/gateway/c/core/oai/include/s1ap_types.hpp"
+#include "lte/protos/oai/s1ap_state.pb.h"
 namespace magma {
 namespace lte {
 
 int s1ap_state_init(uint32_t max_ues, uint32_t max_enbs, bool use_stateless);
 
 void s1ap_state_exit(void);
 
-s1ap_state_t* get_s1ap_state(bool read_from_db);
+oai::S1apState* get_s1ap_state(bool read_from_db);
 
 void put_s1ap_state(void);
 
-magma::lte::oai::EnbDescription* s1ap_state_get_enb(s1ap_state_t* state,
+magma::lte::oai::EnbDescription* s1ap_state_get_enb(oai::S1apState* state,
                                                     sctp_assoc_id_t assoc_id);
 
 oai::UeDescription* s1ap_state_get_ue_enbid(
@@ -88,7 +89,7 @@ bool s1ap_ue_compare_by_imsi(__attribute__((unused)) uint64_t keyP,
 void remove_ues_without_imsi_from_ue_id_coll(void);
 
 void clean_stale_enb_state(
-    s1ap_state_t* state, oai::EnbDescription* new_enb_association);
+    oai::S1apState* state, oai::EnbDescription* new_enb_association);
 
 }  // namespace lte
 }  // namespace magma

lte/gateway/c/core/oai/tasks/grpc_service/S1apServiceImpl.cpp

@@ -44,7 +44,7 @@ Status S1apServiceImpl::GetENBState(ServerContext* context, const Void* request,
   // Get state from S1APStateManager
   // TODO: Get state through ITTI message from S1AP task, as it's read only
   // it will not affect ownership
-  s1ap_state_t* s1ap_state = get_s1ap_state(false);
+  oai::S1apState* s1ap_state = get_s1ap_state(false);
   if (s1ap_state != nullptr) {
     if (!(s1ap_state->enbs.size())) {
       return Status::OK;

lte/gateway/c/core/oai/tasks/ha/ha_service_handler.cpp

@@ -73,7 +73,7 @@ bool sync_up_with_orc8r(void) {
 }
 
 typedef struct callback_data_s {
-  s1ap_state_t* s1ap_state;
+  S1apState* s1ap_state;
   ha_agw_offload_req_t* request;
 } callback_data_t;
 
@@ -94,7 +94,7 @@ bool trigger_agw_offload_for_ue(const hash_key_t keyP, void* const elementP,
   callback_data_t* callback_data = (callback_data_t*)parameterP;
   ha_agw_offload_req_t* offload_request =
       (ha_agw_offload_req_t*)callback_data->request;
-  s1ap_state_t* s1ap_state = (s1ap_state_t*)callback_data->s1ap_state;
+  S1apState* s1ap_state = (S1apState*)callback_data->s1ap_state;
   struct ue_mm_context_s* ue_context_p = (struct ue_mm_context_s*)elementP;
   bool any_flag = false;  // true if we tried offloading any UE
 

lte/gateway/c/core/oai/tasks/s1ap/s1ap_common.hpp

@@ -429,7 +429,7 @@ extern int asn1_xer_print;
 
 /** \brief Function callback prototype.
  **/
-typedef status_code_e (*s1ap_message_handler_t)(s1ap_state_t* state,
+typedef status_code_e (*s1ap_message_handler_t)(S1apState* state,
                                                 const sctp_assoc_id_t assoc_id,
                                                 const sctp_stream_id_t stream,
                                                 S1ap_S1AP_PDU_t* pdu);

lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme.cpp

@@ -105,10 +105,9 @@ static int s1ap_send_init_sctp(void) {
 }
 
 static int handle_message(zloop_t* loop, zsock_t* reader, void* arg) {
-  s1ap_state_t* state;
   MessageDef* received_message_p = receive_msg(reader);
   imsi64_t imsi64 = itti_get_associated_imsi(received_message_p);
-  state = get_s1ap_state(false);
+  S1apState* state = get_s1ap_state(false);
   AssertFatal(state != NULL, "failed to retrieve s1ap state (was null)");
 
   bool is_task_state_same = false;
@@ -400,7 +399,7 @@ oai::EnbDescription* s1ap_new_enb(void) {
 }
 
 //------------------------------------------------------------------------------
-oai::UeDescription* s1ap_new_ue(s1ap_state_t* state,
+oai::UeDescription* s1ap_new_ue(S1apState* state,
                                 const sctp_assoc_id_t sctp_assoc_id,
                                 enb_ue_s1ap_id_t enb_ue_s1ap_id) {
   oai::EnbDescription* enb_ref = NULL;
@@ -446,7 +445,7 @@ oai::UeDescription* s1ap_new_ue(s1ap_state_t* state,
 }
 
 //------------------------------------------------------------------------------
-void s1ap_remove_ue(s1ap_state_t* state, oai::UeDescription* ue_ref) {
+void s1ap_remove_ue(S1apState* state, oai::UeDescription* ue_ref) {
   oai::EnbDescription* enb_ref = NULL;
 
   // NULL reference...
@@ -476,7 +475,10 @@ void s1ap_remove_ue(s1ap_state_t* state, oai::UeDescription* ue_ref) {
     return;
   }
   s1ap_ue_state->remove(ue_ref->comp_s1ap_id());
-  state->mmeid2associd.remove(mme_ue_s1ap_id);
+  proto_map_uint32_uint32_t mmeid2associd_map.map =
+      state->mutable_mmeid2associd();
+  mmeid2associd_map.remove(mme_ue_s1ap_id);
+
   magma::proto_map_uint32_uint64_t ue_id_coll;
   ue_id_coll.map = enb_ref->mutable_ue_id_map();
   ue_id_coll.remove(mme_ue_s1ap_id);
@@ -494,7 +496,7 @@ void s1ap_remove_ue(s1ap_state_t* state, oai::UeDescription* ue_ref) {
       OAILOG_INFO(LOG_S1AP, "Moving eNB state to S1AP_INIT \n");
       enb_ref->set_s1_state(magma::lte::oai::S1AP_INIT);
       set_gauge("s1_connection", 0, 1, "enb_name", enb_ref->enb_name());
-      state->num_enbs--;
+      state->set_num_enbs(state->num_enbs() - 1);
     } else if (enb_ref->s1_enb_state() == magma::lte::oai::S1AP_SHUTDOWN) {
       OAILOG_INFO(LOG_S1AP, "Deleting eNB \n");
       set_gauge("s1_connection", 0, 1, "enb_name", enb_ref->enb_name());
@@ -504,25 +506,27 @@ void s1ap_remove_ue(s1ap_state_t* state, oai::UeDescription* ue_ref) {
 }
 
 //------------------------------------------------------------------------------
-void s1ap_remove_enb(s1ap_state_t* state, oai::EnbDescription* enb_ref) {
+void s1ap_remove_enb(S1apState* state, oai::EnbDescription* enb_ref) {
   if (enb_ref == NULL) {
     return;
   }
   magma::proto_map_uint32_uint64_t ue_id_coll;
+  map_uint32_enb_description_t enb_map;
   enb_ref->set_s1_state(magma::lte::oai::S1AP_INIT);
 
   ue_id_coll.map = enb_ref->mutable_ue_id_map();
   ue_id_coll.clear();
   OAILOG_INFO(LOG_S1AP, "Deleting eNB on assoc_id :%u\n",
               enb_ref->sctp_assoc_id());
-  state->enbs.remove(enb_ref->sctp_assoc_id());
-  state->num_enbs--;
+  enb_map.map = state->mutable_enbs();
+  enb_map.remove(enb_ref->sctp_assoc_id());
+  state->set_num_enbs(state->num_enbs() - 1);
 }
 
 static int handle_stats_timer(zloop_t* loop, int id, void* arg) {
-  s1ap_state_t* s1ap_state_p = get_s1ap_state(false);
+  S1apState* s1ap_state_p = get_s1ap_state(false);
   application_s1ap_stats_msg_t stats_msg;
-  stats_msg.nb_enb_connected = s1ap_state_p->num_enbs;
+  stats_msg.nb_enb_connected = s1ap_state_p->num_enbs();
   stats_msg.nb_s1ap_last_msg_latency = s1ap_last_msg_latency;
   return send_s1ap_stats_to_service303(&s1ap_task_zmq_ctx, TASK_S1AP,
                                        &stats_msg);

lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme.hpp

@@ -60,21 +60,21 @@ magma::lte::oai::EnbDescription* s1ap_new_enb(void);
  * \param enb_ue_s1ap_id ue ID over S1AP
  * @returns Reference to the new UE element in list
  **/
-oai::UeDescription* s1ap_new_ue(s1ap_state_t* state,
+oai::UeDescription* s1ap_new_ue(S1apState* state,
                                             sctp_assoc_id_t sctp_assoc_id,
                                             enb_ue_s1ap_id_t enb_ue_s1ap_id);
 
 /** \brief Remove target UE from the list
  * \param ue_ref UE structure reference to remove
  **/
-void s1ap_remove_ue(s1ap_state_t* state,
+void s1ap_remove_ue(S1apState* state,
                     oai::UeDescription* ue_ref);
 
 /** \brief Remove target eNB from the list and remove any UE associated
  * \param enb_ref eNB structure reference to remove
  **/
-void s1ap_remove_enb(s1ap_state_t* state,
-                     magma::lte::oai::EnbDescription* enb_ref);
+void s1ap_remove_enb(S1apState* state,
+                     oai::EnbDescription* enb_ref);
 
 void free_enb_description(void** ptr);