delete erab if gtpu tunnel creation failed

srsran · May 14, 2021 · 5662e73 · 5662e73
1 parent e27ba38
commit 5662e73
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/srsenb/src/stack/rrc/rrc_bearer_cfg.cc b/srsenb/src/stack/rrc/rrc_bearer_cfg.cc
@@ -417,7 +417,7 @@ void bearer_cfg_handler::rem_gtpu_bearer(uint32_t erab_id)
 {
   auto it = erabs.find(erab_id);
   if (it == erabs.end()) {
-    logger->error("Removing erab_id=%d from GTPU", erab_id);
+    logger->warning("Removing erab_id=%d from GTPU", erab_id);
     return;
   }
   gtpu->rem_bearer(rnti, it->second.lcid);

diff --git a/srsenb/src/stack/rrc/rrc_mobility.cc b/srsenb/src/stack/rrc/rrc_mobility.cc
@@ -925,6 +925,7 @@ bool rrc::ue::rrc_mobility::apply_ho_prep_cfg(const ho_prep_info_r8_ies_s&
       erabs_failed_to_setup.back().erab_id = erab.erab_id;
       erabs_failed_to_setup.back().cause.set_transport().value =
           asn1::s1ap::cause_transport_opts::transport_res_unavailable;
+      rrc_ue->bearer_list.release_erab(erab.erab_id);
       continue;
     }
   }

diff --git a/srsenb/src/stack/rrc/rrc_ue.cc b/srsenb/src/stack/rrc/rrc_ue.cc
@@ -1092,6 +1092,7 @@ int rrc::ue::setup_erab(uint16_t                                           erab_
   }
   if (bearer_list.add_gtpu_bearer(erab_id) != SRSRAN_SUCCESS) {
     cause.set_radio_network().value = asn1::s1ap::cause_radio_network_opts::radio_res_not_available;
+    bearer_list.release_erab(erab_id);
     return SRSRAN_ERROR;
   }
   return SRSRAN_SUCCESS;