Skip to content

O
OpenXG UE
Commit 3eb44ef2 authored by rmagueta's avatar rmagueta
Browse files
Options

Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into... 

Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
parents 16298b84 52659338
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 235 deletions
openair2/F1AP/f1ap_du_interface_management.c
View file @ 3eb44ef2
...@@ -199,14 +199,19 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) { ...@@ -199,14 +199,19 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) {
served_cell_information.nRPCI = f1ap_du_data->nr_pci[i]; // int 0..1007 served_cell_information.nRPCI = f1ap_du_data->nr_pci[i]; // int 0..1007
/* - fiveGS_TAC */ /* - fiveGS_TAC */
uint8_t fiveGS_TAC[3]; if (RC.nrrrc) {
served_cell_information.fiveGS_TAC=calloc(1,sizeof(*served_cell_information.fiveGS_TAC)); uint8_t fiveGS_TAC[3];
fiveGS_TAC[0] = ((uint8_t*)&f1ap_du_data->tac[i])[2]; fiveGS_TAC[0] = ((uint8_t*)&f1ap_du_data->tac[i])[2];
fiveGS_TAC[1] = ((uint8_t*)&f1ap_du_data->tac[i])[1]; fiveGS_TAC[1] = ((uint8_t*)&f1ap_du_data->tac[i])[1];
fiveGS_TAC[2] = ((uint8_t*)&f1ap_du_data->tac[i])[0]; fiveGS_TAC[2] = ((uint8_t*)&f1ap_du_data->tac[i])[0];
OCTET_STRING_fromBuf(served_cell_information.fiveGS_TAC, OCTET_STRING_fromBuf(served_cell_information.fiveGS_TAC,
(const char *)fiveGS_TAC, (const char *)fiveGS_TAC,
3); 3);
} else {
OCTET_STRING_fromBuf(served_cell_information.fiveGS_TAC,
(const char*)&f1ap_du_data->tac[i],
3);
}
/* - Configured_EPS_TAC */ /* - Configured_EPS_TAC */
if(0){ if(0){
...@@ -725,13 +730,19 @@ int DU_send_gNB_DU_CONFIGURATION_UPDATE(instance_t instance, ...@@ -725,13 +730,19 @@ int DU_send_gNB_DU_CONFIGURATION_UPDATE(instance_t instance,
served_cell_information.nRPCI = f1ap_setup_req->nr_pci[i]; // int 0..1007 served_cell_information.nRPCI = f1ap_setup_req->nr_pci[i]; // int 0..1007
/* - fiveGS_TAC */ /* - fiveGS_TAC */
uint8_t fiveGS_TAC[3]; if (RC.nrrrc) {
fiveGS_TAC[0] = ((uint8_t*)&f1ap_setup_req->tac[i])[2]; uint8_t fiveGS_TAC[3];
fiveGS_TAC[1] = ((uint8_t*)&f1ap_setup_req->tac[i])[1]; fiveGS_TAC[0] = ((uint8_t*)&f1ap_setup_req->tac[i])[2];
fiveGS_TAC[2] = ((uint8_t*)&f1ap_setup_req->tac[i])[0]; fiveGS_TAC[1] = ((uint8_t*)&f1ap_setup_req->tac[i])[1];
OCTET_STRING_fromBuf(served_cell_information.fiveGS_TAC, fiveGS_TAC[2] = ((uint8_t*)&f1ap_setup_req->tac[i])[0];
(const char *)fiveGS_TAC, OCTET_STRING_fromBuf(served_cell_information.fiveGS_TAC,
3); (const char *)fiveGS_TAC,
3);
} else {
OCTET_STRING_fromBuf(served_cell_information.fiveGS_TAC,
(const char *) &f1ap_setup_req->tac[i],
3);
}
/* - Configured_EPS_TAC */ /* - Configured_EPS_TAC */
if(1){ if(1){
...@@ -890,7 +901,6 @@ int DU_send_gNB_DU_CONFIGURATION_UPDATE(instance_t instance, ...@@ -890,7 +901,6 @@ int DU_send_gNB_DU_CONFIGURATION_UPDATE(instance_t instance,
served_cell_information.nRPCI = f1ap_setup_req->nr_pci[i]; // int 0..1007 served_cell_information.nRPCI = f1ap_setup_req->nr_pci[i]; // int 0..1007
/* - fiveGS_TAC */ /* - fiveGS_TAC */
served_cell_information.fiveGS_TAC=calloc(1,sizeof(*served_cell_information.fiveGS_TAC));
OCTET_STRING_fromBuf(served_cell_information.fiveGS_TAC, OCTET_STRING_fromBuf(served_cell_information.fiveGS_TAC,
(const char *) &f1ap_setup_req->tac[i], (const char *) &f1ap_setup_req->tac[i],
3); 3);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment