use of reestablishment method to reset the RLC bearers during handover

lib/include/srslte/interfaces/enb_interfaces.h

@@ -365,6 +365,7 @@ public:
   virtual bool has_bearer(uint16_t rnti, uint32_t lcid)                                  = 0;
   virtual bool suspend_bearer(uint16_t rnti, uint32_t lcid)                              = 0;
   virtual bool resume_bearer(uint16_t rnti, uint32_t lcid)                               = 0;
+  virtual void reestablish(uint16_t rnti)                                                = 0;
 };
 
 // PDCP interface for GTPU

srsenb/hdr/stack/upper/rlc.h

@@ -56,6 +56,7 @@ public:
   bool has_bearer(uint16_t rnti, uint32_t lcid);
   bool suspend_bearer(uint16_t rnti, uint32_t lcid);
   bool resume_bearer(uint16_t rnti, uint32_t lcid);
+  void reestablish(uint16_t rnti) final;
 
   // rlc_interface_pdcp
   void        write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu);

srsenb/src/stack/rrc/rrc_mobility.cc

@@ -977,10 +977,9 @@ void rrc::ue::rrc_mobility::handle_crnti_ce(intraenb_ho_st& s, idle_st& d, const
   rrc_log->info("UE performing handover updated its temp-crnti=0x%x to rnti=0x%x\n", ev.temp_crnti, ev.crnti);
 
   // Need to reset SNs of bearers.
-  rrc_enb->rlc->rem_user(rrc_ue->rnti);
   rrc_enb->pdcp->rem_user(rrc_ue->rnti);
-  rrc_enb->rlc->add_user(rrc_ue->rnti);
   rrc_enb->pdcp->add_user(rrc_ue->rnti);
+  rrc_enb->rlc->reestablish(rrc_ue->rnti);
 
   // Change PCell in MAC/Scheduler
   rrc_ue->current_sched_ue_cfg.supported_cc_list[0].active     = true;
@@ -990,7 +989,6 @@ void rrc::ue::rrc_mobility::handle_crnti_ce(intraenb_ho_st& s, idle_st& d, const
 
   rrc_ue->ue_security_cfg.regenerate_keys_handover(s.target_cell->cell_cfg.pci, s.target_cell->cell_cfg.dl_earfcn);
   rrc_ue->bearer_list.reest_bearers();
-  rrc_ue->bearer_list.apply_rlc_bearer_updates(rrc_enb->rlc);
   rrc_ue->bearer_list.apply_pdcp_bearer_updates(rrc_enb->pdcp, rrc_ue->ue_security_cfg);
 
   rrc_log->info("new rnti=0x%x PCell is %d\n", ev.crnti, s.target_cell->enb_cc_idx);

srsenb/src/stack/upper/rlc.cc

@@ -160,6 +160,15 @@ bool rlc::resume_bearer(uint16_t rnti, uint32_t lcid)
   return result;
 }
 
+void rlc::reestablish(uint16_t rnti)
+{
+  pthread_rwlock_rdlock(&rwlock);
+  if (users.count(rnti)) {
+    users[rnti].rlc->reestablish();
+  }
+  pthread_rwlock_unlock(&rwlock);
+}
+
 // In the eNodeB, there is no polling for buffer state from the scheduler.
 // This function is called by UE RLC instance every time the tx/retx buffers are updated
 void rlc::update_bsr(uint32_t rnti, uint32_t lcid, uint32_t tx_queue, uint32_t retx_queue)

srsenb/test/common/dummy_classes.h

@@ -57,6 +57,7 @@ public:
   bool has_bearer(uint16_t rnti, uint32_t lcid) override { return false; }
   bool suspend_bearer(uint16_t rnti, uint32_t lcid) override { return true; }
   bool resume_bearer(uint16_t rnti, uint32_t lcid) override { return true; }
+  void reestablish(uint16_t rnti) override {}
 };
 
 class pdcp_dummy : public pdcp_interface_rrc