diff --git a/openair2/RRC/LITE/rrc_common.c b/openair2/RRC/LITE/rrc_common.c
index b221372745c070be583110d5121425287e7b3d74..d05a44e59868d23b4a29dd8e197dfacb48691f50 100644
--- a/openair2/RRC/LITE/rrc_common.c
+++ b/openair2/RRC/LITE/rrc_common.c
@@ -353,8 +353,6 @@ rrc_rx_tx(
break;
}
}
-
-#ifdef UE_EXPANSION
if (ue_context_p->ue_context.ue_release_timer_s1>0) {
ue_context_p->ue_context.ue_release_timer_s1++;
if (ue_context_p->ue_context.ue_release_timer_s1 >=
@@ -387,7 +385,6 @@ rrc_rx_tx(
break;
}
}
-#endif
if (ue_context_p->ue_context.ue_release_timer>0) {
ue_context_p->ue_context.ue_release_timer++;
@@ -400,14 +397,12 @@ rrc_rx_tx(
}
}
if (ue_to_be_removed) {
-#ifdef UE_EXPANSION
if(ue_to_be_removed->ue_context.ul_failure_timer >= 8) {
ue_to_be_removed->ue_context.ue_release_timer_s1 = 1;
ue_to_be_removed->ue_context.ue_release_timer_thres_s1 = 100;
ue_to_be_removed->ue_context.ue_release_timer = 0;
ue_to_be_removed->ue_context.ue_reestablishment_timer = 0;
}
-#endif
rrc_eNB_free_UE(ctxt_pP->module_id,ue_to_be_removed);
if(ue_to_be_removed->ue_context.ul_failure_timer >= 8){
ue_to_be_removed->ue_context.ul_failure_timer = 0;
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index ecf6eed912b4e1c7369b1e0ab0756b1b8405e291..156973881a89e403bc4a31d6d679a2fdbcd80cd7 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -1189,17 +1189,15 @@ rrc_eNB_generate_RRCConnectionReestablishment(
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.payload_size);
-#ifdef UE_EXPANSION
- // activate release timer, if RRCComplete not received after 100 frames, remove UE
- ue_context_pP->ue_context.ue_reestablishment_timer = 1;
- // remove UE after 10 frames after RRCConnectionReestablishmentRelease is triggered
- ue_context_pP->ue_context.ue_reestablishment_timer_thres = 1000;
-#else
// activate release timer, if RRCComplete not received after 10 frames, remove UE
- ue_context_pP->ue_context.ue_release_timer = 1;
+ //ue_context_pP->ue_context.ue_release_timer = 1;
// remove UE after 10 frames after RRCConnectionReestablishmentRelease is triggered
- ue_context_pP->ue_context.ue_release_timer_thres = 100;
-#endif
+ //ue_context_pP->ue_context.ue_release_timer_thres = 100;
+ // activate release timer, if RRCComplete not received after 100 frames, remove UE
+ int UE_id = find_UE_id(ctxt_pP->module_id, ctxt_pP->rnti);
+ RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer = 1;
+ // remove UE after 100 frames after RRCConnectionReestablishmentRelease is triggered
+ RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer_thres = 1000;
}
//-----------------------------------------------------------------------------
@@ -1884,20 +1882,17 @@ rrc_eNB_generate_RRCConnectionRelease(
memset(buffer, 0, RRC_BUF_SIZE);
size = do_RRCConnectionRelease(ctxt_pP->module_id, buffer,rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id));
-#ifdef UE_EXPANSION
// set release timer
+ //ue_context_pP->ue_context.ue_release_timer=1;
+ // remove UE after 10 frames after RRCConnectionRelease is triggered
+ //ue_context_pP->ue_context.ue_release_timer_thres=100;
+ // set release timer
ue_context_pP->ue_context.ue_release_timer_rrc = 1;
// remove UE after 10 frames after RRCConnectionRelease is triggered
ue_context_pP->ue_context.ue_release_timer_thres_rrc = 100;
ue_context_pP->ue_context.ue_reestablishment_timer = 0;
ue_context_pP->ue_context.ue_release_timer = 0;
ue_context_pP->ue_context.ue_release_timer_s1 = 0;
-#else
- // set release timer
- ue_context_pP->ue_context.ue_release_timer=1;
- // remove UE after 10 frames after RRCConnectionRelease is triggered
- ue_context_pP->ue_context.ue_release_timer_thres=100;
-#endif
LOG_I(RRC,
PROTOCOL_RRC_CTXT_UE_FMT" Logical Channel DL-DCCH, Generate RRCConnectionRelease (bytes %d)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
@@ -5135,17 +5130,11 @@ rrc_eNB_generate_RRCConnectionSetup(
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.payload_size);
-#ifdef UE_EXPANSION
- // activate release timer, if RRCSetupComplete not received after 100 frames, remove UE
+ //ue_context_pP->ue_context.ue_release_timer_thres=100;
+ // activate release timer, if RRCSetupComplete not received after 100 frames, remove UE
ue_context_pP->ue_context.ue_release_timer=1;
// remove UE after 10 frames after RRCConnectionRelease is triggered
ue_context_pP->ue_context.ue_release_timer_thres=1000;
-#else
- // activate release timer, if RRCSetupComplete not received after 10 frames, remove UE
- ue_context_pP->ue_context.ue_release_timer=1;
- // remove UE after 10 frames after RRCConnectionRelease is triggered
- ue_context_pP->ue_context.ue_release_timer_thres=100;
-#endif
}
@@ -5501,24 +5490,14 @@ rrc_eNB_decode_ccch(
PROTOCOL_RRC_CTXT_UE_FMT" UE context: %p\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
ue_context_p);
- ue_context_p->ue_context.ul_failure_timer = 0;
- ue_context_p->ue_context.ue_release_timer = 0;
- ue_context_p->ue_context.ue_reestablishment_timer = 0;
- ue_context_p->ue_context.ue_release_timer_s1 = 0;
- ue_context_p->ue_context.ue_release_timer_rrc = 0;
-
- /* reset timers */
- ue_context_p->ue_context.ul_failure_timer = 0;
- ue_context_p->ue_context.ue_release_timer = 0;
/* reset timers */
ue_context_p->ue_context.ul_failure_timer = 0;
ue_context_p->ue_context.ue_release_timer = 0;
-#ifdef UE_EXPANSION
ue_context_p->ue_context.ue_reestablishment_timer = 0;
ue_context_p->ue_context.ue_release_timer_s1 = 0;
ue_context_p->ue_context.ue_release_timer_rrc = 0;
-#endif
+
// insert C-RNTI to map
for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
if (reestablish_rnti_map[i][0] == 0) {
@@ -5691,11 +5670,9 @@ rrc_eNB_decode_ccch(
/* reset timers */
ue_context_p->ue_context.ul_failure_timer = 0;
ue_context_p->ue_context.ue_release_timer = 0;
-#ifdef UE_EXPANSION
ue_context_p->ue_context.ue_reestablishment_timer = 0;
ue_context_p->ue_context.ue_release_timer_s1 = 0;
ue_context_p->ue_context.ue_release_timer_rrc = 0;
-#endif
} else {
LOG_I(RRC," S-TMSI doesn't exist, setting Initialue_identity_s_TMSI.m_tmsi to %p => %x\n",ue_context_p,m_tmsi);
// ue_context_p = rrc_eNB_get_next_free_ue_context(ctxt_pP, NOT_A_RANDOM_UE_IDENTITY);
@@ -6192,11 +6169,10 @@ if (ue_context_p->ue_context.nb_of_modify_e_rabs > 0) {
}
#endif
}
-#ifdef UE_EXPANSION
+ //ue_context_p->ue_context.ue_release_timer = 0;
ue_context_p->ue_context.ue_reestablishment_timer = 1;
-#else
- ue_context_p->ue_context.ue_release_timer = 0;
-#endif
+ // remove UE after 100 frames after RRCConnectionReestablishmentRelease is triggered
+ ue_context_p->ue_context.ue_reestablishment_timer_thres = 1000;
}
break;
@@ -6695,12 +6671,11 @@ rrc_enb_task(
/* Nothing to do. Apparently everything is done in S1AP processing */
//LOG_I(RRC, "[eNB %d] Received message %s, not processed because procedure not synched\n",
//instance, msg_name_p);
-#ifdef UE_EXPANSION
- if (rrc_eNB_get_ue_context(RC.rrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti)) {
+ if (rrc_eNB_get_ue_context(RC.rrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti)
+ && rrc_eNB_get_ue_context(RC.rrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti)->ue_context.ue_release_timer_rrc > 0) {
rrc_eNB_get_ue_context(RC.rrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti)->ue_context.ue_release_timer_rrc =
rrc_eNB_get_ue_context(RC.rrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti)->ue_context.ue_release_timer_thres_rrc;
}
-#endif
break;
# endif
diff --git a/openair2/RRC/LITE/rrc_eNB_S1AP.c b/openair2/RRC/LITE/rrc_eNB_S1AP.c
index 0396d8efb614d28969eecda369672b35215e8e4b..d2c0d0acbe8f7375370fdc3699af8f6d6be1ca86 100644
--- a/openair2/RRC/LITE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LITE/rrc_eNB_S1AP.c
@@ -1197,9 +1197,7 @@ int rrc_eNB_process_S1AP_UE_CONTEXT_RELEASE_COMMAND (MessageDef *msg_p, const ch
}
return (-1);
} else {
-#ifdef UE_EXPANSION
ue_context_p->ue_context.ue_release_timer_s1 = 0;
-#endif
PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt, instance, ENB_FLAG_YES, ue_context_p->ue_context.rnti, 0, 0);
rrc_eNB_generate_RRCConnectionRelease(&ctxt, ue_context_p);
/*