ue: register PDU session at bearer manager to NAS doesn't trigger service request

* forward service request to NAS 5G in SA mode
* register PDU session at bearer manager so service request isn't triggered in the first place
* remove [TTI] from GW logs
This commit is contained in:
Andre Puschmann 2022-01-26 18:55:39 +01:00
parent c3596cc684
commit d71f4152cd
3 changed files with 10 additions and 2 deletions

View File

@ -1928,6 +1928,8 @@ bool rrc_nr::apply_drb_add_mod(const drb_to_add_mod_s& drb_cfg)
}
// TODO: configure SDAP accordingly
uint32_t pdu_session_id = drb_cfg.cn_assoc.sdap_cfg().pdu_session;
// Register PDU session as "EPS bearer" in bearer manager
stack->add_eps_bearer(pdu_session_id, srsran::srsran_rat_t::nr, lcid);
} else {
logger.error("CN association type not supported %s", drb_cfg.cn_assoc.type().to_string());
return false;

View File

@ -328,7 +328,13 @@ bool ue_stack_lte::disable_data()
bool ue_stack_lte::start_service_request()
{
if (running) {
ue_task_queue.try_push([this]() { nas.start_service_request(srsran::establishment_cause_t::mo_data); });
ue_task_queue.try_push([this]() {
if (args.attach_on_nr) {
nas_5g.start_service_request();
} else {
nas.start_service_request(srsran::establishment_cause_t::mo_data);
}
});
}
return true;
}

View File

@ -62,7 +62,7 @@ int ue::init(const all_args_t& args_)
return SRSRAN_ERROR;
}
std::unique_ptr<gw> gw_ptr(new gw(srslog::fetch_basic_logger("GW")));
std::unique_ptr<gw> gw_ptr(new gw(srslog::fetch_basic_logger("GW", false)));
if (!gw_ptr) {
srsran::console("Error creating a GW instance.\n");
return SRSRAN_ERROR;