mirror of https://github.com/PentHertz/srsLTE.git
created separate files to handle rrc bearers
This commit is contained in:
Francisco Paisana
Francisco Paisana
parent
65abcd2903
commit
c65c081b51
|
|
@ -0,0 +1,104 @@
|
|||
/*
|
||||
* Copyright 2013-2020 Software Radio Systems Limited
|
||||
*
|
||||
* This file is part of srsLTE.
|
||||
*
|
||||
* srsLTE is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* srsLTE is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* A copy of the GNU Affero General Public License can be found in
|
||||
* the LICENSE file in the top-level directory of this distribution
|
||||
* and at http://www.gnu.org/licenses/.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef SRSLTE_RRC_CFG_UTILS_H
|
||||
#define SRSLTE_RRC_CFG_UTILS_H
|
||||
|
||||
#include "srslte/asn1/rrc_asn1.h"
|
||||
|
||||
namespace srslte {
|
||||
|
||||
//! convenience function overload to extract rrc fields Id
|
||||
constexpr uint8_t get_id(const asn1::rrc::srb_to_add_mod_s& obj)
|
||||
{
|
||||
return obj.srb_id;
|
||||
}
|
||||
constexpr uint8_t get_id(const asn1::rrc::drb_to_add_mod_s& obj)
|
||||
{
|
||||
return obj.drb_id;
|
||||
}
|
||||
|
||||
//! Functor to compare RRC config elements (e.g. SRB/measObj/Rep) based on ID
|
||||
template <typename T>
|
||||
struct field_id_cmp {
|
||||
bool operator()(const T& lhs, const T& rhs) const { return get_id(lhs) < get_id(rhs); }
|
||||
template <typename IdType>
|
||||
bool operator()(const T& lhs, IdType id) const
|
||||
{
|
||||
return get_id(lhs) < id;
|
||||
}
|
||||
template <typename IdType>
|
||||
bool operator()(IdType id, const T& rhs) const
|
||||
{
|
||||
return id < get_id(rhs);
|
||||
}
|
||||
};
|
||||
using srb_id_cmp = field_id_cmp<asn1::rrc::srb_to_add_mod_s>;
|
||||
using drb_id_cmp = field_id_cmp<asn1::rrc::drb_to_add_mod_s>;
|
||||
|
||||
//! Search of rrc cfg element based on ID. Assumes sorted list.
|
||||
template <typename Container, typename IdType>
|
||||
typename Container::iterator binary_find(Container& c, IdType id)
|
||||
{
|
||||
auto it = std::lower_bound(c.begin(), c.end(), id, field_id_cmp<decltype(*c.begin())>{});
|
||||
return (it == c.end() or get_id(*it) != id) ? c.end() : it;
|
||||
}
|
||||
template <typename Container, typename IdType>
|
||||
typename Container::const_iterator binary_find(const Container& c, IdType id)
|
||||
{
|
||||
auto it = std::lower_bound(c.begin(), c.end(), id, field_id_cmp<decltype(*c.begin())>{});
|
||||
return (it == c.end() or get_id(*it) != id) ? c.end() : it;
|
||||
}
|
||||
|
||||
//! Update RRC field toAddModList
|
||||
template <typename List, typename RemFunctor, typename AddFunctor, typename ModFunctor>
|
||||
void apply_cfg_list_updates(List& src_list,
|
||||
List& target_list,
|
||||
RemFunctor rem_func,
|
||||
AddFunctor add_func,
|
||||
ModFunctor mod_func)
|
||||
{
|
||||
// Sort by ID
|
||||
std::sort(src_list.begin(), src_list.end(), field_id_cmp<decltype(*src_list.begin())>{});
|
||||
std::sort(target_list.begin(), target_list.end(), field_id_cmp<decltype(*target_list.begin())>{});
|
||||
|
||||
auto src_it = src_list.begin();
|
||||
auto target_it = target_list.begin();
|
||||
|
||||
bool src_left = src_it != src_list.end();
|
||||
bool target_left = target_it != target_list.end();
|
||||
while (src_left or target_left) {
|
||||
if (not target_left or (src_left and get_id(*src_it) < get_id(*target_it))) {
|
||||
rem_func(src_it++);
|
||||
} else if (not src_left or (target_left and get_id(*src_it) > get_id(*target_it))) {
|
||||
// a new object has been added to target
|
||||
add_func(target_it++);
|
||||
} else {
|
||||
mod_func(src_it++, target_it++);
|
||||
}
|
||||
src_left = src_it != src_list.end();
|
||||
target_left = target_it != target_list.end();
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace srslte
|
||||
|
||||
#endif // SRSLTE_RRC_CFG_UTILS_H
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
/*
|
||||
* Copyright 2013-2020 Software Radio Systems Limited
|
||||
*
|
||||
* This file is part of srsLTE.
|
||||
*
|
||||
* srsLTE is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* srsLTE is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* A copy of the GNU Affero General Public License can be found in
|
||||
* the LICENSE file in the top-level directory of this distribution
|
||||
* and at http://www.gnu.org/licenses/.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef SRSLTE_RRC_UE_H
|
||||
#define SRSLTE_RRC_UE_H
|
||||
|
||||
#include "srsenb/hdr/stack/rrc/rrc_config.h"
|
||||
#include "srslte/common/logmap.h"
|
||||
#include "srslte/interfaces/enb_interfaces.h"
|
||||
#include "srslte/interfaces/enb_rrc_interface_types.h"
|
||||
#include <set>
|
||||
|
||||
namespace srsenb {
|
||||
|
||||
class bearer_handler
|
||||
{
|
||||
public:
|
||||
struct erab_t {
|
||||
uint8_t id;
|
||||
asn1::s1ap::erab_level_qos_params_s qos_params;
|
||||
asn1::bounded_bitstring<1, 160, true, true> address;
|
||||
uint32_t teid_out;
|
||||
uint32_t teid_in;
|
||||
};
|
||||
|
||||
bearer_handler(uint16_t rnti_,
|
||||
const rrc_cfg_t& cfg_,
|
||||
pdcp_interface_rrc* pdcp_,
|
||||
rlc_interface_rrc* rlc_,
|
||||
gtpu_interface_rrc* gtpu_);
|
||||
|
||||
void setup_srb(uint8_t srb_id);
|
||||
int setup_erab(uint8_t id,
|
||||
const asn1::s1ap::erab_level_qos_params_s& qos,
|
||||
const asn1::bounded_bitstring<1, 160, true, true>& addr,
|
||||
uint32_t teid_out,
|
||||
const asn1::unbounded_octstring<true>* nas_pdu);
|
||||
|
||||
void fill_rrc_setup(asn1::rrc::rrc_conn_setup_r8_ies_s* msg);
|
||||
void fill_rrc_reconf(asn1::rrc::rrc_conn_recfg_r8_ies_s* msg);
|
||||
|
||||
private:
|
||||
bool fill_srb_to_add_mod_list(asn1::rrc::rr_cfg_ded_s* msg);
|
||||
bool fill_drb_to_add_mod_list(asn1::rrc::rr_cfg_ded_s* msg);
|
||||
void apply_bearer_updates(const asn1::rrc::rr_cfg_ded_s& msg);
|
||||
void fill_pending_nas_info(asn1::rrc::rrc_conn_recfg_r8_ies_s* msg);
|
||||
|
||||
srslte::log_ref log_h{"RRC"};
|
||||
uint16_t rnti;
|
||||
const rrc_cfg_t* cfg;
|
||||
pdcp_interface_rrc* pdcp;
|
||||
rlc_interface_rrc* rlc;
|
||||
gtpu_interface_rrc* gtpu;
|
||||
srslte::byte_buffer_pool* pool = nullptr;
|
||||
|
||||
std::map<uint8_t, srslte::unique_byte_buffer_t> erab_info_list;
|
||||
std::map<uint8_t, erab_t> erabs;
|
||||
asn1::rrc::srb_to_add_mod_list_l current_srbs;
|
||||
asn1::rrc::drb_to_add_mod_list_l current_drbs;
|
||||
|
||||
// last cfg
|
||||
asn1::rrc::srb_to_add_mod_list_l last_srbs;
|
||||
asn1::rrc::drb_to_add_mod_list_l last_drbs;
|
||||
};
|
||||
|
||||
} // namespace srsenb
|
||||
|
||||
#endif // SRSLTE_RRC_UE_H
|
||||
|
|
@ -18,5 +18,5 @@
|
|||
# and at http://www.gnu.org/licenses/.
|
||||
#
|
||||
|
||||
set(SOURCES rrc.cc rrc_mobility.cc rrc_cell_cfg.cc)
|
||||
add_library(srsenb_rrc STATIC ${SOURCES})
|
||||
set(SOURCES rrc.cc rrc_mobility.cc rrc_cell_cfg.cc rrc_ue.cc)
|
||||
add_library(srsenb_rrc STATIC ${SOURCES})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,235 @@
|
|||
/*
|
||||
* Copyright 2013-2020 Software Radio Systems Limited
|
||||
*
|
||||
* This file is part of srsLTE.
|
||||
*
|
||||
* srsLTE is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* srsLTE is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* A copy of the GNU Affero General Public License can be found in
|
||||
* the LICENSE file in the top-level directory of this distribution
|
||||
* and at http://www.gnu.org/licenses/.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "srsenb/hdr/stack/rrc/rrc_ue.h"
|
||||
#include "srslte/asn1/rrc_asn1_utils.h"
|
||||
#include "srslte/rrc/rrc_cfg_utils.h"
|
||||
|
||||
namespace srsenb {
|
||||
|
||||
using namespace asn1::rrc;
|
||||
|
||||
bearer_handler::bearer_handler(uint16_t rnti_,
|
||||
const rrc_cfg_t& cfg_,
|
||||
pdcp_interface_rrc* pdcp_,
|
||||
rlc_interface_rrc* rlc_,
|
||||
gtpu_interface_rrc* gtpu_) :
|
||||
rnti(rnti_),
|
||||
cfg(&cfg_),
|
||||
pdcp(pdcp_),
|
||||
rlc(rlc_),
|
||||
gtpu(gtpu_)
|
||||
{
|
||||
pool = srslte::byte_buffer_pool::get_instance();
|
||||
}
|
||||
|
||||
void bearer_handler::setup_srb(uint8_t srb_id)
|
||||
{
|
||||
if (srb_id > 2 or srb_id == 0) {
|
||||
log_h->error("Invalid SRB id=%d\n", srb_id);
|
||||
return;
|
||||
}
|
||||
|
||||
auto it = srslte::binary_find(current_srbs, srb_id);
|
||||
if (it == current_srbs.end()) {
|
||||
current_srbs.push_back({});
|
||||
it = current_srbs.end() - 1;
|
||||
it->srb_id = srb_id;
|
||||
}
|
||||
it->lc_ch_cfg_present = true;
|
||||
it->lc_ch_cfg.set(srb_to_add_mod_s::lc_ch_cfg_c_::types_opts::default_value);
|
||||
it->rlc_cfg_present = true;
|
||||
it->rlc_cfg.set(srb_to_add_mod_s::rlc_cfg_c_::types_opts::default_value);
|
||||
}
|
||||
|
||||
int bearer_handler::setup_erab(uint8_t erab_id,
|
||||
const asn1::s1ap::erab_level_qos_params_s& qos,
|
||||
const asn1::bounded_bitstring<1, 160, true, true>& addr,
|
||||
uint32_t teid_out,
|
||||
const asn1::unbounded_octstring<true>* nas_pdu)
|
||||
{
|
||||
if (erab_id < 5) {
|
||||
log_h->error("ERAB id=%d is invalid\n", erab_id);
|
||||
return SRSLTE_ERROR;
|
||||
}
|
||||
uint8_t lcid = erab_id - 2; // Map e.g. E-RAB 5 to LCID 3 (==DRB1)
|
||||
uint8_t drbid = erab_id - 4;
|
||||
|
||||
erabs[erab_id].id = erab_id;
|
||||
erabs[erab_id].qos_params = qos;
|
||||
erabs[erab_id].address = addr;
|
||||
erabs[erab_id].teid_out = teid_out;
|
||||
|
||||
if (addr.length() > 32) {
|
||||
log_h->error("Only addresses with length <= 32 are supported\n");
|
||||
return SRSLTE_ERROR;
|
||||
}
|
||||
|
||||
if (nas_pdu != nullptr) {
|
||||
erab_info_list[erab_id] = allocate_unique_buffer(*pool);
|
||||
memcpy(erab_info_list[erab_id]->msg, nas_pdu->data(), nas_pdu->size());
|
||||
erab_info_list[erab_id]->N_bytes = nas_pdu->size();
|
||||
log_h->info_hex(erab_info_list[erab_id]->msg,
|
||||
erab_info_list[erab_id]->N_bytes,
|
||||
"setup_erab nas_pdu -> erab_info rnti 0x%x",
|
||||
rnti);
|
||||
}
|
||||
|
||||
// Configure DRB
|
||||
auto drb_it = srslte::binary_find(current_drbs, drbid);
|
||||
if (drb_it == current_drbs.end()) {
|
||||
current_drbs.push_back({});
|
||||
drb_it = current_drbs.end() - 1;
|
||||
drb_it->drb_id = drbid;
|
||||
}
|
||||
drb_it->lc_ch_id_present = true;
|
||||
drb_it->lc_ch_id = (uint8_t)lcid;
|
||||
drb_it->eps_bearer_id_present = true;
|
||||
drb_it->eps_bearer_id = (uint8_t)erab_id;
|
||||
drb_it->lc_ch_cfg_present = true;
|
||||
drb_it->lc_ch_cfg.ul_specific_params_present = true;
|
||||
drb_it->lc_ch_cfg.ul_specific_params.lc_ch_group_present = true;
|
||||
drb_it->lc_ch_cfg.ul_specific_params = cfg->qci_cfg[qos.qci].lc_cfg;
|
||||
drb_it->pdcp_cfg_present = true;
|
||||
drb_it->pdcp_cfg = cfg->qci_cfg[qos.qci].pdcp_cfg;
|
||||
drb_it->rlc_cfg_present = true;
|
||||
drb_it->rlc_cfg = cfg->qci_cfg[qos.qci].rlc_cfg;
|
||||
|
||||
// Initialize ERAB in GTPU right-away. DRBs are only created during RRC setup/reconf
|
||||
uint32_t addr_ = addr.to_number();
|
||||
gtpu->add_bearer(rnti, lcid, addr_, erabs[erab_id].teid_out, &(erabs[erab_id].teid_in));
|
||||
return SRSLTE_SUCCESS;
|
||||
}
|
||||
|
||||
void bearer_handler::fill_rrc_setup(asn1::rrc::rrc_conn_setup_r8_ies_s* msg)
|
||||
{
|
||||
fill_srb_to_add_mod_list(&msg->rr_cfg_ded);
|
||||
last_srbs = current_srbs;
|
||||
|
||||
// Config RLC/PDCP
|
||||
apply_bearer_updates(msg->rr_cfg_ded);
|
||||
}
|
||||
|
||||
void bearer_handler::fill_rrc_reconf(asn1::rrc::rrc_conn_recfg_r8_ies_s* msg)
|
||||
{
|
||||
msg->rr_cfg_ded_present = true;
|
||||
fill_srb_to_add_mod_list(&msg->rr_cfg_ded);
|
||||
fill_drb_to_add_mod_list(&msg->rr_cfg_ded);
|
||||
fill_pending_nas_info(msg);
|
||||
last_srbs = current_srbs;
|
||||
last_drbs = current_drbs;
|
||||
|
||||
// Config RLC/PDCP
|
||||
apply_bearer_updates(msg->rr_cfg_ded);
|
||||
}
|
||||
|
||||
void bearer_handler::apply_bearer_updates(const asn1::rrc::rr_cfg_ded_s& msg)
|
||||
{
|
||||
if (msg.srb_to_add_mod_list_present) {
|
||||
for (const srb_to_add_mod_s& srb : msg.srb_to_add_mod_list) {
|
||||
// Configure SRB1 in RLC
|
||||
rlc->add_bearer(rnti, srb.srb_id, srslte::rlc_config_t::srb_config(srb.srb_id));
|
||||
|
||||
// Configure SRB1 in PDCP
|
||||
pdcp->add_bearer(rnti, srb.srb_id, srslte::make_srb_pdcp_config_t(srb.srb_id, false));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//! Update RadioConfigDedicated with the newly added/modified/removed SRBs
|
||||
bool bearer_handler::fill_srb_to_add_mod_list(rr_cfg_ded_s* msg)
|
||||
{
|
||||
msg->srb_to_add_mod_list_present = false;
|
||||
msg->srb_to_add_mod_list = {};
|
||||
|
||||
// Policies on Release/Add/Mod of each SRB
|
||||
auto on_rem = [](const srb_to_add_mod_s* removed_srb) {
|
||||
// Releasing SRBs not supported
|
||||
};
|
||||
auto on_add = [msg](const srb_to_add_mod_s* add_srb) {
|
||||
msg->srb_to_add_mod_list_present = true;
|
||||
msg->srb_to_add_mod_list.push_back(*add_srb);
|
||||
};
|
||||
auto on_update = [](const srb_to_add_mod_s* src_srb, const srb_to_add_mod_s* target_srb) {
|
||||
// TODO: Check if there is an update
|
||||
};
|
||||
|
||||
srslte::apply_cfg_list_updates(last_srbs, current_srbs, on_rem, on_add, on_update);
|
||||
return msg->srb_to_add_mod_list_present;
|
||||
}
|
||||
|
||||
//! Update RadioConfigDedicated with the newly added/modified/removed DRBs
|
||||
bool bearer_handler::fill_drb_to_add_mod_list(rr_cfg_ded_s* msg)
|
||||
{
|
||||
msg->drb_to_add_mod_list_present = false;
|
||||
msg->drb_to_release_list_present = false;
|
||||
msg->drb_to_add_mod_list.resize(0);
|
||||
msg->drb_to_release_list.resize(0);
|
||||
|
||||
// Policies on Release/Add/Mod of each DRB
|
||||
auto on_release = [msg](const drb_to_add_mod_s* released_drb) {
|
||||
msg->drb_to_release_list_present = true;
|
||||
msg->drb_to_release_list.push_back(released_drb->drb_id);
|
||||
};
|
||||
auto on_add = [msg](const drb_to_add_mod_s* added_drb) {
|
||||
msg->drb_to_add_mod_list_present = true;
|
||||
msg->drb_to_add_mod_list.push_back(*added_drb);
|
||||
};
|
||||
auto on_update = [](const drb_to_add_mod_s* src_drb, const drb_to_add_mod_s* target_drb) {
|
||||
// TODO: Check if there is an update
|
||||
};
|
||||
|
||||
srslte::apply_cfg_list_updates(last_drbs, current_drbs, on_release, on_add, on_update);
|
||||
return msg->drb_to_add_mod_list_present or msg->drb_to_release_list_present;
|
||||
}
|
||||
|
||||
void bearer_handler::fill_pending_nas_info(asn1::rrc::rrc_conn_recfg_r8_ies_s* msg)
|
||||
{
|
||||
// Add space for NAS messages
|
||||
uint8_t n_nas = erab_info_list.size();
|
||||
if (n_nas > 0) {
|
||||
msg->ded_info_nas_list_present = true;
|
||||
msg->ded_info_nas_list.resize(n_nas);
|
||||
}
|
||||
|
||||
uint32_t idx = 0;
|
||||
// DRBs have already been configured in GTPU during bearer setup
|
||||
// Add E-RAB info message for the E-RABs
|
||||
if (msg->rr_cfg_ded.drb_to_add_mod_list_present) {
|
||||
for (const drb_to_add_mod_s& drb : msg->rr_cfg_ded.drb_to_add_mod_list) {
|
||||
uint8_t erab_id = drb.drb_id + 4;
|
||||
auto it = erab_info_list.find(erab_id);
|
||||
if (it != erab_info_list.end()) {
|
||||
const srslte::unique_byte_buffer_t& erab_info = it->second;
|
||||
log_h->info_hex(
|
||||
erab_info->msg, erab_info->N_bytes, "connection_reconf erab_info -> nas_info rnti 0x%x\n", rnti);
|
||||
msg->ded_info_nas_list[idx].resize(erab_info->N_bytes);
|
||||
memcpy(msg->ded_info_nas_list[idx].data(), erab_info->msg, erab_info->N_bytes);
|
||||
erab_info_list.erase(it);
|
||||
} else {
|
||||
log_h->debug("Not adding NAS message to connection reconfiguration. E-RAB id %d\n", erab_id);
|
||||
}
|
||||
idx++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace srsenb
|
||||
Loading…
Reference in New Issue