Skip to content

Commit bab747e

Browse files
frankistcodebot
authored andcommitted
mac: fix test mode initialization of test mode ue
1 parent 5df5125 commit bab747e

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

lib/du_high/mac_test_mode_adapter.cpp

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ class test_cell_adapter : public mac_cell_control_information_handler
161161
{
162162
static constexpr size_t CQI_BITLEN = 4;
163163

164-
if (ue_cfg_req.cells->empty() or not(*ue_cfg_req.cells)[0].serv_cell_cfg.csi_meas_cfg.has_value()) {
164+
if (not ue_cfg_req.cells.has_value() or ue_cfg_req.cells->empty() or
165+
not(*ue_cfg_req.cells)[0].serv_cell_cfg.csi_meas_cfg.has_value()) {
165166
return;
166167
}
167168
payload.resize(0);
@@ -195,7 +196,7 @@ class test_cell_adapter : public mac_cell_control_information_handler
195196
mac_cell_control_information_handler& adapted;
196197
mac_pdu_handler& pdu_handler;
197198
std::function<void()> dl_bs_notifier;
198-
sched_ue_config_request ue_cfg_req;
199+
const sched_ue_config_request& ue_cfg_req;
199200
bool msg4_rx_flag = false;
200201
};
201202

@@ -257,22 +258,25 @@ mac_test_mode_adapter::adapt_bearers(const std::vector<mac_logical_channel_confi
257258

258259
async_task<mac_ue_create_response> mac_test_mode_adapter::handle_ue_create_request(const mac_ue_create_request& cfg)
259260
{
260-
mac_ue_create_request cfg_adapted = cfg;
261-
if (cfg_adapted.crnti == test_ue.rnti) {
261+
if (cfg.crnti == test_ue.rnti) {
262262
// It is the test UE.
263+
mac_ue_create_request cfg_copy = cfg;
263264

264265
// Save UE index.
265-
test_ue_index = cfg_adapted.ue_index;
266+
test_ue_index = cfg_copy.ue_index;
266267

267268
// Add adapters to the UE config bearers before passing it to MAC.
268-
cfg_adapted.bearers = adapt_bearers(cfg.bearers);
269+
cfg_copy.bearers = adapt_bearers(cfg.bearers);
269270

270271
// Save config of test mode UE.
271-
test_ue_cfg = cfg_adapted.sched_cfg;
272+
test_ue_cfg = cfg_copy.sched_cfg;
273+
274+
// Forward test UE creation request to MAC.
275+
return mac_adapted->get_ue_configurator().handle_ue_create_request(cfg_copy);
272276
}
273277

274-
// Forward UE creation request to MAC.
275-
return mac_adapted->get_ue_configurator().handle_ue_create_request(cfg_adapted);
278+
// Forward normal UE creation request to MAC.
279+
return mac_adapted->get_ue_configurator().handle_ue_create_request(cfg);
276280
}
277281

278282
async_task<mac_ue_reconfiguration_response>

0 commit comments

Comments
 (0)