s1ap - handle erroneous enb/mme s1ap ue id in received s1ap messages from the MME

lib/include/srsran/adt/optional.h

@@ -28,13 +28,13 @@ public:
   optional(const optional<T>& other) : has_val_(other.has_value())
   {
     if (other.has_value()) {
-      storage.copy_ctor(other.get());
+      storage.copy_ctor(other.storage);
     }
   }
   optional(optional<T>&& other) noexcept : has_val_(other.has_value())
   {
     if (other.has_value()) {
-      storage.move_ctor(other.get());
+      storage.move_ctor(std::move(other.storage));
     }
   }
   optional& operator=(const optional<T>& other)

lib/include/srsran/interfaces/enb_rrc_interfaces.h

@@ -24,7 +24,7 @@ class rrc_interface_s1ap
 {
 public:
   virtual void write_dl_info(uint16_t rnti, srsran::unique_byte_buffer_t sdu)                    = 0;
-  virtual void release_complete(uint16_t rnti)                                                   = 0;
+  virtual void release_ue(uint16_t rnti)                                                         = 0;
   virtual bool setup_ue_ctxt(uint16_t rnti, const asn1::s1ap::init_context_setup_request_s& msg) = 0;
   virtual bool modify_ue_ctxt(uint16_t rnti, const asn1::s1ap::ue_context_mod_request_s& msg)    = 0;
   virtual bool setup_ue_erabs(uint16_t rnti, const asn1::s1ap::erab_setup_request_s& msg)        = 0;

srsenb/hdr/stack/rrc/rrc.h

@@ -77,7 +77,7 @@ public:
 
   // rrc_interface_s1ap
   void write_dl_info(uint16_t rnti, srsran::unique_byte_buffer_t sdu) override;
-  void release_complete(uint16_t rnti) override;
+  void release_ue(uint16_t rnti) override;
   bool setup_ue_ctxt(uint16_t rnti, const asn1::s1ap::init_context_setup_request_s& msg) override;
   bool modify_ue_ctxt(uint16_t rnti, const asn1::s1ap::ue_context_mod_request_s& msg) override;
   bool setup_ue_erabs(uint16_t rnti, const asn1::s1ap::erab_setup_request_s& msg) override;

srsenb/hdr/stack/upper/s1ap.h

@@ -24,6 +24,7 @@
 #include "srsran/interfaces/enb_s1ap_interfaces.h"
 
 #include "s1ap_metrics.h"
+#include "srsran/adt/optional.h"
 #include "srsran/asn1/s1ap.h"
 #include "srsran/common/network_utils.h"
 #include "srsran/common/stack_procedure.h"
@@ -90,7 +91,9 @@ public:
   void send_ho_notify(uint16_t rnti, uint64_t target_eci) override;
   void send_ho_cancel(uint16_t rnti) override;
   bool release_erabs(uint16_t rnti, const std::vector<uint16_t>& erabs_successfully_released) override;
-  bool send_error_indication(uint16_t rnti, const asn1::s1ap::cause_c& cause);
+  bool send_error_indication(const asn1::s1ap::cause_c& cause,
+                             srsran::optional<uint32_t> enb_ue_s1ap_id = {},
+                             srsran::optional<uint32_t> mme_ue_s1ap_id = {});
   bool send_ue_cap_info_indication(uint16_t rnti, srsran::unique_byte_buffer_t ue_radio_cap) override;
 
   // Stack interface

srsenb/src/stack/rrc/rrc.cc

@@ -287,7 +287,7 @@ void rrc::write_dl_info(uint16_t rnti, srsran::unique_byte_buffer_t sdu)
   }
 }
 
-void rrc::release_complete(uint16_t rnti)
+void rrc::release_ue(uint16_t rnti)
 {
   rrc_pdu p = {rnti, LCID_REL_USER, nullptr};
   if (not rx_pdu_queue.try_push(std::move(p))) {

srsenb/src/stack/upper/s1ap.cc

@@ -357,7 +357,7 @@ bool s1ap::user_release(uint16_t rnti, asn1::s1ap::cause_radio_network_e cause_r
   if (u->was_uectxtrelease_requested()) {
     logger.warning("UE context for RNTI:0x%x is in zombie state. Releasing...", rnti);
     users.erase(u);
-    rrc->release_complete(rnti);
+    rrc->release_ue(rnti);
     return false;
   }
 
@@ -539,7 +539,7 @@ bool s1ap::handle_s1ap_rx_pdu(srsran::byte_buffer_t* pdu)
     logger.error(pdu->msg, pdu->N_bytes, "Failed to unpack received PDU");
     cause_c cause;
     cause.set_protocol().value = cause_protocol_opts::transfer_syntax_error;
-    send_error_indication(SRSRAN_INVALID_RNTI, cause);
+    send_error_indication(cause);
     return false;
   }
   log_s1ap_msg(rx_pdu, srsran::make_span(*pdu), true);
@@ -832,7 +832,7 @@ bool s1ap::handle_uectxtreleasecommand(const ue_context_release_cmd_s& msg)
   u->send_uectxtreleasecomplete();
   users.erase(u);
   logger.info("UE context for RNTI:0x%x released", rnti);
-  rrc->release_complete(rnti);
+  rrc->release_ue(rnti);
   return true;
 }
 
@@ -1061,7 +1061,9 @@ bool s1ap::send_ue_cap_info_indication(uint16_t rnti, srsran::unique_byte_buffer
   return user_ptr->send_ue_cap_info_indication(std::move(ue_radio_cap));
 }
 
-bool s1ap::send_error_indication(uint16_t rnti, const asn1::s1ap::cause_c& cause)
+bool s1ap::send_error_indication(const asn1::s1ap::cause_c& cause,
+                                 srsran::optional<uint32_t> enb_ue_s1ap_id,
+                                 srsran::optional<uint32_t> mme_ue_s1ap_id)
 {
   if (not mme_connected) {
     return false;
@@ -1071,17 +1073,16 @@ bool s1ap::send_error_indication(uint16_t rnti, const asn1::s1ap::cause_c& cause
   tx_pdu.set_init_msg().load_info_obj(ASN1_S1AP_ID_ERROR_IND);
   auto& container = tx_pdu.init_msg().value.error_ind().protocol_ies;
 
-  if (rnti != SRSRAN_INVALID_RNTI) {
+  uint16_t rnti                    = SRSRAN_INVALID_RNTI;
-    ue* user_ptr = users.find_ue_rnti(rnti);
+  container.enb_ue_s1ap_id_present = enb_ue_s1ap_id.has_value();
-    if (user_ptr == nullptr) {
+  if (enb_ue_s1ap_id.has_value()) {
-      return false;
+    container.enb_ue_s1ap_id.value = enb_ue_s1ap_id.value();
-    }
+    ue* user_ptr                   = users.find_ue_enbid(enb_ue_s1ap_id.value());
-    container.enb_ue_s1ap_id_present = true;
+    rnti                           = user_ptr != nullptr ? user_ptr->ctxt.enb_ue_s1ap_id : SRSRAN_INVALID_RNTI;
-    container.enb_ue_s1ap_id.value   = user_ptr->ctxt.enb_ue_s1ap_id;
-    container.mme_ue_s1ap_id_present = user_ptr->ctxt.mme_ue_s1ap_id_present;
-    if (user_ptr->ctxt.mme_ue_s1ap_id_present) {
-      container.mme_ue_s1ap_id.value = user_ptr->ctxt.mme_ue_s1ap_id;
   }
+  container.mme_ue_s1ap_id_present = mme_ue_s1ap_id.has_value();
+  if (mme_ue_s1ap_id.has_value()) {
+    container.mme_ue_s1ap_id.value = mme_ue_s1ap_id.value();
   }
 
   container.s_tmsi_present = false;
@@ -1581,9 +1582,9 @@ bool s1ap::sctp_send_s1ap_pdu(const asn1::s1ap::s1ap_pdu_c& tx_pdu, uint32_t rnt
   }
 
   if (rnti != SRSRAN_INVALID_RNTI) {
-    logger.info(buf->msg, buf->N_bytes, "Sending %s for rnti=0x%x", procedure_name, rnti);
+    logger.info(buf->msg, buf->N_bytes, "Tx S1AP SDU, %s, rnti=0x%x", rnti, procedure_name);
   } else {
-    logger.info(buf->msg, buf->N_bytes, "Sending %s to MME", procedure_name);
+    logger.info(buf->msg, buf->N_bytes, "Tx S1AP SDU, %s", procedure_name);
   }
   uint16_t streamid = rnti == SRSRAN_INVALID_RNTI ? NONUE_STREAM_ID : users.find_ue_rnti(rnti)->stream_id;
 
@@ -1598,10 +1599,10 @@ bool s1ap::sctp_send_s1ap_pdu(const asn1::s1ap::s1ap_pdu_c& tx_pdu, uint32_t rnt
                                 0,
                                 0);
   if (n_sent == -1) {
-    if (rnti > 0) {
+    if (rnti != SRSRAN_INVALID_RNTI) {
-      logger.error("Failed to send %s for rnti=0x%x", procedure_name, rnti);
+      logger.error("Error: Failure at Tx S1AP SDU, %s, rnti=0x%x", rnti, procedure_name);
     } else {
-      logger.error("Failed to send %s", procedure_name);
+      logger.error("Error: Failure at Tx S1AP SDU, %s", procedure_name);
     }
     return false;
   }
@@ -1617,25 +1618,49 @@ bool s1ap::sctp_send_s1ap_pdu(const asn1::s1ap::s1ap_pdu_c& tx_pdu, uint32_t rnt
 s1ap::ue* s1ap::find_s1apmsg_user(uint32_t enb_id, uint32_t mme_id)
 {
   ue*     user_ptr     = users.find_ue_enbid(enb_id);
+  ue*     user_mme_ptr = nullptr;
   cause_c cause;
   if (user_ptr != nullptr) {
-    if (not user_ptr->ctxt.mme_ue_s1ap_id_present) {
+    if (user_ptr->ctxt.mme_ue_s1ap_id_present and user_ptr->ctxt.mme_ue_s1ap_id == mme_id) {
+      // No ID inconsistency found
+      return user_ptr;
+    }
+
+    user_mme_ptr = users.find_ue_mmeid(mme_id);
+    if (not user_ptr->ctxt.mme_ue_s1ap_id_present and user_mme_ptr == nullptr) {
+      // First "returned message", no inconsistency found (see 36.413, Section 10.6)
       user_ptr->ctxt.mme_ue_s1ap_id_present = true;
       user_ptr->ctxt.mme_ue_s1ap_id         = mme_id;
       return user_ptr;
-    } else if (user_ptr->ctxt.mme_ue_s1ap_id == mme_id) {
-      return user_ptr;
-    } else {
-      logger.warning("MME UE S1AP ID=%d not found - discarding message", enb_id);
-      cause.set_radio_network().value = cause_radio_network_opts::unknown_mme_ue_s1ap_id;
     }
+
+    // TS 36.413, Sec. 10.6 - If a node receives a first returned message that includes a remote AP ID (...)
+
+    logger.warning("MME UE S1AP ID=%d not found - discarding message", enb_id);
+    cause.set_radio_network().value = user_mme_ptr != nullptr ? cause_radio_network_opts::unknown_mme_ue_s1ap_id
+                                                              : cause_radio_network_opts::unknown_pair_ue_s1ap_id;
   } else {
+    // TS 36.413, Sec. 10.6 - If a node receives a message (other than the first or first returned messages) that
+    // includes AP ID(s) identifying (...)
+    user_mme_ptr = users.find_ue_mmeid(mme_id);
+
     logger.warning("ENB UE S1AP ID=%d not found - discarding message", enb_id);
-    cause.set_radio_network().value = users.find_ue_mmeid(mme_id) != nullptr
+    cause.set_radio_network().value = user_mme_ptr != nullptr ? cause_radio_network_opts::unknown_enb_ue_s1ap_id
-                                          ? cause_radio_network_opts::unknown_enb_ue_s1ap_id
                                                               : cause_radio_network_opts::unknown_pair_ue_s1ap_id;
   }
-  send_error_indication(SRSRAN_INVALID_RNTI, cause);
+
+  // the node shall initiate an Error Indication procedure with inclusion of the received AP ID(s) from the peer node
+  // and an appropriate cause value.
+  send_error_indication(cause, enb_id, mme_id);
+
+  // Both nodes shall initiate a local release of any established UE-associated logical connection (for the same S1
+  // interface) having the erroneous AP ID(s) as local or remote identifier.
+  if (user_ptr != nullptr) {
+    rrc->release_ue(user_ptr->ctxt.rnti);
+  }
+  if (user_mme_ptr != nullptr and user_mme_ptr != user_ptr) {
+    rrc->release_ue(user_mme_ptr->ctxt.rnti);
+  }
   return nullptr;
 }
 

srsenb/test/common/dummy_classes.h

@@ -164,7 +164,7 @@ class rrc_dummy : public rrc_interface_s1ap
 {
 public:
   void write_dl_info(uint16_t rnti, srsran::unique_byte_buffer_t sdu) override {}
-  void release_complete(uint16_t rnti) override {}
+  void release_ue(uint16_t rnti) override {}
   bool setup_ue_ctxt(uint16_t rnti, const asn1::s1ap::init_context_setup_request_s& msg) override { return true; }
   bool modify_ue_ctxt(uint16_t rnti, const asn1::s1ap::ue_context_mod_request_s& msg) override { return true; }
   bool setup_ue_erabs(uint16_t rnti, const asn1::s1ap::erab_setup_request_s& msg) override { return true; }

srsenb/test/upper/s1ap_test.cc

@@ -226,6 +226,7 @@ void test_s1ap_erab_setup(test_event event)
     TESTASSERT(erab_item.erab_id == 6);
     TESTASSERT(erab_item.cause.type().value == asn1::s1ap::cause_c::types_opts::radio_network);
     TESTASSERT(erab_item.cause.radio_network().value == asn1::s1ap::cause_radio_network_opts::unknown_erab_id);
+    return;
   } else {
     TESTASSERT(protocol_ies.erab_modify_list_bearer_mod_res_present);
     TESTASSERT(not protocol_ies.erab_failed_to_modify_list_present);