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

Remove DU's UE RRC, MAC, RLC contexts correctly on UE RELEASE COMMAND

Browse Source
This commit is contained in:
Robert Schmidt
2019-01-10 16:51:04 +01:00
parent be17b9b655
commit 05e08d5094
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/F1AP/f1ap_du_ue_context_management.c
+3 -6
View File
@@ -681,10 +681,10 @@ int DU_handle_UE_CONTEXT_RELEASE_COMMAND(instance_t instance,
F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextReleaseCommandIEs_t, ie, container, F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextReleaseCommandIEs_t, ie, container,
F1AP_ProtocolIE_ID_id_RRCContainer, false); F1AP_ProtocolIE_ID_id_RRCContainer, false);
if (ie) { if (ie) {
/*pstruct rrc_eNB_ue_context_s* ue_context_p; struct rrc_eNB_ue_context_s* ue_context_p;
ue_context_p = rrc_eNB_get_ue_context(RC.rrc[ctxt.module_id], ctxt.rnti); ue_context_p = rrc_eNB_get_ue_context(RC.rrc[ctxt.module_id], ctxt.rnti);
thread_mutex_lock(&rrc_release_freelist); pthread_mutex_lock(&rrc_release_freelist);
for (uint16_t release_num = 0; release_num < NUMBER_OF_UE_MAX; release_num++) { for (uint16_t release_num = 0; release_num < NUMBER_OF_UE_MAX; release_num++) {
if (rrc_release_info.RRC_release_ctrl[release_num].flag == 0) { if (rrc_release_info.RRC_release_ctrl[release_num].flag == 0) {
if (ue_context_p->ue_context.ue_release_timer_s1 > 0) if (ue_context_p->ue_context.ue_release_timer_s1 > 0)
@@ -700,7 +700,7 @@ int DU_handle_UE_CONTEXT_RELEASE_COMMAND(instance_t instance,
break; break;
} }
} }
pthread_mutex_unlock(&rrc_release_freelist);*/ pthread_mutex_unlock(&rrc_release_freelist);
const sdu_size_t sdu_len = ie->value.choice.RRCContainer.size; const sdu_size_t sdu_len = ie->value.choice.RRCContainer.size;
mem_block_t *pdu_p = NULL; mem_block_t *pdu_p = NULL;
@@ -738,9 +738,6 @@ int DU_handle_UE_CONTEXT_RELEASE_COMMAND(instance_t instance,
} }
} }
rrc_mac_remove_ue(instance, ctxt.rnti);
rrc_rlc_remove_ue(&ctxt);
f1ap_ue_context_release_cplt_t cplt; f1ap_ue_context_release_cplt_t cplt;
cplt.rnti = ctxt.rnti; cplt.rnti = ctxt.rnti;
DU_send_UE_CONTEXT_RELEASE_COMPLETE(instance, &cplt); DU_send_UE_CONTEXT_RELEASE_COMPLETE(instance, &cplt);
openair2/RRC/LTE/rrc_eNB.c
+3 -1
View File
@@ -1079,7 +1079,9 @@ void release_UE_in_freeList(module_id_t mod_id)
} }
} }
} }
if (RC.rrc[mod_id]->node_type == ngran_eNB) { if (RC.rrc[mod_id]->node_type != ngran_eNB_CU
&& RC.rrc[mod_id]->node_type != ngran_ng_eNB_CU
&& RC.rrc[mod_id]->node_type != ngran_gNB_CU) {
rrc_mac_remove_ue(mod_id,rnti); rrc_mac_remove_ue(mod_id,rnti);
rrc_rlc_remove_ue(&ctxt); rrc_rlc_remove_ue(&ctxt);
} }