PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nr,gnb,ngap: rename functions for extra clarity

This commit is contained in:
Francisco 2021-12-01 17:41:37 +00:00 committed by Francisco Paisana
parent 11b4a572a0
commit 8a5ecfea40
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
srsgnb/hdr/stack/ngap/ngap.h
View File

@ -133,7 +133,7 @@ private:
// TS 38.413 - Section 9.2.6.3 - NG Setup Failure
bool handle_ng_setup_failure(const asn1::ngap_nr::ng_setup_fail_s& msg);
// TS 38.413 - Section 9.2.2.5 - UE Context Release Command
bool handle_ue_ctxt_release_cmd(const asn1::ngap_nr::ue_context_release_cmd_s& msg);
bool handle_ue_context_release_cmd(const asn1::ngap_nr::ue_context_release_cmd_s& msg);
// TS 38.413 - Section 9.2.2.1 - Initial Context Setup Request
bool handle_initial_ctxt_setup_request(const asn1::ngap_nr::init_context_setup_request_s& msg);
// TS 38.413 - Section 9.2.1.1 - PDU Session Resource Setup Request

5
srsgnb/hdr/stack/ngap/ngap_ue.h
View File

@ -51,11 +51,12 @@ public:
// TS 38.413 - Section 9.2.2.4 - UE Context Release Request
bool send_ue_context_release_request(asn1::ngap_nr::cause_c cause);
// TS 38.413 - Section 9.2.2.5 - UE Context Release Command
bool handle_ue_ctxt_release_cmd(const asn1::ngap_nr::ue_context_release_cmd_s& msg);
bool handle_ue_context_release_cmd(const asn1::ngap_nr::ue_context_release_cmd_s& msg);
// TS 38.413 - Section 9.2.1.1 - PDU Session Resource Setup Request
bool handle_pdu_session_res_setup_request(const asn1::ngap_nr::pdu_session_res_setup_request_s& msg);
bool was_uectxtrelease_requested() const { return release_requested; }
/// Checks if a UE Context Release Request was already sent
bool was_ue_context_release_requested() const { return release_requested; }
void notify_rrc_reconf_complete(const bool reconf_complete_outcome);
ngap_ue_ctxt_t ctxt = {};

9
srsgnb/hdr/stack/ngap/ngap_ue_bearer_manager.h
View File

@ -56,12 +56,13 @@ public:
int reset_pdu_sessions(uint16_t rnti);
const std::map<uint8_t, pdu_session_t>& pdu_sessions() const { return pdu_session_list; }
using pdu_session_list_t = std::map<uint8_t, pdu_session_t>;
const pdu_session_list_t& pdu_sessions() const { return pdu_session_list; }
private:
gtpu_interface_rrc* gtpu = nullptr;
std::map<uint8_t, pdu_session_t> pdu_session_list;
srslog::basic_logger& logger;
gtpu_interface_rrc* gtpu = nullptr;
pdu_session_list_t pdu_session_list;
srslog::basic_logger& logger;
std::map<uint32_t, uint32_t> next_lcid_list; // Map RNTI to next LCID to be allocated

8
srsgnb/src/stack/ngap/ngap.cc
View File

@ -432,7 +432,7 @@ bool ngap::handle_initiating_message(const asn1::ngap_nr::init_msg_s& msg)
case ngap_elem_procs_o::init_msg_c::types_opts::init_context_setup_request:
return handle_initial_ctxt_setup_request(msg.value.init_context_setup_request());
case ngap_elem_procs_o::init_msg_c::types_opts::ue_context_release_cmd:
return handle_ue_ctxt_release_cmd(msg.value.ue_context_release_cmd());
return handle_ue_context_release_cmd(msg.value.ue_context_release_cmd());
case ngap_elem_procs_o::init_msg_c::types_opts::pdu_session_res_setup_request:
return handle_ue_pdu_session_res_setup_request(msg.value.pdu_session_res_setup_request());
default:
@ -547,7 +547,7 @@ bool ngap::handle_initial_ctxt_setup_request(const asn1::ngap_nr::init_context_s
return true;
}
bool ngap::handle_ue_ctxt_release_cmd(const asn1::ngap_nr::ue_context_release_cmd_s& msg)
bool ngap::handle_ue_context_release_cmd(const asn1::ngap_nr::ue_context_release_cmd_s& msg)
{
const asn1::ngap_nr::ue_ngap_id_pair_s& ue_ngap_id_pair = msg.protocol_ies.ue_ngap_ids.value.ue_ngap_id_pair();
@ -557,9 +557,7 @@ bool ngap::handle_ue_ctxt_release_cmd(const asn1::ngap_nr::ue_context_release_cm
return false;
}
u->handle_ue_ctxt_release_cmd(msg);
return true;
return u->handle_ue_context_release_cmd(msg);
}
bool ngap::handle_ue_pdu_session_res_setup_request(const asn1::ngap_nr::pdu_session_res_setup_request_s& msg)

4
srsgnb/src/stack/ngap/ngap_ue.cc
View File

@ -251,7 +251,7 @@ bool ngap::ue::send_ue_context_release_request(asn1::ngap_nr::cause_c cause)
return false;
}
if (was_uectxtrelease_requested()) {
if (was_ue_context_release_requested()) {
// let timeout auto-remove user.
return false;
}
@ -294,7 +294,7 @@ bool ngap::ue::handle_initial_ctxt_setup_request(const asn1::ngap_nr::init_conte
return true;
}
bool ngap::ue::handle_ue_ctxt_release_cmd(const asn1::ngap_nr::ue_context_release_cmd_s& msg)
bool ngap::ue::handle_ue_context_release_cmd(const asn1::ngap_nr::ue_context_release_cmd_s& msg)
{
// TODO: Release UE context
if (not ue_context_release_proc.launch(msg)) {