From 80d3e94e144fb91c97e193904ac5fc0b7eef091d Mon Sep 17 00:00:00 2001 From: Fabian Eckermann Date: Fri, 14 Jun 2024 12:19:46 +0200 Subject: [PATCH] cu_cp,rrc: improve function name --- include/srsran/rrc/rrc_ue.h | 2 +- lib/cu_cp/adapters/rrc_ue_adapters.h | 4 ++-- lib/cu_cp/ue_security_manager/ue_security_manager_impl.cpp | 2 +- lib/cu_cp/ue_security_manager/ue_security_manager_impl.h | 2 +- lib/rrc/ue/procedures/rrc_reestablishment_procedure.cpp | 2 +- lib/rrc/ue/rrc_ue_impl.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/srsran/rrc/rrc_ue.h b/include/srsran/rrc/rrc_ue.h index 6c6ec18e04..e5d66cbce4 100644 --- a/include/srsran/rrc/rrc_ue.h +++ b/include/srsran/rrc/rrc_ue.h @@ -297,7 +297,7 @@ class rrc_ue_cu_cp_ue_notifier virtual void update_security_context(security::security_context sec_ctxt) = 0; /// \brief Perform horizontal key derivation - virtual void horizontal_key_derivation(pci_t target_pci, unsigned target_ssb_arfcn) = 0; + virtual void perform_horizontal_key_derivation(pci_t target_pci, unsigned target_ssb_arfcn) = 0; }; /// Struct containing all information needed from the old RRC UE for Reestablishment. diff --git a/lib/cu_cp/adapters/rrc_ue_adapters.h b/lib/cu_cp/adapters/rrc_ue_adapters.h index 5d59402f04..216f387567 100644 --- a/lib/cu_cp/adapters/rrc_ue_adapters.h +++ b/lib/cu_cp/adapters/rrc_ue_adapters.h @@ -154,10 +154,10 @@ class rrc_ue_cu_cp_ue_adapter : public rrc_ue_cu_cp_ue_notifier } /// \brief Perform horizontal key derivation - void horizontal_key_derivation(pci_t target_pci, unsigned target_ssb_arfcn) override + void perform_horizontal_key_derivation(pci_t target_pci, unsigned target_ssb_arfcn) override { srsran_assert(ue != nullptr, "CU-CP UE must not be nullptr"); - return ue->get_security_manager().horizontal_key_derivation(target_pci, target_ssb_arfcn); + return ue->get_security_manager().perform_horizontal_key_derivation(target_pci, target_ssb_arfcn); } private: diff --git a/lib/cu_cp/ue_security_manager/ue_security_manager_impl.cpp b/lib/cu_cp/ue_security_manager/ue_security_manager_impl.cpp index 12163cca29..0b38c23b4b 100644 --- a/lib/cu_cp/ue_security_manager/ue_security_manager_impl.cpp +++ b/lib/cu_cp/ue_security_manager/ue_security_manager_impl.cpp @@ -91,7 +91,7 @@ void ue_security_manager::update_security_context(security::security_context sec sec_context = sec_ctxt; } -void ue_security_manager::horizontal_key_derivation(pci_t target_pci, unsigned target_ssb_arfcn) +void ue_security_manager::perform_horizontal_key_derivation(pci_t target_pci, unsigned target_ssb_arfcn) { sec_context.horizontal_key_derivation(target_pci, target_ssb_arfcn); } \ No newline at end of file diff --git a/lib/cu_cp/ue_security_manager/ue_security_manager_impl.h b/lib/cu_cp/ue_security_manager/ue_security_manager_impl.h index 2d26a08621..f3d12c25cf 100644 --- a/lib/cu_cp/ue_security_manager/ue_security_manager_impl.h +++ b/lib/cu_cp/ue_security_manager/ue_security_manager_impl.h @@ -37,7 +37,7 @@ class ue_security_manager [[nodiscard]] security::sec_as_config get_rrc_as_config() const; [[nodiscard]] security::sec_128_as_config get_rrc_128_as_config() const; void update_security_context(security::security_context sec_ctxt); - void horizontal_key_derivation(pci_t target_pci, unsigned target_ssb_arfcn); + void perform_horizontal_key_derivation(pci_t target_pci, unsigned target_ssb_arfcn); private: security_manager_config cfg; diff --git a/lib/rrc/ue/procedures/rrc_reestablishment_procedure.cpp b/lib/rrc/ue/procedures/rrc_reestablishment_procedure.cpp index ff7ccf80b0..23e77bf639 100644 --- a/lib/rrc/ue/procedures/rrc_reestablishment_procedure.cpp +++ b/lib/rrc/ue/procedures/rrc_reestablishment_procedure.cpp @@ -240,7 +240,7 @@ void rrc_reestablishment_procedure::transfer_reestablishment_context_and_update_ // freq_and_timing must be present, otherwise the RRC UE would've never been created uint32_t ssb_arfcn = context.cfg.meas_timings.begin()->freq_and_timing.value().carrier_freq; cu_cp_ue_notifier.update_security_context(old_ue_reest_context.sec_context); - cu_cp_ue_notifier.horizontal_key_derivation(context.cell.pci, ssb_arfcn); + cu_cp_ue_notifier.perform_horizontal_key_derivation(context.cell.pci, ssb_arfcn); logger.log_debug("Refreshed keys horizontally. pci={} ssb-arfcn={}", context.cell.pci, ssb_arfcn); } diff --git a/lib/rrc/ue/rrc_ue_impl.cpp b/lib/rrc/ue/rrc_ue_impl.cpp index a6fcbc7424..5c9a29f824 100644 --- a/lib/rrc/ue/rrc_ue_impl.cpp +++ b/lib/rrc/ue/rrc_ue_impl.cpp @@ -50,7 +50,7 @@ rrc_ue_impl::rrc_ue_impl(rrc_pdu_f1ap_notifier& f1ap_pdu_notifie if (!rrc_context.value().is_inter_cu_handover) { cu_cp_ue_notifier.update_security_context(rrc_context.value().sec_context); } - cu_cp_ue_notifier.horizontal_key_derivation(cell_.pci, cell_.ssb_arfcn); + cu_cp_ue_notifier.perform_horizontal_key_derivation(cell_.pci, cell_.ssb_arfcn); // Create SRBs. for (const auto& srb : rrc_context.value().srbs) {