11191 move ue context

lte/gateway/c/core/oai/common/itti_free_defined_msg.c

@@ -221,6 +221,15 @@ void itti_free_msg_content(MessageDef* const message_p) {
       bdestroy_wrapper(
           &message_p->ittiMsg.s1ap_handover_request_ack.tgt_src_container);
       break;
+    case S1AP_HANDOVER_NOTIFY: {
+      e_rab_admitted_list_t e_rab_admitted_list = {0};
+      e_rab_admitted_list =
+          message_p->ittiMsg.s1ap_handover_notify.e_rab_admitted_list;
+      for (int idx = 0; idx < e_rab_admitted_list.no_of_items; idx++) {
+        bdestroy_wrapper(
+            &e_rab_admitted_list.item[idx].transport_layer_address);
+      }
+    } break;
     case S6A_UPDATE_LOCATION_REQ:
     case S6A_UPDATE_LOCATION_ANS:
     case S6A_AUTH_INFO_REQ:

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

@@ -28,19 +28,23 @@ int s1ap_state_init(uint32_t max_ues, uint32_t max_enbs, bool use_stateless);
 
 void s1ap_state_exit(void);
 
+#ifdef __cplusplus
+}
+#endif
 s1ap_state_t* get_s1ap_state(bool read_from_db);
 
 void put_s1ap_state(void);
 
 enb_description_t* s1ap_state_get_enb(s1ap_state_t* state,
                                       sctp_assoc_id_t assoc_id);
 
-ue_description_t* s1ap_state_get_ue_enbid(sctp_assoc_id_t sctp_assoc_id,
-                                          enb_ue_s1ap_id_t enb_ue_s1ap_id);
+magma::lte::oai::UeDescription* s1ap_state_get_ue_enbid(
+    sctp_assoc_id_t sctp_assoc_id, enb_ue_s1ap_id_t enb_ue_s1ap_id);
 
-ue_description_t* s1ap_state_get_ue_mmeid(mme_ue_s1ap_id_t mme_ue_s1ap_id);
+magma::lte::oai::UeDescription* s1ap_state_get_ue_mmeid(
+    mme_ue_s1ap_id_t mme_ue_s1ap_id);
 
-ue_description_t* s1ap_state_get_ue_imsi(imsi64_t imsi64);
+magma::lte::oai::UeDescription* s1ap_state_get_ue_imsi(imsi64_t imsi64);
 
 /**
  * Return unique composite id for S1AP UE context
@@ -65,22 +69,19 @@ map_uint64_ue_description_t* get_s1ap_ue_state(void);
 
 int read_s1ap_ue_state_db(void);
 
+void remove_ues_without_imsi_from_ue_id_coll(void);
+
+void clean_stale_enb_state(s1ap_state_t* state,
+                           enb_description_t* new_enb_association);
+
 void put_s1ap_ue_state(imsi64_t imsi64);
 
 void delete_s1ap_ue_state(imsi64_t imsi64);
 
 bool s1ap_ue_compare_by_mme_ue_id_cb(__attribute__((unused)) uint64_t keyP,
-                                     struct ue_description_s* elementP, void* parameterP,
-                                     void** resultP);
+                                     magma::lte::oai::UeDescription* elementP,
+                                     void* parameterP, void** resultP);
 
 bool s1ap_ue_compare_by_imsi(__attribute__((unused)) uint64_t keyP,
-                            struct  ue_description_s* elementP, void* parameterP, void** resultP);
-
-void remove_ues_without_imsi_from_ue_id_coll(void);
-
-void clean_stale_enb_state(s1ap_state_t* state,
-                           enb_description_t* new_enb_association);
-
-#ifdef __cplusplus
-}
-#endif
+                             magma::lte::oai::UeDescription* elementP,
+                             void* parameterP, void** resultP);

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

@@ -29,6 +29,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
+#include "lte/protos/oai/s1ap_state.pb.h"
 
 // Forward declarations
 struct enb_description_s;
@@ -53,18 +54,6 @@ typedef struct s1ap_imsi_map_s {
   magma::proto_map_uint32_uint64_t mme_ueid2imsi_map;
 } s1ap_imsi_map_t;
 
-enum s1_timer_class_s {
-  S1AP_INVALID_TIMER_CLASS,
-  S1AP_ENB_TIMER,
-  S1AP_UE_TIMER
-};
-
-/* Timer structure */
-struct s1ap_timer_t {
-  long id;   /* The timer identifier                 */
-  long msec; /* The timer interval value in seconds  */
-};
-
 // The current s1 state of the MME relating to the specific eNB.
 enum mme_s1_enb_state_s {
   S1AP_INIT,  /// The sctp association has been established but s1 hasn't been
@@ -75,63 +64,8 @@ enum mme_s1_enb_state_s {
   S1AP_SHUTDOWN   /// The S1 state is being torn down due to sctp shutdown.
 };
 
-enum s1_ue_state_s {
-  S1AP_UE_INVALID_STATE,
-  S1AP_UE_WAITING_CSR,  ///< Waiting for Initial Context Setup Response
-  S1AP_UE_HANDOVER,     ///< Handover procedure triggered
-  S1AP_UE_CONNECTED,    ///< UE context ready
-  S1AP_UE_WAITING_CRR,  /// UE Context release Procedure initiated , waiting for
-                        /// UE context Release Complete
-};
-
-typedef struct s1ap_handover_state_s {
-  mme_ue_s1ap_id_t mme_ue_s1ap_id;
-  uint32_t source_enb_id;
-  uint32_t target_enb_id;
-  enb_ue_s1ap_id_t source_enb_ue_s1ap_id : 24;
-  enb_ue_s1ap_id_t target_enb_ue_s1ap_id : 24;
-  sctp_stream_id_t source_sctp_stream_recv;  ///< source eNB -> MME stream
-  sctp_stream_id_t target_sctp_stream_recv;  ///< target eNB -> MME stream
-  sctp_stream_id_t source_sctp_stream_send;  ///< MME -> source eNB stream
-  sctp_stream_id_t target_sctp_stream_send;  ///< MME -> target eNB stream
-  e_rab_admitted_list_t e_rab_admitted_list;
-} s1ap_handover_state_t;
-
-/** Main structure representing UE association over s1ap
- *  Generated every time a new InitialUEMessage is received
- **/
-typedef struct ue_description_s {
-  enum s1_ue_state_s s1_ue_state;  ///< S1AP UE state
-
-  enb_ue_s1ap_id_t
-      enb_ue_s1ap_id : 24;          ///< Unique UE id over eNB (24 bits wide)
-  mme_ue_s1ap_id_t mme_ue_s1ap_id;  ///< Unique UE id over MME (32 bits wide)
-  sctp_assoc_id_t sctp_assoc_id;  ///< Assoc id of eNB which this UE is attached
-  uint64_t comp_s1ap_id;          ///< Unique composite UE id (sctp_assoc_id &
-                                  ///< enb_ue_s1ap_id)
-
-  /** SCTP stream on which S1 message will be sent/received.
-   *  During an UE S1 connection, a pair of streams is
-   *  allocated and is used during all the connection.
-   *  Stream 0 is reserved for non UE signalling.
-   *  @name sctp stream identifier
-   **/
-  /*@{*/
-  sctp_stream_id_t sctp_stream_recv;  ///< eNB -> MME stream
-  sctp_stream_id_t sctp_stream_send;  ///< MME -> eNB stream
-  /*@}*/
-
-  // UE Context Release procedure guard timer
-  struct s1ap_timer_t s1ap_ue_context_rel_timer;
-
-  // Handover status. We intentionally do not persist all of this state since
-  // it's time sensitive; if the MME restarts during a HO procedure the RAN
-  // will abort the procedure due to timeouts, rendering this state useless.
-  s1ap_handover_state_t s1ap_handover_state;
-} ue_description_t;
-
-// Map- Key:uint64_t, Data:ue_description_s*
-typedef magma::proto_map_s<uint64_t, struct ue_description_s*>
+// Map- Key:uint64_t, Data: pointer to protobuf object, UeDescription
+typedef magma::proto_map_s<uint64_t, magma::lte::oai::UeDescription*>
     map_uint64_ue_description_t;
 
 /* Maximum no. of Broadcast PLMNs. Value is 6

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

@@ -244,25 +244,26 @@ class StateConverter {
 
   template <typename state_map_t, typename proto_map_t>
   static void copy_int_protomap_to_proto(state_map_t state_map,
-                                               proto_map_t* proto_map) {
-    for (auto elm = state_map.map->begin(); elm != state_map.map->end(); ++elm) {
+                                         proto_map_t* proto_map) {
+    for (auto elm = state_map.map->begin(); elm != state_map.map->end();
+         ++elm) {
       (*proto_map)[elm->first] = elm->second;
     }
   }
 
   template <typename proto_map_t, typename state_map_t>
-  static void copy_int_protomap_to_state(const proto_map_t &proto_map, state_map_t state_map){
-  for (auto const& kv : proto_map) {
-    proto_map_rc_t rc =
-        state_map.insert(kv.first, kv.second);
-    if (rc != PROTO_MAP_OK) {
-      OAILOG_ERROR(LOG_UTIL,
-                   "Failed to insert value %lu in table %s: error: %s\n", kv.second,
-                   state_map.get_name(),magma::map_rc_code2string(rc));
+  static void copy_int_protomap_to_state(const proto_map_t& proto_map,
+                                         state_map_t state_map) {
+    for (auto const& kv : proto_map) {
+      proto_map_rc_t rc = state_map.insert(kv.first, kv.second);
+      if (rc != PROTO_MAP_OK) {
+        OAILOG_ERROR(
+            LOG_UTIL, "Failed to insert value %lu in table %s: error: %s\n",
+            kv.second, state_map.get_name(), magma::map_rc_code2string(rc));
+      }
     }
   }
 
-}
  private:
   static void plmn_to_chars(const plmn_t& state_plmn, char* plmn_array);
   static void chars_to_plmn(const char* plmn_array, plmn_t* state_plmn);

lte/gateway/c/core/oai/tasks/grpc_service/CMakeLists.txt

@@ -53,8 +53,8 @@ generate_grpc_protos("${SMOSRV_LTE_GRPC_PROTOS}" "${PROTO_SRCS}"
     "${PROTO_HDRS}" ${LTE_PROTO_DIR} ${LTE_OUT_DIR})
 
 # S1ap Service
-set(S1APSRV_LTE_CPP_PROTOS s1ap_service)
-set(S1APSRV_LTE_GRPC_PROTOS s1ap_service)
+set(S1APSRV_LTE_CPP_PROTOS s1ap_service oai/s1ap_state)
+set(S1APSRV_LTE_GRPC_PROTOS s1ap_service oai/s1ap_state)
 generate_cpp_protos("${S1APSRV_LTE_CPP_PROTOS}" "${PROTO_SRCS}"
     "${PROTO_HDRS}" ${LTE_PROTO_DIR} ${LTE_OUT_DIR})
 generate_grpc_protos("${S1APSRV_LTE_GRPC_PROTOS}" "${PROTO_SRCS}"

lte/gateway/c/core/oai/tasks/mme_app/mme_app_bearer.c

@@ -3703,10 +3703,8 @@ void mme_app_handle_handover_notify(
             "Id: " MME_UE_S1AP_ID_FMT " (4 or 16 bytes was expected)\n",
             blength(e_rab_admitted_list.item[i].transport_layer_address),
             handover_notify_p->mme_ue_s1ap_id);
-        bdestroy_wrapper(&e_rab_admitted_list.item[i].transport_layer_address);
         OAILOG_FUNC_OUT(LOG_MME_APP);
       }
-      bdestroy_wrapper(&e_rab_admitted_list.item[i].transport_layer_address);
       s11_modify_bearer_request->bearer_contexts_to_be_modified
           .num_bearer_context++;
 

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

@@ -70,6 +70,7 @@ bool s1ap_congestion_control_enabled = true;
 long s1ap_last_msg_latency = 0;
 long s1ap_zmq_th = LONG_MAX;
 
+using magma::lte::oai::UeDescription;
 //------------------------------------------------------------------------------
 static int s1ap_send_init_sctp(void) {
   // Create and alloc new message
@@ -395,32 +396,33 @@ enb_description_t* s1ap_new_enb(void) {
 }
 
 //------------------------------------------------------------------------------
-ue_description_t* s1ap_new_ue(s1ap_state_t* state,
-                              const sctp_assoc_id_t sctp_assoc_id,
-                              enb_ue_s1ap_id_t enb_ue_s1ap_id) {
+UeDescription* s1ap_new_ue(s1ap_state_t* state,
+                           const sctp_assoc_id_t sctp_assoc_id,
+                           enb_ue_s1ap_id_t enb_ue_s1ap_id) {
   enb_description_t* enb_ref = NULL;
-  ue_description_t* ue_ref = NULL;
+  UeDescription* ue_ref = nullptr;
 
   enb_ref = s1ap_state_get_enb(state, sctp_assoc_id);
   DevAssert(enb_ref != NULL);
-  ue_ref = new ue_description_t();
+  ue_ref = new UeDescription();
   /*
    * Something bad happened during malloc...
    * * * * May be we are running out of memory.
    * * * * TODO: Notify eNB with a cause like Hardware Failure.
    */
-  if (ue_ref == NULL) {
-    OAILOG_ERROR(LOG_S1AP, "Failed to allocate memory for ue context");
+  if (ue_ref == nullptr) {
+    OAILOG_ERROR(LOG_S1AP,
+                 "Failed to allocate memory for protobuf object UeDescription");
     return NULL;
   }
-  ue_ref->sctp_assoc_id = sctp_assoc_id;
-  ue_ref->enb_ue_s1ap_id = enb_ue_s1ap_id;
-  ue_ref->comp_s1ap_id =
-      S1AP_GENERATE_COMP_S1AP_ID(sctp_assoc_id, enb_ue_s1ap_id);
+  ue_ref->set_sctp_assoc_id(sctp_assoc_id);
+  ue_ref->set_enb_ue_s1ap_id(enb_ue_s1ap_id);
+  ue_ref->set_comp_s1ap_id(
+      S1AP_GENERATE_COMP_S1AP_ID(sctp_assoc_id, enb_ue_s1ap_id));
 
   map_uint64_ue_description_t* s1ap_ue_state = get_s1ap_ue_state();
   magma::proto_map_rc_t rc =
-      s1ap_ue_state->insert(ue_ref->comp_s1ap_id, ue_ref);
+      s1ap_ue_state->insert(ue_ref->comp_s1ap_id(), ue_ref);
 
   if (magma::PROTO_MAP_OK != rc) {
     OAILOG_ERROR(LOG_S1AP, "Could not insert UE descr in ue_coll: %s\n",
@@ -436,31 +438,32 @@ ue_description_t* s1ap_new_ue(s1ap_state_t* state,
 }
 
 //------------------------------------------------------------------------------
-void s1ap_remove_ue(s1ap_state_t* state, ue_description_t* ue_ref) {
+void s1ap_remove_ue(s1ap_state_t* state, UeDescription* ue_ref) {
   enb_description_t* enb_ref = NULL;
 
   // NULL reference...
   if (ue_ref == NULL) return;
 
-  mme_ue_s1ap_id_t mme_ue_s1ap_id = ue_ref->mme_ue_s1ap_id;
-  enb_ref = s1ap_state_get_enb(state, ue_ref->sctp_assoc_id);
+  mme_ue_s1ap_id_t mme_ue_s1ap_id = ue_ref->mme_ue_s1ap_id();
+  enb_ref = s1ap_state_get_enb(state, ue_ref->sctp_assoc_id());
   DevAssert(enb_ref->nb_ue_associated > 0);
   // Updating number of UE
   enb_ref->nb_ue_associated--;
 
   OAILOG_TRACE(LOG_S1AP,
                "Removing UE enb_ue_s1ap_id: " ENB_UE_S1AP_ID_FMT
                " mme_ue_s1ap_id:" MME_UE_S1AP_ID_FMT " in eNB id : %d\n",
-               ue_ref->enb_ue_s1ap_id, ue_ref->mme_ue_s1ap_id, enb_ref->enb_id);
+               ue_ref->enb_ue_s1ap_id(), ue_ref->mme_ue_s1ap_id(),
+               enb_ref->enb_id);
 
-  ue_ref->s1_ue_state = S1AP_UE_INVALID_STATE;
-  if (ue_ref->s1ap_ue_context_rel_timer.id != S1AP_TIMER_INACTIVE_ID) {
-    s1ap_stop_timer(ue_ref->s1ap_ue_context_rel_timer.id);
-    ue_ref->s1ap_ue_context_rel_timer.id = S1AP_TIMER_INACTIVE_ID;
+  ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_INVALID_STATE);
+  if (ue_ref->s1ap_ue_context_rel_timer().id() != S1AP_TIMER_INACTIVE_ID) {
+    s1ap_stop_timer(ue_ref->s1ap_ue_context_rel_timer().id());
+    ue_ref->mutable_s1ap_ue_context_rel_timer()->set_id(S1AP_TIMER_INACTIVE_ID);
   }
 
   map_uint64_ue_description_t* s1ap_ue_state = get_s1ap_ue_state();
-  s1ap_ue_state->remove(ue_ref->comp_s1ap_id);
+  s1ap_ue_state->remove(ue_ref->comp_s1ap_id());
   state->mmeid2associd.remove(mme_ue_s1ap_id);
   enb_ref->ue_id_coll.remove(mme_ue_s1ap_id);
 

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

@@ -25,6 +25,7 @@
 #pragma once
 #include "lte/gateway/c/core/oai/include/s1ap_state.hpp"
 #include "lte/gateway/c/core/oai/include/s1ap_types.hpp"
+#include "lte/protos/oai/s1ap_state.pb.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -37,6 +38,9 @@ extern "C" {
 #define S1AP_ZMQ_LATENCY_TH \
   s1ap_zmq_th  // absolute threshold to be used for initial UE messages
 
+#ifdef __cplusplus
+}
+#endif
 extern bool hss_associated;
 
 /** \brief Allocate and add to the list a new eNB descriptor
@@ -49,21 +53,21 @@ enb_description_t* s1ap_new_enb(void);
  * \param enb_ue_s1ap_id ue ID over S1AP
  * @returns Reference to the new UE element in list
  **/
-ue_description_t* s1ap_new_ue(s1ap_state_t* state,
-                              sctp_assoc_id_t sctp_assoc_id,
-                              enb_ue_s1ap_id_t enb_ue_s1ap_id);
+magma::lte::oai::UeDescription* s1ap_new_ue(s1ap_state_t* 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, ue_description_t* ue_ref);
+void s1ap_remove_ue(s1ap_state_t* state,
+                    magma::lte::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, enb_description_t* enb_ref);
 
 void free_enb_description(void** ptr);
-#ifdef __cplusplus
-}
-#endif
+
+void free_ue_description(void** ptr);