Fix packing/unpacking for (n)FAPI PARAM and CONFIG.request/response
- Fix 4G and 5G discrepancy in TLV padding requirements: 4G does not need padding, whereas 5G needs, so make separate set of function for padding for NR - Fix packing/unpacking for (n)FAPI PARAM and CONFIG.request/response messages - Handle message padding to next 32-bit boundary, as per SCF specification in packing and unpacking functions - Account for message header size upon receiving message in PNF and VNF
This commit is contained in:
Rúben Soares da Silva
committed by
Robert Schmidt
Robert Schmidt
parent
e70213cdf7
commit
09d7487dc1
@@ -250,7 +250,8 @@ void *pnf_nr_p7_thread_start(void *ptr) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int pnf_nr_param_request(nfapi_pnf_config_t *config, nfapi_nr_pnf_param_request_t *req) {
|
||||
int pnf_nr_param_request(nfapi_pnf_config_t *config, nfapi_nr_pnf_param_request_t *req)
|
||||
{
|
||||
printf("[PNF] pnf param request\n");
|
||||
nfapi_nr_pnf_param_response_t resp;
|
||||
memset(&resp, 0, sizeof(resp));
|
||||
@@ -271,10 +272,11 @@ int pnf_nr_param_request(nfapi_pnf_config_t *config, nfapi_nr_pnf_param_request_
|
||||
resp.pnf_param_general.shared_bands = pnf->shared_bands;
|
||||
resp.pnf_param_general.shared_pa = pnf->shared_pa;
|
||||
resp.pnf_param_general.maximum_total_power = pnf->max_total_power;
|
||||
resp.num_tlvs = 1;
|
||||
resp.pnf_phy.tl.tag = NFAPI_PNF_PHY_TAG;
|
||||
resp.pnf_phy.number_of_phys = 1;
|
||||
|
||||
for(int i = 0; i < 1; ++i) {
|
||||
for (int i = 0; i < 1; ++i) {
|
||||
resp.pnf_phy.phy[i].phy_config_index = pnf->phys[i].index;
|
||||
resp.pnf_phy.phy[i].downlink_channel_bandwidth_supported = pnf->phys[i].dl_channel_bw_support;
|
||||
resp.pnf_phy.phy[i].uplink_channel_bandwidth_supported = pnf->phys[i].ul_channel_bw_support;
|
||||
@@ -284,21 +286,21 @@ int pnf_nr_param_request(nfapi_pnf_config_t *config, nfapi_nr_pnf_param_request_
|
||||
resp.pnf_phy.phy[i].nmm_modes_supported = pnf->phys[i].nmm_modes_supported;
|
||||
resp.pnf_phy.phy[i].number_of_rfs = 2;
|
||||
|
||||
for(int j = 0; j < 1; ++j) {
|
||||
for (int j = 0; j < 1; ++j) {
|
||||
resp.pnf_phy.phy[i].rf_config[j].rf_config_index = pnf->phys[i].rfs[j];
|
||||
}
|
||||
|
||||
resp.pnf_phy.phy[i].number_of_rf_exclusions = 0;
|
||||
|
||||
for(int j = 0; j < 0; ++j) {
|
||||
for (int j = 0; j < 0; ++j) {
|
||||
resp.pnf_phy.phy[i].excluded_rf_config[j].rf_config_index = pnf->phys[i].excluded_rfs[j];
|
||||
}
|
||||
resp.num_tlvs++;
|
||||
}
|
||||
nfapi_nr_pnf_pnf_param_resp(config, &resp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int pnf_param_request(nfapi_pnf_config_t *config, nfapi_pnf_param_request_t *req) {
|
||||
printf("[PNF] pnf param request\n");
|
||||
nfapi_pnf_param_response_t resp;
|
||||
@@ -989,33 +991,35 @@ int config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfap
|
||||
return 0;
|
||||
}
|
||||
|
||||
int nr_config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi_nr_config_request_scf_t *req)
|
||||
int nr_config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi_nr_config_request_scf_t *req)
|
||||
{
|
||||
printf("[PNF] Received NFAPI_CONFIG_REQ phy_id:%d\n", req->header.phy_id);
|
||||
pnf_info *pnf = (pnf_info *)(config->user_data);
|
||||
uint8_t num_tlv = 0;
|
||||
//struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
|
||||
// In the case of nfapi_mode = 3 (UE = PNF) we should not have dependency on any eNB var. So we aim
|
||||
// to keep only the necessary just to keep the nfapi FSM rolling by sending a dummy response.
|
||||
// struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
|
||||
// In the case of nfapi_mode = 3 (UE = PNF) we should not have dependency on any eNB var. So we aim
|
||||
// to keep only the necessary just to keep the nfapi FSM rolling by sending a dummy response.
|
||||
NR_DL_FRAME_PARMS *fp;
|
||||
|
||||
if (NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
|
||||
if (NFAPI_MODE != NFAPI_UE_STUB_PNF) {
|
||||
struct PHY_VARS_gNB_s *gNB = RC.gNB[0];
|
||||
fp = &gNB->frame_parms;
|
||||
} else {
|
||||
fp = (NR_DL_FRAME_PARMS *) malloc(sizeof(NR_DL_FRAME_PARMS));
|
||||
fp = (NR_DL_FRAME_PARMS *)malloc(sizeof(NR_DL_FRAME_PARMS));
|
||||
}
|
||||
|
||||
phy_info *phy_info = pnf->phys;
|
||||
|
||||
printf("\nTiming window tag: %d\n",NFAPI_NR_NFAPI_TIMING_WINDOW_TAG);
|
||||
if(req->nfapi_config.timing_window.tl.tag == NFAPI_NR_NFAPI_TIMING_WINDOW_TAG) {
|
||||
printf("\nTiming window tag: %d\n", NFAPI_NR_NFAPI_TIMING_WINDOW_TAG);
|
||||
if (req->nfapi_config.timing_window.tl.tag == NFAPI_NR_NFAPI_TIMING_WINDOW_TAG) {
|
||||
phy_info->timing_window = req->nfapi_config.timing_window.value;
|
||||
printf("Phy_info:Timing window:%u NFAPI_CONFIG:timing_window:%u\n", phy_info->timing_window, req->nfapi_config.timing_window.value);
|
||||
printf("Phy_info:Timing window:%u NFAPI_CONFIG:timing_window:%u\n",
|
||||
phy_info->timing_window,
|
||||
req->nfapi_config.timing_window.value);
|
||||
num_tlv++;
|
||||
}
|
||||
|
||||
if(req->nfapi_config.timing_info_mode.tl.tag == NFAPI_NR_NFAPI_TIMING_INFO_MODE_TAG) {
|
||||
if (req->nfapi_config.timing_info_mode.tl.tag == NFAPI_NR_NFAPI_TIMING_INFO_MODE_TAG) {
|
||||
printf("timing info mode:%d\n", req->nfapi_config.timing_info_mode.value);
|
||||
phy_info->timing_info_mode = req->nfapi_config.timing_info_mode.value;
|
||||
num_tlv++;
|
||||
@@ -1023,8 +1027,8 @@ int nr_config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, n
|
||||
phy_info->timing_info_mode = 0;
|
||||
printf("NO timing info mode provided\n");
|
||||
}
|
||||
//TODO: Read the P7 message offset values
|
||||
if(req->nfapi_config.timing_info_period.tl.tag == NFAPI_NR_NFAPI_TIMING_INFO_PERIOD_TAG) {
|
||||
// TODO: Read the P7 message offset values
|
||||
if (req->nfapi_config.timing_info_period.tl.tag == NFAPI_NR_NFAPI_TIMING_INFO_PERIOD_TAG) {
|
||||
printf("timing info period provided value:%d\n", req->nfapi_config.timing_info_period.value);
|
||||
phy_info->timing_info_period = req->nfapi_config.timing_info_period.value;
|
||||
num_tlv++;
|
||||
@@ -1032,18 +1036,18 @@ int nr_config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, n
|
||||
phy_info->timing_info_period = 0;
|
||||
}
|
||||
|
||||
if(req->carrier_config.dl_bandwidth.tl.tag == NFAPI_NR_CONFIG_DL_BANDWIDTH_TAG) {
|
||||
phy_info->dl_channel_bw_support = req->carrier_config.dl_bandwidth.value; //rf_config.dl_channel_bandwidth.value;
|
||||
fp->N_RB_DL = req->carrier_config.dl_bandwidth.value; //rf_config.dl_channel_bandwidth.value;
|
||||
if (req->carrier_config.dl_bandwidth.tl.tag == NFAPI_NR_CONFIG_DL_BANDWIDTH_TAG) {
|
||||
phy_info->dl_channel_bw_support = req->carrier_config.dl_bandwidth.value; // rf_config.dl_channel_bandwidth.value;
|
||||
fp->N_RB_DL = req->carrier_config.dl_bandwidth.value; // rf_config.dl_channel_bandwidth.value;
|
||||
num_tlv++;
|
||||
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s() NFAPI_NR_CONFIG_DL_BANDWIDTH_TAG N_RB_DL:%u\n", __FUNCTION__, fp->N_RB_DL);
|
||||
} else {
|
||||
} else {
|
||||
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s() Missing NFAPI_NR_CONFIG_DL_BANDWIDTH_TAG\n", __FUNCTION__);
|
||||
}
|
||||
|
||||
if(req->carrier_config.uplink_bandwidth.tl.tag == NFAPI_NR_CONFIG_UPLINK_BANDWIDTH_TAG) {
|
||||
phy_info->ul_channel_bw_support = req->carrier_config.uplink_bandwidth.value; //req->rf_config.ul_channel_bandwidth.value;
|
||||
fp->N_RB_UL = req->carrier_config.uplink_bandwidth.value; //req->rf_config.ul_channel_bandwidth.value;
|
||||
if (req->carrier_config.uplink_bandwidth.tl.tag == NFAPI_NR_CONFIG_UPLINK_BANDWIDTH_TAG) {
|
||||
phy_info->ul_channel_bw_support = req->carrier_config.uplink_bandwidth.value; // req->rf_config.ul_channel_bandwidth.value;
|
||||
fp->N_RB_UL = req->carrier_config.uplink_bandwidth.value; // req->rf_config.ul_channel_bandwidth.value;
|
||||
num_tlv++;
|
||||
}
|
||||
|
||||
@@ -1052,12 +1056,12 @@ int nr_config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, n
|
||||
num_tlv++;
|
||||
}
|
||||
|
||||
if(NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
|
||||
if (NFAPI_MODE != NFAPI_UE_STUB_PNF) {
|
||||
printf("[PNF] CONFIG_REQUEST[num_tlv:%d] TLVs processed:%d\n", req->num_tlv, num_tlv);
|
||||
printf("[PNF] Simulating PHY CONFIG\n");
|
||||
NR_PHY_Config_t nr_phy_config;
|
||||
nr_phy_config.Mod_id = 0;
|
||||
nr_phy_config.CC_id=0;
|
||||
nr_phy_config.CC_id = 0;
|
||||
nr_phy_config.cfg = req;
|
||||
nr_phy_config_request(&nr_phy_config);
|
||||
nr_dump_frame_parms(fp);
|
||||
@@ -1066,19 +1070,28 @@ int nr_config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, n
|
||||
struct sockaddr_in vnf_p7_sockaddr;
|
||||
memcpy(&vnf_p7_sockaddr.sin_addr.s_addr, &(req->nfapi_config.p7_vnf_address_ipv4.address[0]), 4);
|
||||
phy_info->remote_addr = inet_ntoa(vnf_p7_sockaddr.sin_addr);
|
||||
printf("[PNF] %d vnf p7 %s:%d timing %d %d %d\n", phy_info->id, phy_info->remote_addr, phy_info->remote_port,
|
||||
phy_info->timing_window, phy_info->timing_info_mode, phy_info->timing_info_period);
|
||||
printf("[PNF] %d vnf p7 %s:%d timing %d %d %d\n",
|
||||
phy_info->id,
|
||||
phy_info->remote_addr,
|
||||
phy_info->remote_port,
|
||||
phy_info->timing_window,
|
||||
phy_info->timing_info_mode,
|
||||
phy_info->timing_info_period);
|
||||
nfapi_nr_config_response_scf_t nfapi_resp;
|
||||
memset(&nfapi_resp, 0, sizeof(nfapi_resp));
|
||||
nfapi_resp.header.message_id = NFAPI_NR_PHY_MSG_TYPE_CONFIG_RESPONSE;
|
||||
nfapi_resp.header.phy_id = phy_info->id;
|
||||
nfapi_resp.error_code = 0;
|
||||
nfapi_resp.num_invalid_tlvs = 0;
|
||||
nfapi_resp.num_invalid_tlvs_configured_in_idle = 0;
|
||||
nfapi_resp.num_invalid_tlvs_configured_in_running = 0;
|
||||
nfapi_resp.num_missing_tlvs = 0;
|
||||
nfapi_nr_pnf_config_resp(config, &nfapi_resp);
|
||||
printf("[PNF] Sent NFAPI_PNF_CONFIG_RESPONSE phy_id:%d\n", phy_info->id);
|
||||
|
||||
if(NFAPI_MODE==NFAPI_UE_STUB_PNF)
|
||||
if (NFAPI_MODE == NFAPI_UE_STUB_PNF)
|
||||
free(fp);
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user