maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor tun_if.h

Browse Source 
Use a common function for generating interface name. Use full interface
name in tun_if.h functions.
This commit is contained in:
Bartosz Podrygajlo
2025-02-07 12:25:35 +01:00
parent 0053a3d0f4
commit e61bf5132d
8 changed files with 123 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+22 -9
View File
@@ -2172,22 +2172,35 @@ uint64_t pdcp_module_init( uint64_t pdcp_optmask, int id) {
if (UE_NAS_USE_TUN) {
int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF) ? MAX_MOBILES_PER_ENB : 1;
tun_init("oaitun_ue", num_if, id);
tun_init_mbms("oaitun_uem", id + 1);
tun_config(1, "10.0.2.2", NULL, "oaitun_uem");
int begx = (id == 0) ? 0 : id - 1;
int endx = (id == 0) ? num_if : id;
for (int i = begx; i < endx; i++) {
char ifname[IFNAMSIZ];
tun_generate_ifname(ifname, "oaitun_ue", i);
tun_init(ifname, i);
}
char ifname[IFNAMSIZ];
tun_generate_ifname(ifname, "oaitun_uem", id + 1);
tun_init_mbms(ifname);
tun_config(ifname, "10.0.2.2", NULL);
LOG_I(PDCP, "UE pdcp will use tun interface\n");
} else if (ENB_NAS_USE_TUN) {
tun_init("oaitun_enb", 1, 0);
tun_config(1, "10.0.1.1", NULL, "oaitun_enb");
char ifname[IFNAMSIZ];
tun_generate_ifname(ifname, "oaitun_enb", 0);
tun_init(ifname, 0);
tun_config(ifname, "10.0.1.1", NULL);
if (pdcp_optmask & ENB_NAS_USE_TUN_W_MBMS_BIT) {
tun_init_mbms("oaitun_enm", 1);
tun_config(1, "10.0.2.1", NULL, "oaitun_enm");
tun_generate_ifname(ifname, "oaitun_enm", 0);
tun_init_mbms(ifname);
tun_config(ifname, "10.0.2.1", NULL);
LOG_I(PDCP, "ENB pdcp will use mbms tun interface\n");
}
LOG_I(PDCP, "ENB pdcp will use tun interface\n");
} else if (pdcp_optmask & ENB_NAS_USE_TUN_W_MBMS_BIT) {
tun_init_mbms("oaitun_enm", 0);
tun_config(1, "10.0.2.1", NULL, "oaitun_enm");
char ifname[IFNAMSIZ];
tun_generate_ifname(ifname, "oaitun_enm", 0);
tun_init_mbms(ifname);
tun_config(ifname, "10.0.2.1", NULL);
LOG_I(PDCP, "ENB pdcp will use mbms tun interface\n");
}