Skip to content

O
OpenXG-RAN
Commit 49605d5a authored by wujing's avatar wujing
Browse files
Options

Fix RRCConnectionReestablishmentReject issue and Remove UE information when X2-HO Cancel happen

parent b8695319
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 46 deletions
openair2/RRC/LTE/L2_interface.c
View file @ 49605d5a
...@@ -164,6 +164,7 @@ mac_rrc_data_req( ...@@ -164,6 +164,7 @@ mac_rrc_data_req(
struct rrc_eNB_ue_context_s *ue_context_p = rrc_eNB_get_ue_context(RC.rrc[Mod_idP],rnti); struct rrc_eNB_ue_context_s *ue_context_p = rrc_eNB_get_ue_context(RC.rrc[Mod_idP],rnti);
rnti_t old_rnti = 0; rnti_t old_rnti = 0;
uint8_t flag= 0;
if (ue_context_p == NULL) { if (ue_context_p == NULL) {
for (uint16_t i = 0; i < MAX_MOBILES_PER_ENB; i++) { for (uint16_t i = 0; i < MAX_MOBILES_PER_ENB; i++) {
if (reestablish_rnti_map[i][0] == rnti) { if (reestablish_rnti_map[i][0] == rnti) {
...@@ -177,14 +178,24 @@ mac_rrc_data_req( ...@@ -177,14 +178,24 @@ mac_rrc_data_req(
return(0); return(0);
} }
} else { } else {
if(RC.rrc[Mod_idP]->carrier[CC_id].Srb0.Active==0) {
LOG_E(RRC,"[eNB %d] CCCH Not active\n",Mod_idP);
return(0); return(0);
} }
Srb_info=&RC.rrc[Mod_idP]->carrier[CC_id].Srb0;
if(Srb_info->Tx_buffer.payload_size <= 0){
return(0);
}
flag = 1;
}
} }
if(flag == 0){
eNB_RRC_UE_t *ue_p = &ue_context_p->ue_context; eNB_RRC_UE_t *ue_p = &ue_context_p->ue_context;
LOG_T(RRC,"[eNB %d] Frame %d CCCH request (Srb_id %d, rnti %x)\n",Mod_idP,frameP, Srb_id,rnti); LOG_T(RRC,"[eNB %d] Frame %d CCCH request (Srb_id %d, rnti %x)\n",Mod_idP,frameP, Srb_id,rnti);
Srb_info=&ue_p->Srb0; Srb_info=&ue_p->Srb0;
}
// check if data is there for MAC // check if data is there for MAC
if(Srb_info->Tx_buffer.payload_size>0) { //Fill buffer if(Srb_info->Tx_buffer.payload_size>0) { //Fill buffer
LOG_D(RRC,"[eNB %d] CCCH (%p) has %d bytes (dest: %p, src %p)\n",Mod_idP,Srb_info,Srb_info->Tx_buffer.payload_size,buffer_pP,Srb_info->Tx_buffer.Payload); LOG_D(RRC,"[eNB %d] CCCH (%p) has %d bytes (dest: %p, src %p)\n",Mod_idP,Srb_info,Srb_info->Tx_buffer.payload_size,buffer_pP,Srb_info->Tx_buffer.Payload);
...@@ -192,7 +203,10 @@ mac_rrc_data_req( ...@@ -192,7 +203,10 @@ mac_rrc_data_req(
Sdu_size = Srb_info->Tx_buffer.payload_size; Sdu_size = Srb_info->Tx_buffer.payload_size;
Srb_info->Tx_buffer.payload_size=0; Srb_info->Tx_buffer.payload_size=0;
} }
if(flag == 1){
Srb_info->Tx_buffer.payload_size = 0;
RC.rrc[Mod_idP]->carrier[CC_id].Srb0.Active = 0;
}
return (Sdu_size); return (Sdu_size);
} }
......
openair2/RRC/LTE/rrc_defs.h
View file @ 49605d5a
...@@ -342,11 +342,13 @@ typedef enum UE_STATE_e { ...@@ -342,11 +342,13 @@ typedef enum UE_STATE_e {
typedef enum HO_STATE_e { typedef enum HO_STATE_e {
HO_IDLE=0, HO_IDLE=0,
// initiated by the src eNB
HO_MEASUREMENT, HO_MEASUREMENT,
HO_PREPARE,
HO_CMD, // initiated by the src eNB
HO_COMPLETE, // initiated by the target eNB
HO_REQUEST, HO_REQUEST,
HO_PREPARE,
HO_CMD,
HO_COMPLETE,
// initiated by the target eNB
HO_ACK, HO_ACK,
HO_FORWARDING, HO_FORWARDING,
HO_CONFIGURED, HO_CONFIGURED,
...@@ -812,6 +814,7 @@ typedef struct { ...@@ -812,6 +814,7 @@ typedef struct {
LTE_SystemInformationBlockType21_r14_t *sib21; LTE_SystemInformationBlockType21_r14_t *sib21;
// End - TTN // End - TTN
SRB_INFO SI; SRB_INFO SI;
SRB_INFO Srb0;
uint8_t *paging[MAX_MOBILES_PER_ENB]; uint8_t *paging[MAX_MOBILES_PER_ENB];
uint32_t sizeof_paging[MAX_MOBILES_PER_ENB]; uint32_t sizeof_paging[MAX_MOBILES_PER_ENB];
} rrc_eNB_carrier_data_t; } rrc_eNB_carrier_data_t;
......
openair2/RRC/LTE/rrc_eNB.c
View file @ 49605d5a
...@@ -2227,31 +2227,37 @@ rrc_eNB_generate_RRCConnectionReestablishmentReject( ...@@ -2227,31 +2227,37 @@ rrc_eNB_generate_RRCConnectionReestablishmentReject(
} }
T(T_ENB_RRC_CONNECTION_REESTABLISHMENT_REJECT, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame), T(T_ENB_RRC_CONNECTION_REESTABLISHMENT_REJECT, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti)); T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
SRB_INFO *Srb_info;
eNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context; if(ue_context_pP == NULL){
RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Active = 1;
ue_p->Srb0.Tx_buffer.payload_size = RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.payload_size = 0;
Srb_info = &RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0;
}else{
//eNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context;
Srb_info = &ue_context_pP->ue_context.Srb0;
}
Srb_info->Tx_buffer.payload_size =
do_RRCConnectionReestablishmentReject(ctxt_pP->module_id, do_RRCConnectionReestablishmentReject(ctxt_pP->module_id,
(uint8_t*) ue_p->Srb0.Tx_buffer.Payload); (uint8_t*) Srb_info->Tx_buffer.Payload);
LOG_DUMPMSG(RRC,DEBUG_RRC, LOG_DUMPMSG(RRC,DEBUG_RRC,
(char *)(ue_p->Srb0.Tx_buffer.Payload), (char *)(Srb_info->Tx_buffer.Payload),
ue_p->Srb0.Tx_buffer.payload_size, Srb_info->Tx_buffer.payload_size,
"[MSG] RRCConnectionReestablishmentReject\n"); "[MSG] RRCConnectionReestablishmentReject\n");
MSC_LOG_TX_MESSAGE( MSC_LOG_TX_MESSAGE(
MSC_RRC_ENB, MSC_RRC_ENB,
MSC_RRC_UE, MSC_RRC_UE,
ue_p->Srb0.Tx_buffer.Header, Srb_info->Tx_buffer.Header,
ue_p->Srb0.Tx_buffer.payload_size, Srb_info->Tx_buffer.payload_size,
MSC_AS_TIME_FMT" LTE_RRCConnectionReestablishmentReject UE %x size %u", MSC_AS_TIME_FMT" LTE_RRCConnectionReestablishmentReject UE %x size %u",
MSC_AS_TIME_ARGS(ctxt_pP), MSC_AS_TIME_ARGS(ctxt_pP),
ue_context_pP == NULL ? -1 : ue_context_pP->ue_context.rnti, ue_context_pP == NULL ? -1 : ue_context_pP->ue_context.rnti,
ue_p->Srb0.Tx_buffer.payload_size); Srb_info->Tx_buffer.payload_size);
LOG_I(RRC, LOG_I(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-CCCH, Generating LTE_RRCConnectionReestablishmentReject (bytes %d)\n", PROTOCOL_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-CCCH, Generating LTE_RRCConnectionReestablishmentReject (bytes %d)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP), PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
ue_p->Srb0.Tx_buffer.payload_size); Srb_info->Tx_buffer.payload_size);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
...@@ -7261,8 +7267,7 @@ rrc_eNB_decode_ccch( ...@@ -7261,8 +7267,7 @@ rrc_eNB_decode_ccch(
LOG_E(RRC, LOG_E(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" LTE_RRCConnectionReestablishmentRequest without UE context, let's reject the UE\n", PROTOCOL_RRC_CTXT_UE_FMT" LTE_RRCConnectionReestablishmentRequest without UE context, let's reject the UE\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP)); PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
LOG_E(RRC,PROTOCOL_RRC_CTXT_UE_FMT" ue_context_p is NULL , do not run rrc_eNB_generate_RRCConnectionReestablishmentReject\n",PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP)); rrc_eNB_generate_RRCConnectionReestablishmentReject(ctxt_pP, ue_context_p, CC_id);
// rrc_eNB_generate_RRCConnectionReestablishmentReject(ctxt_pP, ue_context_p, CC_id);
break; break;
} }
...@@ -7890,14 +7895,20 @@ rrc_eNB_decode_dcch( ...@@ -7890,14 +7895,20 @@ rrc_eNB_decode_dcch(
break; break;
} }
if(ue_context_p->ue_context.handover_info && ue_context_p->ue_context.handover_info->state == HO_COMPLETE) {
LOG_E(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" RRCConnectionReconfigurationComplete ho state %d error, fault\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP), ue_context_p->ue_context.handover_info->state);
break;
}
flexran_agent_handover = 1; flexran_agent_handover = 1;
RC.rrc[ctxt_pP->module_id]->Nb_ue++; RC.rrc[ctxt_pP->module_id]->Nb_ue++;
dedicated_DRB = 3; dedicated_DRB = 3;
RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].crnti_reconfigurationcomplete_flag = 0; RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].crnti_reconfigurationcomplete_flag = 0;
ue_context_p->ue_context.Status = RRC_RECONFIGURED; ue_context_p->ue_context.Status = RRC_RECONFIGURED;
if(ue_context_p->ue_context.handover_info){
ue_context_p->ue_context.handover_info->state = HO_CONFIGURED; ue_context_p->ue_context.handover_info->state = HO_CONFIGURED;
}
LOG_I(RRC, LOG_I(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" UE State = RRC_HO_EXECUTION (xid %ld)\n", PROTOCOL_RRC_CTXT_UE_FMT" UE State = RRC_HO_EXECUTION (xid %ld)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),ul_dcch_msg->message.choice.c1.choice.rrcConnectionReconfigurationComplete.rrc_TransactionIdentifier); PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),ul_dcch_msg->message.choice.c1.choice.rrcConnectionReconfigurationComplete.rrc_TransactionIdentifier);
...@@ -9037,6 +9048,11 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -9037,6 +9048,11 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
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__);
break ; break ;
} }
if (ue_context_p->ue_context.handover_info == NULL) {
/* is it possible? */
LOG_E(RRC, "could not find handover_info while processing X2AP_HANDOVER_REQ_ACK\n");
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();
...@@ -9094,7 +9110,10 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -9094,7 +9110,10 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
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__);
break ; break ;
} }
if (ue_context_p->ue_context.handover_info == NULL) {
LOG_E(RRC,"%s %d: handover_info is a NULL pointer \n",__FILE__,__LINE__);
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);
...@@ -9128,15 +9147,39 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -9128,15 +9147,39 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
cause, cause,
msg_name_p); msg_name_p);
if (X2AP_HANDOVER_CANCEL(msg_p).cause == X2AP_T_RELOC_PREP_TIMEOUT) { if (X2AP_HANDOVER_CANCEL(msg_p).cause == X2AP_T_RELOC_PREP_TIMEOUT) {
/* in the source eNB */
if(ue_context_p->ue_context.handover_info->state == HO_REQUEST){
/* for prep timeout, simply return to normal state */ /* for prep timeout, simply return to normal state */
/* TODO: be sure that it's correct to set Status to RRC_RECONFIGURED */ /* TODO: be sure that it's correct to set Status to RRC_RECONFIGURED */
ue_context_p->ue_context.Status = RRC_RECONFIGURED; ue_context_p->ue_context.Status = RRC_RECONFIGURED;
/* TODO: be sure free is enough here (check memory leaks) */ /* TODO: be sure free is enough here (check memory leaks) */
free(ue_context_p->ue_context.handover_info); free(ue_context_p->ue_context.handover_info);
ue_context_p->ue_context.handover_info = NULL; ue_context_p->ue_context.handover_info = NULL;
/* in the target eNB */
}else{
if(ue_context_p->ue_context.handover_info->state == HO_FORWARDING){
ue_context_p->ue_context.handover_info->state = HO_RELEASE;
}else{
free(ue_context_p->ue_context.handover_info);
ue_context_p->ue_context.handover_info = NULL;
free(ue_context_p);
ue_context_p = NULL;
}
}
} else { } else {
/* for overall timeout, remove UE entirely */ /* for overall timeout, remove UE entirely */
ue_context_p->ue_context.handover_info->state = HO_CANCEL; /* in the source eNB */
if(ue_context_p->ue_context.handover_info->state == HO_COMPLETE){
ue_context_p->ue_context.handover_info->state = HO_RELEASE;
/* in the target eNB */
}else{
ue_context_p->ue_context.handover_info->state = HO_RELEASE;
}
} }
} else { } else {
char *failure_cause; char *failure_cause;
......
openair3/GTPV1-U/gtpv1u_eNB.c
View file @ 49605d5a
...@@ -280,7 +280,7 @@ NwGtpv1uRcT gtpv1u_eNB_process_stack_req( ...@@ -280,7 +280,7 @@ NwGtpv1uRcT gtpv1u_eNB_process_stack_req(
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);
if((ue_context_p != NULL) && if((ue_context_p != NULL) &&
(ue_context_p->ue_context.handover_info != NULL) && (ue_context_p->ue_context.handover_info != NULL) &&
(ue_context_p->ue_context.handover_info->state < HO_FORWARDING_COMPLETE)) { (HO_COMPLETE <= ue_context_p->ue_context.handover_info->state && ue_context_p->ue_context.handover_info->state < HO_FORWARDING_COMPLETE)) {
if(msgType == NW_GTP_END_MARKER){ if(msgType == NW_GTP_END_MARKER){
/* in the source enb, UE in RRC_HO_EXECUTION mode */ /* in the source enb, UE in RRC_HO_EXECUTION mode */
...@@ -391,7 +391,9 @@ NwGtpv1uRcT gtpv1u_eNB_process_stack_req( ...@@ -391,7 +391,9 @@ NwGtpv1uRcT gtpv1u_eNB_process_stack_req(
/* target eNB. x2ho forwarding is processing. spgw message save to TASK_END_MARKER */ /* target eNB. x2ho forwarding is processing. spgw message save to TASK_END_MARKER */
if(ue_context_p->ue_context.handover_info->state != HO_COMPLETE && if(ue_context_p->ue_context.handover_info->state != HO_COMPLETE &&
ue_context_p->ue_context.handover_info->state != HO_END_MARKER ) (ue_context_p->ue_context.handover_info->state != HO_END_MARKER ||
ue_context_p->ue_context.handover_info->forwarding_state != FORWARDING_EMPTY ||
ue_context_p->ue_context.handover_info->endmark_state != ENDMARK_EMPTY))
{ {
LOG_I(GTPU, "x2ho forwarding is processing. Received a spgw message. length %d\n", buffer_len); LOG_I(GTPU, "x2ho forwarding is processing. Received a spgw message. length %d\n", buffer_len);
#if defined(LOG_GTPU) && LOG_GTPU > 0 #if defined(LOG_GTPU) && LOG_GTPU > 0
......
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