Commit c0752bec authored by zhenghuangkun's avatar zhenghuangkun

fix x2ho warning

parent 959acc85
...@@ -5266,7 +5266,7 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct ...@@ -5266,7 +5266,7 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
{ {
uint16_t size; uint16_t size = 0;
int i; int i;
uint8_t rv[2]; uint8_t rv[2];
// configure SRB1/SRB2, PhysicalConfigDedicated, MAC_MainConfig for UE // configure SRB1/SRB2, PhysicalConfigDedicated, MAC_MainConfig for UE
...@@ -8989,18 +8989,18 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -8989,18 +8989,18 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
LOG_E(RRC, "could not find UE (rnti %x) while processing X2AP_HANDOVER_REQ_ACK\n", LOG_E(RRC, "could not find UE (rnti %x) while processing X2AP_HANDOVER_REQ_ACK\n",
X2AP_HANDOVER_REQ_ACK(msg_p).rnti); X2AP_HANDOVER_REQ_ACK(msg_p).rnti);
//exit(1); //exit(1);
return ; break ;
} }
LOG_I(RRC, "[eNB %d] source eNB receives the X2 HO ACK %s\n", instance, msg_name_p); LOG_I(RRC, "[eNB %d] source eNB receives the X2 HO ACK %s\n", instance, msg_name_p);
if(ue_context_p == NULL) { if(ue_context_p == NULL) {
LOG_E(RRC,"%s %d: ue_context_p is a NULL pointer \n",__FILE__,__LINE__); LOG_E(RRC,"%s %d: ue_context_p is a NULL pointer \n",__FILE__,__LINE__);
return ; break ;
} }
if (ue_context_p->ue_context.handover_info->state != HO_REQUEST) { if (ue_context_p->ue_context.handover_info->state != HO_REQUEST) {
//abort(); //abort();
LOG_E(RRC, "%s:%d: the handover state is not HO_REQUEST: %d\n",__FILE__, __LINE__,ue_context_p->ue_context.handover_info->state); LOG_E(RRC, "%s:%d: the handover state is not HO_REQUEST: %d\n",__FILE__, __LINE__,ue_context_p->ue_context.handover_info->state);
return ; break ;
} }
hash_rc = hashtable_get(RC.gtpv1u_data_g->ue_mapping, ue_context_p->ue_context.rnti, (void**)&gtpv1u_ue_data_p); hash_rc = hashtable_get(RC.gtpv1u_data_g->ue_mapping, ue_context_p->ue_context.rnti, (void**)&gtpv1u_ue_data_p);
...@@ -9051,13 +9051,13 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -9051,13 +9051,13 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
LOG_I(RRC, "[eNB %d] source eNB receives the X2 UE CONTEXT RELEASE %s\n", instance, msg_name_p); LOG_I(RRC, "[eNB %d] source eNB receives the X2 UE CONTEXT RELEASE %s\n", instance, msg_name_p);
if(ue_context_p == NULL) { if(ue_context_p == NULL) {
LOG_E(RRC,"%s %d: ue_context_p is a NULL pointer \n",__FILE__,__LINE__); LOG_E(RRC,"%s %d: ue_context_p is a NULL pointer \n",__FILE__,__LINE__);
return ; break ;
} }
if (ue_context_p->ue_context.handover_info->state != HO_COMPLETE) { if (ue_context_p->ue_context.handover_info->state != HO_COMPLETE) {
//abort(); //abort();
LOG_E(RRC, "%s:%d: the handover state is not HO_COMPLETE: %d\n",__FILE__, __LINE__,ue_context_p->ue_context.handover_info->state); LOG_E(RRC, "%s:%d: the handover state is not HO_COMPLETE: %d\n",__FILE__, __LINE__,ue_context_p->ue_context.handover_info->state);
return ; break ;
} }
ue_context_p->ue_context.handover_info->state = HO_RELEASE; ue_context_p->ue_context.handover_info->state = HO_RELEASE;
......
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