5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup s1ap methods. remove hard coded erab list in s1ap handover required message.

Browse Source
master
Francisco Paisana 4 years ago
parent 5e48327eca
commit c40ad81a90
6 changed files with 78 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
lib/include/srslte/interfaces/enb_s1ap_interfaces.h
Unescape Escape View File

@ -63,12 +63,14 @@ public:
* @param rnti user to perform S1 handover * @param rnti user to perform S1 handover
* @param target_eci eNB Id + Cell Id of the target eNB * @param target_eci eNB Id + Cell Id of the target eNB
* @param target_plmn PLMN of the target eNB * @param target_plmn PLMN of the target eNB
* @param fwd_erabs E-RABs that are candidates to DL forwarding
* @param rrc_container RRC container with SourceENBToTargetENBTransparentContainer message. * @param rrc_container RRC container with SourceENBToTargetENBTransparentContainer message.
* @return true if successful * @return true if successful
*/ */
virtual bool send_ho_required(uint16_t rnti, virtual bool send_ho_required(uint16_t rnti,
uint32_t target_eci, uint32_t target_eci,
srslte::plmn_id_t target_plmn, srslte::plmn_id_t target_plmn,
srslte::span<uint32_t> fwd_erabs,
srslte::unique_byte_buffer_t rrc_container) = 0; srslte::unique_byte_buffer_t rrc_container) = 0;
/** /**

48
srsenb/hdr/stack/upper/s1ap.h
Unescape Escape View File

@ -75,6 +75,7 @@ public:
bool send_ho_required(uint16_t rnti, bool send_ho_required(uint16_t rnti,
uint32_t target_eci, uint32_t target_eci,
srslte::plmn_id_t target_plmn, srslte::plmn_id_t target_plmn,
srslte::span<uint32_t> fwd_erabs,
srslte::unique_byte_buffer_t rrc_container) override; srslte::unique_byte_buffer_t rrc_container) override;
bool send_enb_status_transfer_proc(uint16_t rnti, std::vector<bearer_status_info>& bearer_status_list) override; bool send_enb_status_transfer_proc(uint16_t rnti, std::vector<bearer_status_info>& bearer_status_list) override;
bool send_ho_failure(uint32_t mme_ue_s1ap_id); bool send_ho_failure(uint32_t mme_ue_s1ap_id);
@ -148,9 +149,38 @@ private:
bool handle_uecontextmodifyrequest(const asn1::s1ap::ue_context_mod_request_s& msg); bool handle_uecontextmodifyrequest(const asn1::s1ap::ue_context_mod_request_s& msg);
// handover // handover
bool handle_hopreparationfailure(const asn1::s1ap::ho_prep_fail_s& msg); /**
bool handle_s1hocommand(const asn1::s1ap::ho_cmd_s& msg); * Source eNB Handler for S1AP "HANDOVER PREPARATION FAILURE" Message
bool handle_ho_request(const asn1::s1ap::ho_request_s& msg); * MME ---> Source eNB
* @remark TS 36.413, 8.4.1.3 - S1AP Procedures | Handover Signalling | Handover Preparation | Unsuccessful Operation
* @param msg HANDOVER COMMAND S1AP PDU
* @return true if the HANDOVER COMMAND content is valid. False otherwise
*/
bool handle_handover_preparation_failure(const asn1::s1ap::ho_prep_fail_s& msg);
/**
* Source eNB Handler for S1AP "HANDOVER COMMAND" Message
* MME ---> Source eNB
* @remark TS 36.413, 8.4.1.2 - S1AP Procedures | Handover Signalling | Handover Preparation | Successful Operation
* @param msg HANDOVER COMMAND S1AP PDU
* @return true if the HANDOVER COMMAND content is valid. False otherwise
*/
bool handle_handover_command(const asn1::s1ap::ho_cmd_s& msg);
/**
* Target eNB Handler for S1AP "HANDOVER REQUEST" Message
* MME ---> Target eNB
* @remark TS 36.413, 8.4.7.2 - S1AP Procedures | Handover Signalling | Handover Resource Allocation
* @param msg HANDOVER REQUEST S1AP PDU
* @return true if the new user resources were successfully allocated
*/
bool handle_handover_request(const asn1::s1ap::ho_request_s& msg);
/**
* Target eNB Handler for S1AP "MME STATUS TRANSFER" Message
* MME ---> Target eNB
* @remark TS 36.413, 8.4.7.2 - S1AP Procedures | Handover Signalling | MME Status Transfer | Successful Operation
* @param msg MME STATUS TRANSFER S1AP PDU
* @return true if the msg content is valid. False otherwise
*/
bool handle_mme_status_transfer(const asn1::s1ap::mme_status_transfer_s& msg); bool handle_mme_status_transfer(const asn1::s1ap::mme_status_transfer_s& msg);
// UE-specific data and procedures // UE-specific data and procedures
@ -161,8 +191,10 @@ private:
public: public:
struct ts1_reloc_prep_expired {}; struct ts1_reloc_prep_expired {};
ho_prep_proc_t(s1ap::ue* ue_); ho_prep_proc_t(s1ap::ue* ue_);
srslte::proc_outcome_t srslte::proc_outcome_t init(uint32_t target_eci_,
init(uint32_t target_eci_, srslte::plmn_id_t target_plmn_, srslte::unique_byte_buffer_t rrc_container); srslte::plmn_id_t target_plmn_,
srslte::span<uint32_t> fwd_erabs,
srslte::unique_byte_buffer_t rrc_container);
srslte::proc_outcome_t step() { return srslte::proc_outcome_t::yield; } srslte::proc_outcome_t step() { return srslte::proc_outcome_t::yield; }
srslte::proc_outcome_t react(ts1_reloc_prep_expired e); srslte::proc_outcome_t react(ts1_reloc_prep_expired e);
srslte::proc_outcome_t react(const asn1::s1ap::ho_prep_fail_s& msg); srslte::proc_outcome_t react(const asn1::s1ap::ho_prep_fail_s& msg);
@ -209,8 +241,10 @@ private:
uint16_t stream_id = 1; uint16_t stream_id = 1;
private: private:
bool bool send_ho_required(uint32_t target_eci_,
send_ho_required(uint32_t target_eci_, srslte::plmn_id_t target_plmn_, srslte::unique_byte_buffer_t rrc_container); srslte::plmn_id_t target_plmn_,
srslte::span<uint32_t> fwd_erabs,
srslte::unique_byte_buffer_t rrc_container);
//! TS 36.413, Section 8.4.6 - eNB Status Transfer procedure //! TS 36.413, Section 8.4.6 - eNB Status Transfer procedure
// args // args

10
srsenb/src/stack/rrc/rrc_mobility.cc
Unescape Escape View File

@ -368,8 +368,14 @@ bool rrc::ue::rrc_mobility::start_ho_preparation(uint32_t target_eci,
} }
buffer->N_bytes = bref.distance_bytes(); buffer->N_bytes = bref.distance_bytes();
bool success = rrc_enb->s1ap->send_ho_required(rrc_ue->rnti, target_eci, target_plmn, std::move(buffer)); // Set list of E-RABs for DL forwarding
return success; std::vector<uint32_t> fwd_erabs;
fwd_erabs.reserve(rrc_ue->bearer_list.get_erabs().size());
for (auto& erab_pair : rrc_ue->bearer_list.get_erabs()) {
fwd_erabs.push_back(erab_pair.first);
}
return rrc_enb->s1ap->send_ho_required(rrc_ue->rnti, target_eci, target_plmn, fwd_erabs, std::move(buffer));
} }
/** /**

43
srsenb/src/stack/upper/s1ap.cc
Unescape Escape View File

@ -58,6 +58,7 @@ s1ap::ue::ho_prep_proc_t::ho_prep_proc_t(s1ap::ue* ue_) : ue_ptr(ue_), s1ap_ptr(
srslte::proc_outcome_t s1ap::ue::ho_prep_proc_t::init(uint32_t target_eci_, srslte::proc_outcome_t s1ap::ue::ho_prep_proc_t::init(uint32_t target_eci_,
srslte::plmn_id_t target_plmn_, srslte::plmn_id_t target_plmn_,
srslte::span<uint32_t> fwd_erabs,
srslte::unique_byte_buffer_t rrc_container_) srslte::unique_byte_buffer_t rrc_container_)
{ {
ho_cmd_msg = nullptr; ho_cmd_msg = nullptr;
@ -65,7 +66,7 @@ srslte::proc_outcome_t s1ap::ue::ho_prep_proc_t::init(uint32_t
target_plmn = target_plmn_; target_plmn = target_plmn_;
procInfo("Sending HandoverRequired to MME id=%d", ue_ptr->ctxt.mme_ue_s1ap_id); procInfo("Sending HandoverRequired to MME id=%d", ue_ptr->ctxt.mme_ue_s1ap_id);
if (not ue_ptr->send_ho_required(target_eci, target_plmn, std::move(rrc_container_))) { if (not ue_ptr->send_ho_required(target_eci, target_plmn, fwd_erabs, std::move(rrc_container_))) {
procError("Failed to send HORequired to cell 0x%x", target_eci); procError("Failed to send HORequired to cell 0x%x", target_eci);
return srslte::proc_outcome_t::error; return srslte::proc_outcome_t::error;
} }
@ -569,7 +570,7 @@ bool s1ap::handle_initiatingmessage(const init_msg_s& msg)
case s1ap_elem_procs_o::init_msg_c::types_opts::ue_context_mod_request: case s1ap_elem_procs_o::init_msg_c::types_opts::ue_context_mod_request:
return handle_uecontextmodifyrequest(msg.value.ue_context_mod_request()); return handle_uecontextmodifyrequest(msg.value.ue_context_mod_request());
case s1ap_elem_procs_o::init_msg_c::types_opts::ho_request: case s1ap_elem_procs_o::init_msg_c::types_opts::ho_request:
return handle_ho_request(msg.value.ho_request()); return handle_handover_request(msg.value.ho_request());
case s1ap_elem_procs_o::init_msg_c::types_opts::mme_status_transfer: case s1ap_elem_procs_o::init_msg_c::types_opts::mme_status_transfer:
return handle_mme_status_transfer(msg.value.mme_status_transfer()); return handle_mme_status_transfer(msg.value.mme_status_transfer());
default: default:
@ -584,7 +585,7 @@ bool s1ap::handle_successfuloutcome(const successful_outcome_s& msg)
case s1ap_elem_procs_o::successful_outcome_c::types_opts::s1_setup_resp: case s1ap_elem_procs_o::successful_outcome_c::types_opts::s1_setup_resp:
return handle_s1setupresponse(msg.value.s1_setup_resp()); return handle_s1setupresponse(msg.value.s1_setup_resp());
case s1ap_elem_procs_o::successful_outcome_c::types_opts::ho_cmd: case s1ap_elem_procs_o::successful_outcome_c::types_opts::ho_cmd:
return handle_s1hocommand(msg.value.ho_cmd()); return handle_handover_command(msg.value.ho_cmd());
case s1ap_elem_procs_o::successful_outcome_c::types_opts::ho_cancel_ack: case s1ap_elem_procs_o::successful_outcome_c::types_opts::ho_cancel_ack:
return true; return true;
default: default:
@ -599,7 +600,7 @@ bool s1ap::handle_unsuccessfuloutcome(const unsuccessful_outcome_s& msg)
case s1ap_elem_procs_o::unsuccessful_outcome_c::types_opts::s1_setup_fail: case s1ap_elem_procs_o::unsuccessful_outcome_c::types_opts::s1_setup_fail:
return handle_s1setupfailure(msg.value.s1_setup_fail()); return handle_s1setupfailure(msg.value.s1_setup_fail());
case s1ap_elem_procs_o::unsuccessful_outcome_c::types_opts::ho_prep_fail: case s1ap_elem_procs_o::unsuccessful_outcome_c::types_opts::ho_prep_fail:
return handle_hopreparationfailure(msg.value.ho_prep_fail()); return handle_handover_preparation_failure(msg.value.ho_prep_fail());
default: default:
logger.error("Unhandled unsuccessful outcome message: %s", msg.value.type().to_string().c_str()); logger.error("Unhandled unsuccessful outcome message: %s", msg.value.type().to_string().c_str());
} }
@ -834,7 +835,7 @@ bool s1ap::handle_s1setupfailure(const asn1::s1ap::s1_setup_fail_s& msg)
return true; return true;
} }
bool s1ap::handle_hopreparationfailure(const ho_prep_fail_s& msg) bool s1ap::handle_handover_preparation_failure(const ho_prep_fail_s& msg)
{ {
ue* u = find_s1apmsg_user(msg.protocol_ies.enb_ue_s1ap_id.value.value, msg.protocol_ies.mme_ue_s1ap_id.value.value); ue* u = find_s1apmsg_user(msg.protocol_ies.enb_ue_s1ap_id.value.value, msg.protocol_ies.mme_ue_s1ap_id.value.value);
if (u == nullptr) { if (u == nullptr) {
@ -844,7 +845,7 @@ bool s1ap::handle_hopreparationfailure(const ho_prep_fail_s& msg)
return true; return true;
} }
bool s1ap::handle_s1hocommand(const asn1::s1ap::ho_cmd_s& msg) bool s1ap::handle_handover_command(const asn1::s1ap::ho_cmd_s& msg)
{ {
ue* u = find_s1apmsg_user(msg.protocol_ies.enb_ue_s1ap_id.value.value, msg.protocol_ies.mme_ue_s1ap_id.value.value); ue* u = find_s1apmsg_user(msg.protocol_ies.enb_ue_s1ap_id.value.value, msg.protocol_ies.mme_ue_s1ap_id.value.value);
if (u == nullptr) { if (u == nullptr) {
@ -858,7 +859,7 @@ bool s1ap::handle_s1hocommand(const asn1::s1ap::ho_cmd_s& msg)
* TS 36.413 - Section 8.4.2 - "Handover Resource Allocation" * TS 36.413 - Section 8.4.2 - "Handover Resource Allocation"
*************************************************************/ *************************************************************/
bool s1ap::handle_ho_request(const asn1::s1ap::ho_request_s& msg) bool s1ap::handle_handover_request(const asn1::s1ap::ho_request_s& msg)
{ {
uint16_t rnti = SRSLTE_INVALID_RNTI; uint16_t rnti = SRSLTE_INVALID_RNTI;
@ -1448,6 +1449,7 @@ bool s1ap::ue::send_ue_cap_info_indication(srslte::unique_byte_buffer_t ue_radio
bool s1ap::send_ho_required(uint16_t rnti, bool s1ap::send_ho_required(uint16_t rnti,
uint32_t target_eci, uint32_t target_eci,
srslte::plmn_id_t target_plmn, srslte::plmn_id_t target_plmn,
srslte::span<uint32_t> fwd_erabs,
srslte::unique_byte_buffer_t rrc_container) srslte::unique_byte_buffer_t rrc_container)
{ {
if (!mme_connected) { if (!mme_connected) {
@ -1459,7 +1461,7 @@ bool s1ap::send_ho_required(uint16_t rnti,
} }
// launch procedure // launch procedure
if (not u->ho_prep_proc.launch(target_eci, target_plmn, std::move(rrc_container))) { if (not u->ho_prep_proc.launch(target_eci, target_plmn, fwd_erabs, std::move(rrc_container))) {
logger.error("Failed to initiate an HandoverPreparation procedure for user rnti=0x%x", u->ctxt.rnti); logger.error("Failed to initiate an HandoverPreparation procedure for user rnti=0x%x", u->ctxt.rnti);
return false; return false;
} }
@ -1672,6 +1674,7 @@ s1ap::ue::ue(s1ap* s1ap_ptr_) : s1ap_ptr(s1ap_ptr_), ho_prep_proc(this), logger(
bool s1ap::ue::send_ho_required(uint32_t target_eci, bool s1ap::ue::send_ho_required(uint32_t target_eci,
srslte::plmn_id_t target_plmn, srslte::plmn_id_t target_plmn,
srslte::span<uint32_t> fwd_erabs,
srslte::unique_byte_buffer_t rrc_container) srslte::unique_byte_buffer_t rrc_container)
{ {
/*** Setup S1AP PDU as HandoverRequired ***/ /*** Setup S1AP PDU as HandoverRequired ***/
@ -1709,13 +1712,14 @@ bool s1ap::ue::send_ho_required(uint32_t target_eci,
transparent_cntr.erab_info_list_present = true; // TODO: CHECK transparent_cntr.erab_info_list_present = true; // TODO: CHECK
transparent_cntr.subscriber_profile_idfor_rfp_present = false; // TODO: CHECK transparent_cntr.subscriber_profile_idfor_rfp_present = false; // TODO: CHECK
// FIXME: Hardcoded ERABs transparent_cntr.erab_info_list.resize(fwd_erabs.size());
transparent_cntr.erab_info_list.resize(1); for (uint32_t i = 0; i < fwd_erabs.size(); ++i) {
transparent_cntr.erab_info_list[0].load_info_obj(ASN1_S1AP_ID_ERAB_INFO_LIST_ITEM); transparent_cntr.erab_info_list[i].load_info_obj(ASN1_S1AP_ID_ERAB_INFO_LIST_ITEM);
transparent_cntr.erab_info_list[0].value.erab_info_list_item().erab_id = 5; transparent_cntr.erab_info_list[i].value.erab_info_list_item().erab_id = fwd_erabs[i];
transparent_cntr.erab_info_list[0].value.erab_info_list_item().dl_forwarding_present = true; transparent_cntr.erab_info_list[i].value.erab_info_list_item().dl_forwarding_present = true;
transparent_cntr.erab_info_list[0].value.erab_info_list_item().dl_forwarding.value = transparent_cntr.erab_info_list[i].value.erab_info_list_item().dl_forwarding.value =
dl_forwarding_opts::dl_forwarding_proposed; dl_forwarding_opts::dl_forwarding_proposed;
}
// - set target cell ID // - set target cell ID
target_plmn.to_s1ap_plmn_bytes(transparent_cntr.target_cell_id.plm_nid.data()); target_plmn.to_s1ap_plmn_bytes(transparent_cntr.target_cell_id.plm_nid.data());
transparent_cntr.target_cell_id.cell_id.from_number(target_eci); // [ENBID|CELLID|0] transparent_cntr.target_cell_id.cell_id.from_number(target_eci); // [ENBID|CELLID|0]
@ -1738,17 +1742,18 @@ bool s1ap::ue::send_ho_required(uint32_t target_eci,
transparent_cntr.rrc_container.resize(rrc_container->N_bytes); transparent_cntr.rrc_container.resize(rrc_container->N_bytes);
memcpy(transparent_cntr.rrc_container.data(), rrc_container->msg, rrc_container->N_bytes); memcpy(transparent_cntr.rrc_container.data(), rrc_container->msg, rrc_container->N_bytes);
/*** pack Transparent Container into HORequired message ***/ // pack Transparent Container into HORequired message
uint8_t buffer[4096]; srslte::unique_byte_buffer_t buffer = srslte::make_byte_buffer();
asn1::bit_ref bref(buffer, sizeof(buffer)); asn1::bit_ref bref(buffer->msg, buffer->get_tailroom());
if (transparent_cntr.pack(bref) != asn1::SRSASN_SUCCESS) { if (transparent_cntr.pack(bref) != asn1::SRSASN_SUCCESS) {
logger.error("Failed to pack transparent container of HO Required message"); logger.error("Failed to pack transparent container of HO Required message");
return false; return false;
} }
container.source_to_target_transparent_container.value.resize(bref.distance_bytes()); container.source_to_target_transparent_container.value.resize(bref.distance_bytes());
memcpy(container.source_to_target_transparent_container.value.data(), buffer, bref.distance_bytes()); memcpy(container.source_to_target_transparent_container.value.data(), buffer->msg, bref.distance_bytes());
return s1ap_ptr->sctp_send_s1ap_pdu(tx_pdu, ctxt.rnti, "HORequired"); // Send to HandoverRequired message to MME
return s1ap_ptr->sctp_send_s1ap_pdu(tx_pdu, ctxt.rnti, "Handover Required");
} }
bool s1ap::ue::send_enb_status_transfer_proc(std::vector<bearer_status_info>& bearer_status_list) bool s1ap::ue::send_enb_status_transfer_proc(std::vector<bearer_status_info>& bearer_status_list)

1
srsenb/test/common/dummy_classes.h
Unescape Escape View File

@ -103,6 +103,7 @@ public:
bool send_ho_required(uint16_t rnti, bool send_ho_required(uint16_t rnti,
uint32_t target_eci, uint32_t target_eci,
srslte::plmn_id_t target_plmn, srslte::plmn_id_t target_plmn,
srslte::span<uint32_t> fwd_erabs,
srslte::unique_byte_buffer_t rrc_container) override srslte::unique_byte_buffer_t rrc_container) override
{ {
return true; return true;

1
srsenb/test/upper/test_helpers.h
Unescape Escape View File

@ -83,6 +83,7 @@ public:
bool send_ho_required(uint16_t rnti, bool send_ho_required(uint16_t rnti,
uint32_t target_eci, uint32_t target_eci,
srslte::plmn_id_t target_plmn, srslte::plmn_id_t target_plmn,
srslte::span<uint32_t> fwd_erabs,
srslte::unique_byte_buffer_t rrc_container) final srslte::unique_byte_buffer_t rrc_container) final
{ {
last_ho_required = ho_req_data{rnti, target_eci, target_plmn, std::move(rrc_container)}; last_ho_required = ho_req_data{rnti, target_eci, target_plmn, std::move(rrc_container)};

Write Preview
Loading…
Cancel
Save