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

FlexRAN: HO request first check whether X2 is active, minor indentation fixes

Browse Source
This commit is contained in:
Robert Schmidt
2019-06-24 17:55:13 +02:00
parent a6be54a6f4
commit f1a1ff036d
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/LTE/rrc_eNB.c
+9 -12
View File
@@ -4819,12 +4819,17 @@ flexran_rrc_eNB_trigger_handover (int mod_id,
rrc_eNB_ue_context_t *ue_context_pP, rrc_eNB_ue_context_t *ue_context_pP,
int target_cell_id) { int target_cell_id) {
uint32_t earfcn_dl; uint32_t earfcn_dl;
uint8_t KeNB_star[32] = { 0 }; uint8_t KeNB_star[32] = { 0 };
int cell_found = 0; int cell_found = 0;
/* if X2AP is disabled, do nothing */
if (!is_x2ap_enabled()) {
LOG_E(RRC, "X2 is disabled\n");
return -1;
}
/* Check if eNB id belongs to the supported ones-Extend for multiple carrieres */ /* Check if eNB id belongs to the supported ones-Extend for multiple carrieres */
for (int i=0; i < RC.rrc[mod_id]->num_neigh_cells; i++) { for (int i=0; i < RC.rrc[mod_id]->num_neigh_cells; i++) {
if (RC.rrc[mod_id]->neigh_cells_id[i][0] == target_cell_id) { if (RC.rrc[mod_id]->neigh_cells_id[i][0] == target_cell_id) {
cell_found = 1; cell_found = 1;
@@ -4833,20 +4838,12 @@ int cell_found = 0;
} }
/* Check if eNB id was found */ /* Check if eNB id was found */
if (!cell_found) { if (!cell_found) {
LOG_E(RRC, "%s(): cannot find target eNB with phyCellId %d\n", __func__, target_cell_id); LOG_E(RRC, "%s(): cannot find target eNB with phyCellId %d\n", __func__, target_cell_id);
return -1; return -1;
} }
/* Handover process is following */ /* Handover process is following */
/* if X2AP is disabled, do nothing */
if (!is_x2ap_enabled()) {
LOG_E(RRC, "X2 is disabled\n");
return -1;
}
LOG_D(RRC, "Handover is triggered by FlexRAN controller...\n"); LOG_D(RRC, "Handover is triggered by FlexRAN controller...\n");
/* if the UE is not in handover mode, start handover procedure */ /* if the UE is not in handover mode, start handover procedure */