Skip to content

Commit d2fa125

Browse files
alvasManalvasMan
committed
f1u: rename f1u_gw_bearer to f1u_tx_notifier in DU and CU
1 parent 70a386a commit d2fa125

File tree

6 files changed

+45
-44
lines changed

6 files changed

+45
-44
lines changed

‎lib/cu_up/adapters/f1u_adapters.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#pragma once
1212

13+
#include "srsran/f1u/cu_up/f1u_gateway.h"
1314
#include "srsran/f1u/cu_up/f1u_rx_delivery_notifier.h"
1415
#include "srsran/f1u/cu_up/f1u_rx_sdu_notifier.h"
1516
#include "srsran/pdcp/pdcp_rx.h"
@@ -52,5 +53,24 @@ class f1u_pdcp_adapter final : public f1u_rx_sdu_notifier, public f1u_rx_deliver
5253
pdcp_tx_lower_interface* pdcp_tx_handler = nullptr;
5354
};
5455

56+
/// Adapter between NR-U and F1-U gateway adapter
57+
class f1u_gateway_rx_nru_adapter : public f1u_cu_up_gateway_bearer_rx_notifier
58+
{
59+
public:
60+
f1u_gateway_rx_nru_adapter() = default;
61+
~f1u_gateway_rx_nru_adapter() override = default;
62+
63+
void connect_nru_bearer(f1u_rx_pdu_handler& f1u_handler_) { f1u_handler = &f1u_handler_; }
64+
65+
void on_new_pdu(nru_ul_message msg) override
66+
{
67+
srsran_assert(f1u_handler != nullptr, "GTP-U handler must not be nullptr");
68+
f1u_handler->handle_pdu(std::move(msg));
69+
}
70+
71+
private:
72+
f1u_rx_pdu_handler* f1u_handler = nullptr;
73+
};
74+
5575
} // namespace srs_cu_up
5676
} // namespace srsran

‎lib/cu_up/adapters/gw_adapters.h‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,4 @@ class network_gateway_data_gtpu_demux_adapter : public srsran::network_gateway_d
4141
gtpu_demux_rx_upper_layer_interface* gtpu_demux = nullptr;
4242
};
4343

44-
/// Adapter between NR-U and F1-U gateway adapter
45-
class f1u_gateway_rx_nru_adapter : public f1u_cu_up_gateway_bearer_rx_notifier
46-
{
47-
public:
48-
f1u_gateway_rx_nru_adapter() = default;
49-
~f1u_gateway_rx_nru_adapter() override = default;
50-
51-
void connect_nru_bearer(f1u_rx_pdu_handler& f1u_handler_) { f1u_handler = &f1u_handler_; }
52-
53-
void on_new_pdu(nru_ul_message msg) override
54-
{
55-
srsran_assert(f1u_handler != nullptr, "GTP-U handler must not be nullptr");
56-
f1u_handler->handle_pdu(std::move(msg));
57-
}
58-
59-
private:
60-
f1u_rx_pdu_handler* f1u_handler = nullptr;
61-
};
62-
6344
} // namespace srsran::srs_cu_up

‎lib/cu_up/drb_context.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct drb_context {
3232
gtpu_teid_t f1u_ul_teid;
3333
f1u_config f1u_cfg;
3434

35-
std::unique_ptr<srs_cu_up::f1u_tx_pdu_notifier> f1u_gw_bearer;
35+
std::unique_ptr<srs_cu_up::f1u_tx_pdu_notifier> f1u_tx_notifier;
3636
std::unique_ptr<f1u_bearer> f1u;
3737
std::unique_ptr<pdcp_entity> pdcp;
3838

‎lib/cu_up/pdu_session_manager_impl.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -201,20 +201,20 @@ drb_setup_result pdu_session_manager_impl::handle_drb_to_setup_item(pdu_session&
201201
up_transport_layer_info f1u_ul_tunnel_addr(transport_layer_address::create_from_string(net_config.f1u_bind_addr),
202202
f1u_ul_teid);
203203

204-
new_drb->f1u_gw_bearer = f1u_gw.create_cu_bearer(ue_index,
205-
drb_to_setup.drb_id,
206-
new_drb->f1u_cfg,
207-
f1u_ul_tunnel_addr,
208-
new_drb->f1u_gateway_rx_to_nru_adapter,
209-
ue_ul_exec,
210-
ue_dl_timer_factory,
211-
ue_inactivity_timer);
204+
new_drb->f1u_tx_notifier = f1u_gw.create_cu_bearer(ue_index,
205+
drb_to_setup.drb_id,
206+
new_drb->f1u_cfg,
207+
f1u_ul_tunnel_addr,
208+
new_drb->f1u_gateway_rx_to_nru_adapter,
209+
ue_ul_exec,
210+
ue_dl_timer_factory,
211+
ue_inactivity_timer);
212212

213213
new_drb->f1u = srs_cu_up::create_f1u_bearer(ue_index,
214214
new_drb->drb_id,
215215
f1u_ul_tunnel_addr,
216216
new_drb->f1u_cfg,
217-
*new_drb->f1u_gw_bearer,
217+
*new_drb->f1u_tx_notifier,
218218
new_drb->f1u_to_pdcp_adapter,
219219
new_drb->f1u_to_pdcp_adapter,
220220
ue_dl_timer_factory,
@@ -404,20 +404,20 @@ pdu_session_manager_impl::modify_pdu_session(const e1ap_pdu_session_res_to_modif
404404
drb->f1u_ul_teid);
405405

406406
// create new F1-U and connect it. This will automatically disconnect the old F1-U.
407-
drb->f1u_gw_bearer = f1u_gw.create_cu_bearer(ue_index,
408-
drb->drb_id,
409-
drb->f1u_cfg,
410-
f1u_ul_tunnel_addr,
411-
drb->f1u_gateway_rx_to_nru_adapter,
412-
ue_ul_exec,
413-
ue_dl_timer_factory,
414-
ue_inactivity_timer);
407+
drb->f1u_tx_notifier = f1u_gw.create_cu_bearer(ue_index,
408+
drb->drb_id,
409+
drb->f1u_cfg,
410+
f1u_ul_tunnel_addr,
411+
drb->f1u_gateway_rx_to_nru_adapter,
412+
ue_ul_exec,
413+
ue_dl_timer_factory,
414+
ue_inactivity_timer);
415415

416416
drb->f1u = srs_cu_up::create_f1u_bearer(ue_index,
417417
drb->drb_id,
418418
f1u_ul_tunnel_addr,
419419
drb->f1u_cfg,
420-
*drb->f1u_gw_bearer,
420+
*drb->f1u_tx_notifier,
421421
drb->f1u_to_pdcp_adapter,
422422
drb->f1u_to_pdcp_adapter,
423423
ue_dl_timer_factory,

‎lib/du_manager/du_ue/du_bearer.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ std::unique_ptr<du_ue_drb> srsran::srs_du::create_drb(const drb_creation_info& d
148148
drb->uluptnl_info_list.assign(drb_info.uluptnl_info_list.begin(), drb_info.uluptnl_info_list.end());
149149
drb->dluptnl_info_list.assign(dluptnl_info_list.begin(), dluptnl_info_list.end());
150150

151-
drb->f1u_gw_bearer = drb_info.du_params.f1u.f1u_gw.create_du_bearer(
151+
drb->f1u_tx_notifier = drb_info.du_params.f1u.f1u_gw.create_du_bearer(
152152
ue_index,
153153
drb->drb_id,
154154
drb->f1u_cfg,
@@ -157,7 +157,7 @@ std::unique_ptr<du_ue_drb> srsran::srs_du::create_drb(const drb_creation_info& d
157157
drb->connector.f1u_gateway_nru_rx_notif,
158158
timer_factory{drb_info.du_params.services.timers, drb_info.du_params.services.ue_execs.ctrl_executor(ue_index)},
159159
drb_info.du_params.services.ue_execs.f1u_dl_pdu_executor(ue_index));
160-
if (drb->f1u_gw_bearer == nullptr) {
160+
if (drb->f1u_tx_notifier == nullptr) {
161161
srslog::fetch_basic_logger("DU-MNG").warning("ue={}: Failed to connect F1-U GW bearer to CU-UP.", ue_index);
162162
return nullptr;
163163
}
@@ -169,14 +169,14 @@ std::unique_ptr<du_ue_drb> srsran::srs_du::create_drb(const drb_creation_info& d
169169
f1u_msg.config = drb->f1u_cfg;
170170
f1u_msg.dl_tnl_info = drb->dluptnl_info_list[0];
171171
f1u_msg.rx_sdu_notifier = &drb->connector.f1u_rx_sdu_notif;
172-
f1u_msg.tx_pdu_notifier = drb->f1u_gw_bearer.get();
172+
f1u_msg.tx_pdu_notifier = drb->f1u_tx_notifier.get();
173173
f1u_msg.timers =
174174
timer_factory{drb_info.du_params.services.timers, drb_info.du_params.services.ue_execs.ctrl_executor(ue_index)};
175175
f1u_msg.ue_executor = &drb_info.du_params.services.ue_execs.f1u_dl_pdu_executor(ue_index);
176176
f1u_msg.disconnector = &drb_info.du_params.f1u.f1u_gw;
177177

178178
drb->drb_f1u = srs_du::create_f1u_bearer(f1u_msg);
179-
if (drb->f1u_gw_bearer == nullptr) {
179+
if (drb->f1u_tx_notifier == nullptr) {
180180
srslog::fetch_basic_logger("DU-MNG").warning("ue={}: Failed to create F1-U bearer.", ue_index);
181181
return nullptr;
182182
}
@@ -200,7 +200,7 @@ std::unique_ptr<du_ue_drb> srsran::srs_du::create_drb(const drb_creation_info& d
200200
drb->connector.connect(ue_index,
201201
drb->drb_id,
202202
drb->lcid,
203-
*drb->f1u_gw_bearer,
203+
*drb->f1u_tx_notifier,
204204
*drb->drb_f1u,
205205
*drb->rlc_bearer,
206206
drb_info.du_params.rlc.mac_ue_info_handler);

‎lib/du_manager/du_ue/du_bearer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ struct du_ue_drb {
100100
rlc_config rlc_cfg;
101101
mac_lc_config mac_cfg;
102102
f1u_config f1u_cfg;
103-
std::unique_ptr<srs_du::f1u_tx_pdu_notifier> f1u_gw_bearer;
103+
std::unique_ptr<srs_du::f1u_tx_pdu_notifier> f1u_tx_notifier;
104104
std::unique_ptr<f1u_bearer> drb_f1u;
105105
std::unique_ptr<rlc_entity> rlc_bearer;
106106
du_drb_connector connector;

0 commit comments

Comments
 (0)