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

Properly calling init_tun and nas_conf for SA and NSA

Browse Source
This commit is contained in:
Melissa Elkadi
2021-10-26 09:56:09 -07:00
parent 99183b1761
commit 0f1723a485
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+7 -13
View File
@@ -413,24 +413,18 @@ uint64_t nr_pdcp_module_init(uint64_t _pdcp_optmask, int id)
nas_getparams(); nas_getparams();
if(UE_NAS_USE_TUN) { if(UE_NAS_USE_TUN) {
char *ifsuffix_ue = get_softmodem_params()->nsa ? "nrue" : "ue";
int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF)? MAX_MOBILES_PER_ENB : 1; int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF)? MAX_MOBILES_PER_ENB : 1;
netlink_init_tun("nrue", num_if, id); netlink_init_tun(ifsuffix_ue, num_if, id);
//Add --nr-ip-over-lte option check for next line //Add --nr-ip-over-lte option check for next line
if (IS_SOFTMODEM_NOS1 && get_softmodem_params()->nsa) if (IS_SOFTMODEM_NOS1)
nas_config(1, 1, 3, "nrue"); nas_config(1, 1, !get_softmodem_params()->nsa ? 2 : 3, ifsuffix_ue);
else if (IS_SOFTMODEM_NOS1)
nas_config(1, 1, 2, "ue");
LOG_I(PDCP, "UE pdcp will use tun interface\n"); LOG_I(PDCP, "UE pdcp will use tun interface\n");
start_pdcp_tun_ue(); start_pdcp_tun_ue();
} else if(ENB_NAS_USE_TUN) { } else if(ENB_NAS_USE_TUN) {
if (get_softmodem_params()->nsa) { char *ifsuffix_base_s = get_softmodem_params()->nsa ? "gnb" : "enb";
netlink_init_tun("gnb", 1, id); netlink_init_tun(ifsuffix_base_s, 1, id);
nas_config(1, 1, 1, "gnb"); nas_config(1, 1, 1, ifsuffix_base_s);
}
else {
netlink_init_tun("enb", 1, id);
nas_config(1, 1, 1, "enb");
}
LOG_I(PDCP, "ENB pdcp will use tun interface\n"); LOG_I(PDCP, "ENB pdcp will use tun interface\n");
start_pdcp_tun_enb(); start_pdcp_tun_enb();
} else { } else {