From 081e337cdd0d6a27b5520fb13014524cedc50aee Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Fri, 22 Nov 2013 15:58:39 +0000
Subject: [PATCH] Reoragized code.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4499 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
 openair2/RRC/LITE/rrc_eNB.c | 4261 ++++++++++++++++++-----------------
 1 file changed, 2136 insertions(+), 2125 deletions(-)

diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index a9cba32137..539e970a42 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -105,8 +105,8 @@ static const uint8_t RRC_TRANSACTION_IDENTIFIER_NUMBER = 4;
 
 mui_t rrc_eNB_mui = 0;
 
-void
-init_SI (u8 Mod_id) {
+/*------------------------------------------------------------------------------*/
+static void init_SI (u8 Mod_id) {
 
   u8 SIwindowsize = 1;
   u16 SIperiod = 8;
@@ -331,8 +331,8 @@ init_SI (u8 Mod_id) {
 }
 
 #ifdef Rel10
-void
-init_MCCH (u8 Mod_id) {
+/*------------------------------------------------------------------------------*/
+static void init_MCCH (u8 Mod_id) {
 
   int sync_area=0;
   // initialize RRC_eNB_INST MCCH entry
@@ -410,8 +410,8 @@ init_MCCH (u8 Mod_id) {
 
 }
 
-void
-init_MBMS (u8 Mod_id, u32 frame) {
+/*------------------------------------------------------------------------------*/
+static void init_MBMS (u8 Mod_id, u32 frame) {
   // init the configuration for MTCH 
 
   if (eNB_rrc_inst[Mod_id].MBMS_flag > 0) {
@@ -446,6 +446,23 @@ init_MBMS (u8 Mod_id, u32 frame) {
 }
 #endif
 
+/*------------------------------------------------------------------------------*/
+static void rrc_lite_eNB_init_security(u8 Mod_id, u8 UE_index)
+{
+#if defined(ENABLE_SECURITY)
+    char ascii_buffer[65];
+    uint8_t i;
+
+    memset(eNB_rrc_inst[Mod_id].kenb[UE_index], UE_index, 32);
+
+    for (i = 0; i < 32; i++) {
+        sprintf(&ascii_buffer[2 * i], "%02X", eNB_rrc_inst[Mod_id].kenb[UE_index][i]);
+    }
+
+    LOG_T(RRC, "[OSA][MOD %02d][UE %02d] kenb    = %s\n", Mod_id, UE_index, ascii_buffer);
+#endif
+}
+
 /*------------------------------------------------------------------------------*/
 uint8_t rrc_eNB_get_next_transaction_identifier(uint8_t Mod_id)
 {
@@ -499,6 +516,30 @@ void rrc_eNB_free_UE_index (uint8_t Mod_id, uint8_t UE_id)
   memset(eNB_rrc_inst[Mod_id].Info.UE_list[UE_id], 0, sizeof(eNB_rrc_inst[0].Info.UE_list[0]));
 }
 
+/*------------------------------------------------------------------------------*/
+void rrc_eNB_process_RRCConnectionSetupComplete (u8 Mod_id,
+                                                 u32 frame,
+                                                 u8 UE_index,
+                                                 RRCConnectionSetupComplete_r8_IEs_t *rrcConnectionSetupComplete)
+{
+  LOG_I (RRC, "[eNB %d][RAPROC] Frame %d : Logical Channel UL-DCCH, ""processing RRCConnectionSetupComplete from UE %d\n",
+         Mod_id, frame, UE_index);
+
+#if defined(ENABLE_USE_MME)
+  if (EPC_MODE_ENABLED == 1)
+  {
+    // Forward message to S1AP layer
+    rrc_eNB_send_S1AP_NAS_FIRST_REQ(Mod_id, UE_index, rrcConnectionSetupComplete);
+  }
+  else
+#endif
+  {
+    // RRC loop back (no S1AP), send SecurityModeCommand to UE
+    rrc_eNB_generate_SecurityModeCommand (Mod_id, frame, UE_index);
+    // rrc_eNB_generate_UECapabilityEnquiry(Mod_id,frame,UE_index);
+  }
+}
+
 /*------------------------------------------------------------------------------*/
 void rrc_eNB_generate_SecurityModeCommand (u8 Mod_id, u32 frame, u16 UE_index)
 {
@@ -526,733 +567,682 @@ void rrc_eNB_generate_SecurityModeCommand (u8 Mod_id, u32 frame, u16 UE_index)
 }
 
 /*------------------------------------------------------------------------------*/
-void rrc_lite_eNB_init_security(u8 Mod_id, u8 UE_index)
+void rrc_eNB_generate_UECapabilityEnquiry (u8 Mod_id, u32 frame, u16 UE_index)
 {
-#if defined(ENABLE_SECURITY)
-    char ascii_buffer[65];
-    uint8_t i;
 
-    memset(eNB_rrc_inst[Mod_id].kenb[UE_index], UE_index, 32);
+  uint8_t buffer[100];
+  uint8_t size;
 
-    for (i = 0; i < 32; i++) {
-        sprintf(&ascii_buffer[2 * i], "%02X", eNB_rrc_inst[Mod_id].kenb[UE_index][i]);
-    }
+  size = do_UECapabilityEnquiry (Mod_id, buffer, UE_index, rrc_eNB_get_next_transaction_identifier(Mod_id));
+
+  LOG_I (RRC,
+         "[eNB %d] Frame %d, Logical Channel DL-DCCH, Generate UECapabilityEnquiry (bytes %d, UE id %d)\n",
+         Mod_id, frame, size, UE_index);
+
+
+  LOG_D (RRC,
+         "[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- PDCP_DATA_REQ/%d Bytes (UECapabilityEnquiry to UE %d MUI %d) --->][PDCP][MOD %02d][RB %02d]\n",
+         frame, Mod_id, size, UE_index, rrc_eNB_mui, Mod_id,
+         (UE_index * NB_RB_MAX) + DCCH);
+  //rrc_rlc_data_req(Mod_id,frame, 1,(UE_index*NB_RB_MAX)+DCCH,rrc_eNB_mui++,0,size,(char*)buffer);
+  pdcp_rrc_data_req (Mod_id, frame, 1, (UE_index * NB_RB_MAX) + DCCH,
+                     rrc_eNB_mui++, 0, size, buffer, 1);
 
-    LOG_T(RRC, "[OSA][MOD %02d][UE %02d] kenb    = %s\n", Mod_id, UE_index, ascii_buffer);
-#endif
 }
 
 /*------------------------------------------------------------------------------*/
-char openair_rrc_lite_eNB_init (u8 Mod_id)
+void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 frame,
+                                                           u16 UE_index,
+                                                           u8 * nas_pdu,
+                                                           u32 nas_length,
+                                                           u8 ho_state)
 {
-  /*-----------------------------------------------------------------------------*/
-
-  unsigned char j;
-  LOG_I (RRC, "[eNB %d] Init (UE State = RRC_IDLE)...\n", Mod_id);
-  LOG_D (RRC, "[MSC_NEW][FRAME 00000][RRC_eNB][MOD %02d][]\n", Mod_id);
-  LOG_D (RRC, "[MSC_NEW][FRAME 00000][IP][MOD %02d][]\n", Mod_id);
-
-  for (j = 0; j < NUMBER_OF_UE_MAX; j++)
-    eNB_rrc_inst[Mod_id].Info.UE[j].Status = RRC_IDLE;     //CH_READY;
 
-  /* Init security parameters */
-  for (j = 0; j < NUMBER_OF_UE_MAX; j++) {
-    eNB_rrc_inst[Mod_id].ciphering_algorithm[j] = SecurityAlgorithmConfig__cipheringAlgorithm_eea2;
-    eNB_rrc_inst[Mod_id].integrity_algorithm[j] = SecurityAlgorithmConfig__integrityProtAlgorithm_eia2;
-    rrc_lite_eNB_init_security(Mod_id, j);
-  }
+  u8 buffer[RRC_BUF_SIZE];
+  u8 size;
+  int i;
 
-#if defined(ENABLE_USE_MME)
-  /* Connect eNB to MME */
-  if (EPC_MODE_ENABLED > 0)
-    {
-# if !defined(ENABLE_ITTI)
-      if (s1ap_eNB_init (EPC_MODE_MME_ADDRESS, Mod_id) < 0)
-        {
-          mac_xface->macphy_exit ("");
-          return -1;
-        }
-# endif
-    }
-#endif
+  // configure SRB1/SRB2, PhysicalConfigDedicated, MAC_MainConfig for UE
+  eNB_RRC_INST *rrc_inst = &eNB_rrc_inst[Mod_id];
 
-  eNB_rrc_inst[Mod_id].Info.Nb_ue = 0;
 
-  eNB_rrc_inst[Mod_id].Srb0.Active = 0;
+  struct PhysicalConfigDedicated **physicalConfigDedicated = &rrc_inst->physicalConfigDedicated[UE_index];
 
-  for (j = 0; j < (NUMBER_OF_UE_MAX + 1); j++)
-    {
-      eNB_rrc_inst[Mod_id].Srb2[j].Active = 0;
-    }
 
+  struct SRB_ToAddMod *SRB2_config;
+  struct SRB_ToAddMod__rlc_Config *SRB2_rlc_config;
+  struct SRB_ToAddMod__logicalChannelConfig *SRB2_lchan_config;
+  struct LogicalChannelConfig__ul_SpecificParameters
+    *SRB2_ul_SpecificParameters;
+  SRB_ToAddModList_t *SRB_configList = rrc_inst->SRB_configList[UE_index];
+  SRB_ToAddModList_t *SRB_configList2;
 
-  /// System Information INIT
+  struct DRB_ToAddMod *DRB_config;
+  struct RLC_Config *DRB_rlc_config;
+  struct PDCP_Config *DRB_pdcp_config;
+  struct PDCP_Config__rlc_UM *PDCP_rlc_UM;
+  struct LogicalChannelConfig *DRB_lchan_config;
+  struct LogicalChannelConfig__ul_SpecificParameters
+    *DRB_ul_SpecificParameters;
+  DRB_ToAddModList_t **DRB_configList = &rrc_inst->DRB_configList[UE_index];
 
+  MAC_MainConfig_t *mac_MainConfig;
+  MeasObjectToAddModList_t *MeasObj_list;
+  MeasObjectToAddMod_t *MeasObj;
+  ReportConfigToAddModList_t *ReportConfig_list;
+  ReportConfigToAddMod_t *ReportConfig_per, *ReportConfig_A1,
+    *ReportConfig_A2, *ReportConfig_A3, *ReportConfig_A4, *ReportConfig_A5;
+  MeasIdToAddModList_t *MeasId_list;
+  MeasIdToAddMod_t *MeasId0, *MeasId1, *MeasId2, *MeasId3, *MeasId4, *MeasId5;
+#if Rel10
+  long *sr_ProhibitTimer_r9;
+#endif
 
-  LOG_I (RRC, "Checking release \n");
-#ifdef Rel10
+  long *logicalchannelgroup, *logicalchannelgroup_drb;
+  long *maxHARQ_Tx, *periodicBSR_Timer;
 
-  // Thishas to come from some top-level configuration
-  printf ("Rel10 RRC detected, MBMS flag %d\n",
-          eNB_rrc_inst[Mod_id].MBMS_flag);
+  RSRP_Range_t *rsrp=NULL;
+  struct MeasConfig__speedStatePars *Sparams=NULL;
+  QuantityConfig_t *quantityConfig=NULL;
+  CellsToAddMod_t *CellToAdd;
+  CellsToAddModList_t *CellsToAddModList;
 
-#else
-  printf ("Rel8 RRC\n");
-#endif
+  C_RNTI_t *cba_RNTI = NULL;
 #ifdef CBA
-  for (j = 0; j < NUM_MAX_CBA_GROUP; j++)
-    eNB_rrc_inst[Mod_id].cba_rnti[j] = CBA_OFFSET + j;
+  //struct PUSCH_CBAConfigDedicated_vlola  *pusch_CBAConfigDedicated_vlola;
+  uint8_t *cba_RNTI_buf;
+  cba_RNTI = CALLOC (1, sizeof (C_RNTI_t));
+  cba_RNTI_buf = CALLOC (1, 2 * sizeof (uint8_t));
+  cba_RNTI->buf = cba_RNTI_buf;
+  cba_RNTI->size = 2;
+  cba_RNTI->bits_unused = 0;
+  // associate UEs to the CBa groups as a function of their UE id
+  if (rrc_inst->num_active_cba_groups)
+    {
+      cba_RNTI->buf[0] =
+        rrc_inst->cba_rnti[UE_index % rrc_inst->num_active_cba_groups] & 0xff;
+      cba_RNTI->buf[1] = 0xff;
+      LOG_D (RRC,
+             "[eNB %d] Frame %d: cba_RNTI = %x in group %d is attribued to UE %d\n",
+             Mod_id, frame,
+             rrc_inst->cba_rnti[UE_index % rrc_inst->num_active_cba_groups],
+             UE_index % rrc_inst->num_active_cba_groups, UE_index);
+    }
+  else
+    {
+      cba_RNTI->buf[0] = 0x0;
+      cba_RNTI->buf[1] = 0x0;
+      LOG_D (RRC, "[eNB %d] Frame %d: no cba_RNTI is configured for UE %d\n",
+             Mod_id, frame, UE_index);
+    }
 
-  if (eNB_rrc_inst[Mod_id].num_active_cba_groups > NUM_MAX_CBA_GROUP)
-    eNB_rrc_inst[Mod_id].num_active_cba_groups = NUM_MAX_CBA_GROUP;
 
-  LOG_D (RRC,
-         "[eNB %d] Initialization of 4 cba_RNTI values (%x %x %x %x) num active groups %d\n",
-         Mod_id, eNB_rrc_inst[Mod_id].cba_rnti[0],
-         eNB_rrc_inst[Mod_id].cba_rnti[1], eNB_rrc_inst[Mod_id].cba_rnti[2],
-         eNB_rrc_inst[Mod_id].cba_rnti[3],
-         eNB_rrc_inst[Mod_id].num_active_cba_groups);
 #endif
+  // Configure SRB2
+  /// SRB2
+  SRB2_config = CALLOC (1, sizeof (*SRB2_config));
+  SRB_configList2 = CALLOC (1, sizeof (*SRB_configList2));
+  memset (SRB_configList2, 0, sizeof (*SRB_configList2));
 
-  init_SI (Mod_id);
+  SRB2_config->srb_Identity = 2;
+  SRB2_rlc_config = CALLOC (1, sizeof (*SRB2_rlc_config));
+  SRB2_config->rlc_Config = SRB2_rlc_config;
 
-#ifdef Rel10
-  switch (eNB_rrc_inst[Mod_id].MBMS_flag) {
-  case 1:
-  case 2:
-  case 3:
-    LOG_I(RRC,"[eNB %d] Configuring 1 MBSFN sync area\n", Mod_id);
-    eNB_rrc_inst[Mod_id].num_mbsfn_sync_area=1;
-    break;
-  case 4: 
-    LOG_I(RRC,"[eNB %d] Configuring 2 MBSFN sync area\n", Mod_id);
-    eNB_rrc_inst[Mod_id].num_mbsfn_sync_area=2;
-    break;
-  default:
-    eNB_rrc_inst[Mod_id].num_mbsfn_sync_area=0;
-    break;
-  }
-  // if we are here the eNB_rrc_inst[Mod_id].MBMS_flag > 0,
-  /// MCCH INIT
-  if (eNB_rrc_inst[Mod_id].MBMS_flag > 0 ) {
-    init_MCCH (Mod_id);
-    /// MTCH data bearer init
-    init_MBMS (Mod_id, 0);
-  }
-  
-#endif
+  SRB2_rlc_config->present = SRB_ToAddMod__rlc_Config_PR_explicitValue;
+  SRB2_rlc_config->choice.explicitValue.present = RLC_Config_PR_am;
+  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.t_PollRetransmit = T_PollRetransmit_ms15;
+  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollPDU = PollPDU_p8;
+  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollByte = PollByte_kB1000;
+  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.maxRetxThreshold = UL_AM_RLC__maxRetxThreshold_t32;
+  SRB2_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_Reordering = T_Reordering_ms50;
+  SRB2_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_StatusProhibit =  T_StatusProhibit_ms10;
 
-#ifdef NO_RRM                   //init ch SRB0, SRB1 & BDTCH
-  openair_rrc_on (Mod_id, 1);
-#else
-  eNB_rrc_inst[Mod_id].Last_scan_req = 0;
-  send_msg (&S_rrc,
-            msg_rrc_phy_synch_to_MR_ind (Mod_id,
-                                         eNB_rrc_inst[Mod_id].Mac_id));
-#endif
+  SRB2_lchan_config = CALLOC (1, sizeof (*SRB2_lchan_config));
+  SRB2_config->logicalChannelConfig = SRB2_lchan_config;
 
-  return 0;
+  SRB2_lchan_config->present =  SRB_ToAddMod__logicalChannelConfig_PR_explicitValue;
 
-}
 
-/*------------------------------------------------------------------------------*/
-int rrc_eNB_decode_dcch (u8 Mod_id, u32 frame, u8 Srb_id, u8 UE_index,
-                     u8 * Rx_sdu, u8 sdu_size)
-{
-  /*------------------------------------------------------------------------------*/
+  SRB2_ul_SpecificParameters = CALLOC (1, sizeof (*SRB2_ul_SpecificParameters));
 
-  asn_dec_rval_t dec_rval;
-  //UL_DCCH_Message_t uldcchmsg;
-  UL_DCCH_Message_t *ul_dcch_msg = NULL;        //&uldcchmsg;
-  UE_EUTRA_Capability_t *UE_EUTRA_Capability = NULL;
-
-  int i;
+  SRB2_ul_SpecificParameters->priority = 1;
+  SRB2_ul_SpecificParameters->prioritisedBitRate = LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
+  SRB2_ul_SpecificParameters->bucketSizeDuration = LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
 
-  if (Srb_id != 1)
-    {
-      LOG_E (RRC,
-             "[eNB %d] Frame %d: Received message on SRB%d, should not have ...\n",
-             Mod_id, frame, Srb_id);
-    }
+  // LCG for CCCH and DCCH is 0 as defined in 36331
+  logicalchannelgroup = CALLOC (1, sizeof (long));
+  *logicalchannelgroup = 0;
 
-  //memset(ul_dcch_msg,0,sizeof(UL_DCCH_Message_t));
+  SRB2_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup;
 
-  LOG_D (RRC, "[eNB %d] Frame %d: Decoding UL-DCCH Message\n", Mod_id, frame);
-  dec_rval = uper_decode (NULL,
-                          &asn_DEF_UL_DCCH_Message,
-                          (void **) &ul_dcch_msg, Rx_sdu, sdu_size, 0, 0);
+  SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters =  SRB2_ul_SpecificParameters;
+  ASN_SEQUENCE_ADD (&SRB_configList->list, SRB2_config);
+  ASN_SEQUENCE_ADD (&SRB_configList2->list, SRB2_config);
 
-#if defined(ENABLE_ITTI)
-  {
-    MessageDef *message_p;
+  // Configure DRB
+  *DRB_configList = CALLOC (1, sizeof (*DRB_configList));
+  /// DRB
+  DRB_config = CALLOC (1, sizeof (*DRB_config));
 
-    message_p = itti_alloc_new_message (TASK_RRC_ENB, RRC_UL_DCCH_MESSAGE);
-    memcpy (&message_p->msg, (void *) ul_dcch_msg, sizeof(RrcUlDcchMessage));
+  //DRB_config->drb_Identity = (DRB_Identity_t) 1; //allowed values 1..32
+  // NN: this is the 1st DRB for this ue, so set it to 1
+  DRB_config->drb_Identity = (DRB_Identity_t) 1;        // (UE_index+1); //allowed values 1..32
+  DRB_config->logicalChannelIdentity = CALLOC (1, sizeof (long));
+  *(DRB_config->logicalChannelIdentity) = (long) 3;
+  DRB_rlc_config = CALLOC (1, sizeof (*DRB_rlc_config));
+  DRB_config->rlc_Config = DRB_rlc_config;
+  DRB_rlc_config->present = RLC_Config_PR_um_Bi_Directional;
+  DRB_rlc_config->choice.um_Bi_Directional.ul_UM_RLC.sn_FieldLength =  SN_FieldLength_size10;
+  DRB_rlc_config->choice.um_Bi_Directional.dl_UM_RLC.sn_FieldLength =  SN_FieldLength_size10;
+  DRB_rlc_config->choice.um_Bi_Directional.dl_UM_RLC.t_Reordering =   T_Reordering_ms5;
 
-    itti_send_msg_to_task (TASK_UNKNOWN, Mod_id, message_p);
-  }
-#endif
+  DRB_pdcp_config = CALLOC (1, sizeof (*DRB_pdcp_config));
+  DRB_config->pdcp_Config = DRB_pdcp_config;
+  DRB_pdcp_config->discardTimer = NULL;
+  DRB_pdcp_config->rlc_AM = NULL;
+  PDCP_rlc_UM = CALLOC (1, sizeof (*PDCP_rlc_UM));
+  DRB_pdcp_config->rlc_UM = PDCP_rlc_UM;
+  PDCP_rlc_UM->pdcp_SN_Size = PDCP_Config__rlc_UM__pdcp_SN_Size_len12bits;
+  DRB_pdcp_config->headerCompression.present = PDCP_Config__headerCompression_PR_notUsed;
 
-  for (i = 0; i < sdu_size; i++)
-    LOG_T (RRC, "%x.", Rx_sdu[i]);
-  LOG_T (RRC, "\n");
+  DRB_lchan_config = CALLOC (1, sizeof (*DRB_lchan_config));
+  DRB_config->logicalChannelConfig = DRB_lchan_config;
+  DRB_ul_SpecificParameters = CALLOC (1, sizeof (*DRB_ul_SpecificParameters));
+  DRB_lchan_config->ul_SpecificParameters = DRB_ul_SpecificParameters;
 
-  if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0))
-    {
-      LOG_E (RRC, "[UE %d] Frame %d : Failed to decode UL-DCCH (%d bytes)\n",
-             Mod_id, frame, dec_rval.consumed);
-      return -1;
-    }
 
-  if (ul_dcch_msg->message.present == UL_DCCH_MessageType_PR_c1)
-    {
+  DRB_ul_SpecificParameters->priority = 2;      // lower priority than srb1, srb2
+  DRB_ul_SpecificParameters->prioritisedBitRate = LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
+  DRB_ul_SpecificParameters->bucketSizeDuration = LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
 
-      switch (ul_dcch_msg->message.choice.c1.present)
-        {
-        case UL_DCCH_MessageType__c1_PR_NOTHING:        /* No components present */
-          break;
+  // LCG for DTCH can take the value from 1 to 3 as defined in 36331: normally controlled by upper layers (like RRM)
+  logicalchannelgroup_drb = CALLOC (1, sizeof (long));
+  *logicalchannelgroup_drb = 1;
+  DRB_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup_drb;
 
-        case UL_DCCH_MessageType__c1_PR_csfbParametersRequestCDMA2000:
-          break;
+  ASN_SEQUENCE_ADD (&(*DRB_configList)->list, DRB_config);
 
-        case UL_DCCH_MessageType__c1_PR_measurementReport:
-          LOG_D (RRC,
-                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND "
-                 "%d bytes (measurementReport) --->][RRC_eNB][MOD %02d][]\n",
-                 frame, Mod_id, DCCH, sdu_size, Mod_id);
-          rrc_eNB_process_MeasurementReport (Mod_id, frame, UE_index,
-                                             &ul_dcch_msg->message.choice.c1.
-                                             choice.measurementReport.
-                                             criticalExtensions.choice.c1.
-                                             choice.measurementReport_r8.
-                                             measResults);
-          break;
+  mac_MainConfig = CALLOC (1, sizeof (*mac_MainConfig));
+  eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index] = mac_MainConfig;
 
-        case UL_DCCH_MessageType__c1_PR_rrcConnectionReconfigurationComplete:
-          LOG_D (RRC,
-                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
-                 "(RRCConnectionReconfigurationComplete) --->][RRC_eNB][MOD %02d][]\n",
-                 frame, Mod_id, DCCH, sdu_size, Mod_id);
-          if (ul_dcch_msg->message.choice.c1.choice.
-              rrcConnectionReconfigurationComplete.criticalExtensions.
-              present ==
-              RRCConnectionReconfigurationComplete__criticalExtensions_PR_rrcConnectionReconfigurationComplete_r8)
-            {
-              rrc_eNB_process_RRCConnectionReconfigurationComplete (Mod_id,
-                                                                    frame,
-                                                                    UE_index,
-                                                                    &ul_dcch_msg->
-                                                                    message.
-                                                                    choice.c1.
-                                                                    choice.
-                                                                    rrcConnectionReconfigurationComplete.
-                                                                    criticalExtensions.
-                                                                    choice.
-                                                                    rrcConnectionReconfigurationComplete_r8);
-              eNB_rrc_inst[Mod_id].Info.UE[UE_index].Status = RRC_RECONFIGURED;
-              LOG_I (RRC, "[eNB %d] UE %d State = RRC_RECONFIGURED \n",
-                     Mod_id, UE_index);
+  mac_MainConfig->ul_SCH_Config = CALLOC (1, sizeof (*mac_MainConfig->ul_SCH_Config));
 
-#if defined(ENABLE_USE_MME)
-            if (EPC_MODE_ENABLED == 1)
-            {
-# if defined(ENABLE_ITTI)
-              eNB_rrc_inst[Mod_id].Info.UE[UE_index].e_rab[eNB_rrc_inst[Mod_id].Info.UE[UE_index].index_of_e_rabs - 1].status = E_RAB_STATUS_DONE;
-            }
-# endif
-#endif
-          }
+  maxHARQ_Tx = CALLOC (1, sizeof (long));
+  *maxHARQ_Tx = MAC_MainConfig__ul_SCH_Config__maxHARQ_Tx_n5;
+  mac_MainConfig->ul_SCH_Config->maxHARQ_Tx = maxHARQ_Tx;
+  periodicBSR_Timer = CALLOC (1, sizeof (long));
+  *periodicBSR_Timer = MAC_MainConfig__ul_SCH_Config__periodicBSR_Timer_sf64;
+  mac_MainConfig->ul_SCH_Config->periodicBSR_Timer = periodicBSR_Timer;
+  mac_MainConfig->ul_SCH_Config->retxBSR_Timer =  MAC_MainConfig__ul_SCH_Config__retxBSR_Timer_sf320;
+  mac_MainConfig->ul_SCH_Config->ttiBundling = 0;       // FALSE
 
-#if defined(ENABLE_USE_MME)
-          if (EPC_MODE_ENABLED == 1)
-          {
-# if defined(ENABLE_ITTI)
-            eNB_RRC_UE_INFO *UE_info = &eNB_rrc_inst[Mod_id].Info.UE[UE_index];
+  mac_MainConfig->drx_Config = NULL;
 
-            /* Process e RAB parameters received from S1AP one by one (the previous one is completed, eventually process the next one) */
-            if  (UE_info->nb_of_e_rabs > 0)
-            {
-                /* Process e RAB configuration from S1AP initial_context_setup_req */
-                rrc_eNB_generate_defaultRRCConnectionReconfiguration (Mod_id, frame,
-                                                                      UE_index,
-                                                                      UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer,
-                                                                      UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.length,
-                                                                      eNB_rrc_inst[Mod_id].HO_flag);
-                /* Free the NAS PDU buffer and invalidate it */
-                if (UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer != NULL)
-                {
-                  free (UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer);
-                }
-                UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer = NULL;
-                UE_info->nb_of_e_rabs --;
-                UE_info->index_of_e_rabs ++;
-            }
-            else
-            {
-              rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP (Mod_id, UE_index);
-            }
-# endif
-          }
-#endif
-          break;
+  mac_MainConfig->phr_Config =  CALLOC (1, sizeof (*mac_MainConfig->phr_Config));
 
-        case UL_DCCH_MessageType__c1_PR_rrcConnectionReestablishmentComplete:
-          LOG_D (RRC,
-                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
-                 "(rrcConnectionReestablishmentComplete) --->][RRC_eNB][MOD %02d][]\n",
-                 frame, Mod_id, DCCH, sdu_size, Mod_id);
-          break;
+  mac_MainConfig->phr_Config->present = MAC_MainConfig__phr_Config_PR_setup;
+  mac_MainConfig->phr_Config->choice.setup.periodicPHR_Timer = MAC_MainConfig__phr_Config__setup__periodicPHR_Timer_sf20;       // sf20 = 20 subframes
 
-        case UL_DCCH_MessageType__c1_PR_rrcConnectionSetupComplete:
-          LOG_D (RRC,
-                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
-                 "(RRCConnectionSetupComplete) --->][RRC_eNB][MOD %02d][]\n",
-                 frame, Mod_id, DCCH, sdu_size, Mod_id);
+  mac_MainConfig->phr_Config->choice.setup.prohibitPHR_Timer = MAC_MainConfig__phr_Config__setup__prohibitPHR_Timer_sf20;       // sf20 = 20 subframes
 
-          if (ul_dcch_msg->message.choice.c1.choice.
-              rrcConnectionSetupComplete.criticalExtensions.present ==
-              RRCConnectionSetupComplete__criticalExtensions_PR_c1)
-            {
-              if (ul_dcch_msg->message.choice.c1.choice.
-                  rrcConnectionSetupComplete.criticalExtensions.choice.c1.
-                  present ==
-                  RRCConnectionSetupComplete__criticalExtensions__c1_PR_rrcConnectionSetupComplete_r8)
-                {
-                  rrc_eNB_process_RRCConnectionSetupComplete (Mod_id, frame,
-                                                              UE_index,
-                                                              &ul_dcch_msg->
-                                                              message.choice.
-                                                              c1.choice.
-                                                              rrcConnectionSetupComplete.
-                                                              criticalExtensions.
-                                                              choice.c1.
-                                                              choice.
-                                                              rrcConnectionSetupComplete_r8);
-                  eNB_rrc_inst[Mod_id].Info.UE[UE_index].Status = RRC_CONNECTED;
-                  LOG_I (RRC, "[eNB %d] UE %d State = RRC_CONNECTED \n",
-                         Mod_id, UE_index);
-                  LOG_D (RRC,
-                         "[MSC_NBOX][FRAME %05d][RRC_eNB][MOD %02d][][Rx RRCConnectionSetupComplete\n"
-                         "Now CONNECTED with UE %d][RRC_eNB][MOD %02d][]\n",
-                         frame, Mod_id, UE_index, Mod_id);
-                }
-            }
-          break;
+  mac_MainConfig->phr_Config->choice.setup.dl_PathlossChange = MAC_MainConfig__phr_Config__setup__dl_PathlossChange_dB1;        // Value dB1 =1 dB, dB3 = 3 dB
 
-        case UL_DCCH_MessageType__c1_PR_securityModeComplete:
-          LOG_I (RRC,
-                 "[eNB %d] Frame %d received securityModeComplete on UL-DCCH %d from UE %d\n",
-                 Mod_id, frame, DCCH, UE_index);
-          LOG_D (RRC,
-                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
-                 "(securityModeComplete) --->][RRC_eNB][MOD %02d][]\n", frame,
-                 Mod_id, DCCH, sdu_size, Mod_id);
-#ifdef XER_PRINT
-          xer_fprint (stdout, &asn_DEF_UL_DCCH_Message, (void *) ul_dcch_msg);
+#ifdef Rel10
+  sr_ProhibitTimer_r9 = CALLOC (1, sizeof (long));
+  *sr_ProhibitTimer_r9 = 0;     // SR tx on PUCCH, Value in number of SR period(s). Value 0 = no timer for SR, Value 2= 2*SR
+  mac_MainConfig->sr_ProhibitTimer_r9 = sr_ProhibitTimer_r9;
+  //sps_RA_ConfigList_rlola = NULL;
 #endif
-          // confirm with PDCP about the security mode for DCCH
-          //rrc_pdcp_config_req (Mod_id, frame, 1,ACTION_SET_SECURITY_MODE, (UE_index * NB_RB_MAX) + DCCH, 0x77);
-          // continue the procedure
-          rrc_eNB_generate_UECapabilityEnquiry (Mod_id, frame, UE_index);
-          break;
 
-        case UL_DCCH_MessageType__c1_PR_securityModeFailure:
-          LOG_D (RRC,
-                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
-                 "(securityModeFailure) --->][RRC_eNB][MOD %02d][]\n", frame,
-                 Mod_id, DCCH, sdu_size, Mod_id);
-#ifdef XER_PRINT
-          xer_fprint (stdout, &asn_DEF_UL_DCCH_Message, (void *) ul_dcch_msg);
-#endif
-          // cancel the security mode in PDCP
 
-          // followup with the remaining procedure
-          rrc_eNB_generate_UECapabilityEnquiry (Mod_id, frame, UE_index);
-          break;
+  // Measurement ID list
+  MeasId_list = CALLOC (1, sizeof (*MeasId_list));
+  memset ((void *) MeasId_list, 0, sizeof (*MeasId_list));
 
-        case UL_DCCH_MessageType__c1_PR_ueCapabilityInformation:
-          LOG_I (RRC,
-                 "[eNB %d] Frame %d received ueCapabilityInformation on UL-DCCH %d from UE %d\n",
-                 Mod_id, frame, DCCH, UE_index);
-          LOG_D (RRC,
-                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
-                 "(UECapabilityInformation) --->][RRC_eNB][MOD %02d][]\n",
-                 frame, Mod_id, DCCH, sdu_size, Mod_id);
-#ifdef XER_PRINT
-          xer_fprint (stdout, &asn_DEF_UL_DCCH_Message, (void *) ul_dcch_msg);
-#endif
-          dec_rval = uper_decode (NULL,
-                                  &asn_DEF_UE_EUTRA_Capability,
-                                  (void **) &UE_EUTRA_Capability,
-                                  ul_dcch_msg->message.choice.c1.choice.
-                                  ueCapabilityInformation.criticalExtensions.
-                                  choice.c1.choice.ueCapabilityInformation_r8.
-                                  ue_CapabilityRAT_ContainerList.list.
-                                  array[0]->ueCapabilityRAT_Container.buf,
-                                  ul_dcch_msg->message.choice.c1.choice.
-                                  ueCapabilityInformation.criticalExtensions.
-                                  choice.c1.choice.ueCapabilityInformation_r8.
-                                  ue_CapabilityRAT_ContainerList.list.
-                                  array[0]->ueCapabilityRAT_Container.size, 0,
-                                  0);
-#ifdef XER_PRINT
-          xer_fprint (stdout, &asn_DEF_UE_EUTRA_Capability,
-                      (void *) UE_EUTRA_Capability);
-#endif
-
-#if defined(ENABLE_USE_MME)
-          if (EPC_MODE_ENABLED == 1)
-          {
-              eNB_RRC_UE_INFO *UE_info = &eNB_rrc_inst[Mod_id].Info.UE[UE_index];
+  MeasId0 = CALLOC (1, sizeof (*MeasId0));
+  MeasId0->measId = 1;
+  MeasId0->measObjectId = 1;
+  MeasId0->reportConfigId = 1;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId0);
 
-# if defined(ENABLE_ITTI)
-            /* Process e RAB parameters received from S1AP one by one (assuming that only one will be received from real network this should be OK) */
-            if  (UE_info->nb_of_e_rabs > 0)
-            {
-                /* Process the first e RAB configuration from S1AP initial_context_setup_req */
-                rrc_eNB_generate_defaultRRCConnectionReconfiguration (Mod_id, frame,
-                                                                      UE_index,
-                                                                      UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer,
-                                                                      UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.length,
-                                                                      eNB_rrc_inst[Mod_id].HO_flag);
-                /* Free the NAS PDU buffer and invalidate it */
-                if (UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer != NULL)
-                {
-                  free (UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer);
-                }
-                UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer = NULL;
-                UE_info->nb_of_e_rabs --;
-                UE_info->index_of_e_rabs ++;
-            }
-# endif
-          }
-          else
-#endif
-          {
-            rrc_eNB_generate_defaultRRCConnectionReconfiguration (Mod_id, frame,
-                                                                  UE_index,
-                                                                  NULL, 0, eNB_rrc_inst[Mod_id].HO_flag);
-          }
-          break;
+  MeasId1 = CALLOC (1, sizeof (*MeasId1));
+  MeasId1->measId = 2;
+  MeasId1->measObjectId = 1;
+  MeasId1->reportConfigId = 2;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId1);
 
-        case UL_DCCH_MessageType__c1_PR_ulHandoverPreparationTransfer:
-          break;
+  MeasId2 = CALLOC (1, sizeof (*MeasId2));
+  MeasId2->measId = 3;
+  MeasId2->measObjectId = 1;
+  MeasId2->reportConfigId = 3;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId2);
 
-        case UL_DCCH_MessageType__c1_PR_ulInformationTransfer:
-#if defined(ENABLE_USE_MME)
-          if (EPC_MODE_ENABLED == 1)
-          {
-            rrc_eNB_send_S1AP_UPLINK_NAS(Mod_id, UE_index, ul_dcch_msg);
-          }
-#endif
-          break;
+  MeasId3 = CALLOC (1, sizeof (*MeasId3));
+  MeasId3->measId = 4;
+  MeasId3->measObjectId = 1;
+  MeasId3->reportConfigId = 4;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId3);
 
-        case UL_DCCH_MessageType__c1_PR_counterCheckResponse:
-          break;
+  MeasId4 = CALLOC (1, sizeof (*MeasId4));
+  MeasId4->measId = 5;
+  MeasId4->measObjectId = 1;
+  MeasId4->reportConfigId = 5;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId4);
 
-#ifdef Rel10
-        case UL_DCCH_MessageType__c1_PR_ueInformationResponse_r9:
-          break;
+  MeasId5 = CALLOC (1, sizeof (*MeasId5));
+  MeasId5->measId = 6;
+  MeasId5->measObjectId = 1;
+  MeasId5->reportConfigId = 6;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId5);
 
-        case UL_DCCH_MessageType__c1_PR_proximityIndication_r9:
-          break;
+  //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->measIdToAddModList = MeasId_list;
 
-        case UL_DCCH_MessageType__c1_PR_rnReconfigurationComplete_r10:
-          break;
+  // Add one EUTRA Measurement Object
+  MeasObj_list = CALLOC (1, sizeof (*MeasObj_list));
+  memset ((void *) MeasObj_list, 0, sizeof (*MeasObj_list));
 
-        case UL_DCCH_MessageType__c1_PR_mbmsCountingResponse_r10:
-          break;
+  // Configure MeasObject
 
-        case UL_DCCH_MessageType__c1_PR_interFreqRSTDMeasurementIndication_r10:
-          break;
-#endif
+  MeasObj = CALLOC (1, sizeof (*MeasObj));
+  memset ((void *) MeasObj, 0, sizeof (*MeasObj));
 
-        default:
-          LOG_E (RRC, "[UE %d] Frame %d : Unknown message\n", Mod_id, frame);
-          return -1;
-        }
-      return 0;
-    }
-  else
-    {
-      LOG_E (RRC, "[UE %d] Frame %d : Unknown error\n", Mod_id, frame);
-      return -1;
-    }
+  MeasObj->measObjectId = 1;
+  MeasObj->measObject.present =  MeasObjectToAddMod__measObject_PR_measObjectEUTRA;
+  MeasObj->measObject.choice.measObjectEUTRA.carrierFreq = 36090;
+  MeasObj->measObject.choice.measObjectEUTRA.allowedMeasBandwidth = AllowedMeasBandwidth_mbw25;
+  MeasObj->measObject.choice.measObjectEUTRA.presenceAntennaPort1 = 1;
+  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.buf = CALLOC (1, sizeof (uint8_t));
+  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.buf[0] = 0;
+  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.size = 1;
+  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.bits_unused = 6;
+  MeasObj->measObject.choice.measObjectEUTRA.offsetFreq = NULL; // Default is 15 or 0dB
 
-}
+  MeasObj->measObject.choice.measObjectEUTRA.cellsToAddModList = (CellsToAddModList_t *) CALLOC (1, sizeof (*CellsToAddModList));
 
-/*------------------------------------------------------------------------------*/
-int rrc_eNB_decode_ccch (u8 Mod_id, u32 frame, SRB_INFO * Srb_info)
-{
-  /*------------------------------------------------------------------------------*/
+  CellsToAddModList = MeasObj->measObject.choice.measObjectEUTRA.cellsToAddModList;
 
-  u16 Idx, UE_index;
+  // Add adjacent cell lists (6 per eNB)
+  for (i = 0; i < 6; i++)   {
+      CellToAdd = (CellsToAddMod_t *) CALLOC (1, sizeof (*CellToAdd));
+      CellToAdd->cellIndex = i + 1;
+      CellToAdd->physCellId = get_adjacent_cell_id (Mod_id, i);
+      CellToAdd->cellIndividualOffset = Q_OffsetRange_dB0;
 
-  asn_dec_rval_t dec_rval;
-  //UL_CCCH_Message_t ulccchmsg;
-  UL_CCCH_Message_t *ul_ccch_msg = NULL;        //&ulccchmsg;
-  RRCConnectionRequest_r8_IEs_t *rrcConnectionRequest;
-  int i, rval;
+      ASN_SEQUENCE_ADD (&CellsToAddModList->list, CellToAdd);
+  }
 
+  ASN_SEQUENCE_ADD (&MeasObj_list->list, MeasObj);
+  //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->measObjectToAddModList = MeasObj_list;
 
-  //memset(ul_ccch_msg,0,sizeof(UL_CCCH_Message_t));
+  // Report Configurations for periodical, A1-A5 events
+  ReportConfig_list = CALLOC (1, sizeof (*ReportConfig_list));
+  memset ((void *) ReportConfig_list, 0, sizeof (*ReportConfig_list));
 
-  LOG_T (RRC, "[eNB %d] Frame %d: Decoding UL CCCH %x.%x.%x.%x.%x.%x (%p)\n",
-         Mod_id, frame, ((uint8_t *) Srb_info->Rx_buffer.Payload)[0],
-         ((uint8_t *) Srb_info->Rx_buffer.Payload)[1],
-         ((uint8_t *) Srb_info->Rx_buffer.Payload)[2],
-         ((uint8_t *) Srb_info->Rx_buffer.Payload)[3],
-         ((uint8_t *) Srb_info->Rx_buffer.Payload)[4],
-         ((uint8_t *) Srb_info->Rx_buffer.Payload)[5],
-         (uint8_t *) Srb_info->Rx_buffer.Payload);
-  dec_rval =
-    uper_decode (NULL, &asn_DEF_UL_CCCH_Message, (void **) &ul_ccch_msg,
-                 (uint8_t *) Srb_info->Rx_buffer.Payload, 100, 0, 0);
+  ReportConfig_per = CALLOC (1, sizeof (*ReportConfig_per));
+  memset ((void *) ReportConfig_per, 0, sizeof (*ReportConfig_per));
 
-#if defined(ENABLE_ITTI)
-  {
-    MessageDef *message_p;
+  ReportConfig_A1 = CALLOC (1, sizeof (*ReportConfig_A1));
+  memset ((void *) ReportConfig_A1, 0, sizeof (*ReportConfig_A1));
 
-    message_p = itti_alloc_new_message (TASK_RRC_ENB, RRC_UL_CCCH_MESSAGE);
-    memcpy (&message_p->msg, (void *) ul_ccch_msg, sizeof(RrcUlCcchMessage));
+  ReportConfig_A2 = CALLOC (1, sizeof (*ReportConfig_A2));
+  memset ((void *) ReportConfig_A2, 0, sizeof (*ReportConfig_A2));
 
-    itti_send_msg_to_task (TASK_UNKNOWN, Mod_id, message_p);
-  }
-#endif
+  ReportConfig_A3 = CALLOC (1, sizeof (*ReportConfig_A3));
+  memset ((void *) ReportConfig_A3, 0, sizeof (*ReportConfig_A3));
 
-for (i = 0; i < 8; i++)
-    LOG_T (RRC, "%x.", ((u8 *) & ul_ccch_msg)[i]);
-  if (dec_rval.consumed == 0)
-    {
-      LOG_E (RRC, "[eNB %d] FATAL Error in receiving CCCH\n", Mod_id);
-      return -1;                //mac_xface->macphy_exit(""); //exit(-1);
-    }
-  if (ul_ccch_msg->message.present == UL_CCCH_MessageType_PR_c1)
-    {
+  ReportConfig_A4 = CALLOC (1, sizeof (*ReportConfig_A4));
+  memset ((void *) ReportConfig_A4, 0, sizeof (*ReportConfig_A4));
 
-      switch (ul_ccch_msg->message.choice.c1.present)
-        {
+  ReportConfig_A5 = CALLOC (1, sizeof (*ReportConfig_A5));
+  memset ((void *) ReportConfig_A5, 0, sizeof (*ReportConfig_A5));
 
-        case UL_CCCH_MessageType__c1_PR_NOTHING:
-          LOG_I (RRC,
-                 "[eNB %d] Frame %d : Received PR_NOTHING on UL-CCCH-Message\n",
-                 Mod_id, frame);
-          break;
+  ReportConfig_per->reportConfigId = 1;
+  ReportConfig_per->reportConfig.present = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerType.present = ReportConfigEUTRA__triggerType_PR_periodical;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerType.choice.periodical.purpose = ReportConfigEUTRA__triggerType__periodical__purpose_reportStrongestCells;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerQuantity = ReportConfigEUTRA__triggerQuantity_rsrp;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportQuantity = ReportConfigEUTRA__reportQuantity_both;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.maxReportCells = 2;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportInterval = ReportInterval_ms120;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportAmount = ReportConfigEUTRA__reportAmount_infinity;
 
-        case UL_CCCH_MessageType__c1_PR_rrcConnectionReestablishmentRequest:
-          LOG_D (RRC,
-                 "[MSC_MSG][FRAME %05d][MAC_eNB][MOD %02d][][--- MAC_DATA_IND (rrcConnectionReestablishmentRequest on SRB0) -->][RRC_eNB][MOD %02d][]\n",
-                 frame, Mod_id, Mod_id);
-          LOG_I (RRC,
-                 "[eNB %d] Frame %d : RRCConnectionReestablishmentRequest not supported yet\n",
-                 Mod_id, frame);
-          break;
+  ASN_SEQUENCE_ADD (&ReportConfig_list->list, ReportConfig_per);
+ 
+  ReportConfig_A1->reportConfigId = 2;
+  ReportConfig_A1->reportConfig.present = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.present = ReportConfigEUTRA__triggerType_PR_event;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA1;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA1.a1_Threshold.present =
+    ThresholdEUTRA_PR_threshold_RSRP;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA1.a1_Threshold.choice.threshold_RSRP = 10;
 
-        case UL_CCCH_MessageType__c1_PR_rrcConnectionRequest:
-          LOG_D (RRC,
-                 "[MSC_MSG][FRAME %05d][MAC_eNB][MOD %02d][][--- MAC_DATA_IND  (rrcConnectionRequest on SRB0) -->][RRC_eNB][MOD %02d][]\n",
-                 frame, Mod_id, Mod_id);
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerQuantity = ReportConfigEUTRA__triggerQuantity_rsrp;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportQuantity = ReportConfigEUTRA__reportQuantity_both;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.maxReportCells = 2;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportInterval = ReportInterval_ms120;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportAmount = ReportConfigEUTRA__reportAmount_infinity;
 
-          rrcConnectionRequest = &ul_ccch_msg->message.choice.c1.choice.rrcConnectionRequest.criticalExtensions.choice.rrcConnectionRequest_r8;
-          UE_index = rrc_eNB_get_next_free_UE_index (Mod_id,
-					(u8 *) rrcConnectionRequest->ue_Identity.
-					choice.randomValue.buf);
+  ASN_SEQUENCE_ADD (&ReportConfig_list->list, ReportConfig_A1);
 
-          if (UE_index != UE_INDEX_INVALID)
-            {
-#if defined(ENABLE_ITTI)
-              /* Check s-TMSI presence in message */
-              eNB_rrc_inst[Mod_id].Info.UE[UE_index].Initialue_identity_s_TMSI.presence =
-                      (rrcConnectionRequest->ue_Identity.present == InitialUE_Identity_PR_s_TMSI);
-              if (eNB_rrc_inst[Mod_id].Info.UE[UE_index].Initialue_identity_s_TMSI.presence) {
-                /* Save s-TMSI */
-                S_TMSI_t s_TMSI = rrcConnectionRequest->ue_Identity.choice.s_TMSI;
-
-                eNB_rrc_inst[Mod_id].Info.UE[UE_index].Initialue_identity_s_TMSI.mme_code = BIT_STRING_to_uint8 (&s_TMSI.mmec);
-                eNB_rrc_inst[Mod_id].Info.UE[UE_index].Initialue_identity_s_TMSI.m_tmsi = BIT_STRING_to_uint32 (&s_TMSI.m_TMSI);
-              }
-              eNB_rrc_inst[Mod_id].Info.UE[UE_index].establishment_cause = rrcConnectionRequest->establishmentCause;
-#endif
-
-              //      memcpy(&Rrc_xface->UE_id[Mod_id][UE_index],(u8 *)rrcConnectionRequest->ue_Identity.choice.randomValue.buf,5);
-              memcpy (&eNB_rrc_inst[Mod_id].Info.UE_list[UE_index],
-                      (u8 *) rrcConnectionRequest->ue_Identity.choice.randomValue.buf, 5);
+  if (ho_state == 1 /*HO_MEASURMENT*/ ){
+    LOG_I(RRC,"[eNB %d] frame %d: requesting A2, A3, A4, A5, and A6 event reporting\n", Mod_id, frame);
+    ReportConfig_A2->reportConfigId                                                              = 3;
+    ReportConfig_A2->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.present                  = ReportConfigEUTRA__triggerType_PR_event;
+    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present= ReportConfigEUTRA__triggerType__event__eventId_PR_eventA2;
+    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA2.a2_Threshold.present = ThresholdEUTRA_PR_threshold_RSRP;
+    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA2.a2_Threshold.choice.threshold_RSRP = 10;
+    
+    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
+    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
+    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
+    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
+    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
+    
+    ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A2);
 
-              LOG_I (RRC,
-                     "[eNB %d] Frame %d : Accept new connection from UE %d (%x%x%x%x%x)\n",
-                     Mod_id, frame, UE_index,
-                     eNB_rrc_inst[Mod_id].Info.UE_list[UE_index][0],
-                     eNB_rrc_inst[Mod_id].Info.UE_list[UE_index][1],
-                     eNB_rrc_inst[Mod_id].Info.UE_list[UE_index][2],
-                     eNB_rrc_inst[Mod_id].Info.UE_list[UE_index][3],
-                     eNB_rrc_inst[Mod_id].Info.UE_list[UE_index][4]);
+    ReportConfig_A3->reportConfigId                                                              = 4;
+    ReportConfig_A3->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.present                   = ReportConfigEUTRA__triggerType_PR_event;
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA3;
 
-              //CONFIG SRB2  (DCCHs, ONE per User)  //meas && lchan Cfg
-              //eNB_rrc_inst[Mod_id].Info.Dtch_bd_config[UE_index].Status=NEED_RADIO_CONFIG;
-              //eNB_rrc_inst[Mod_id].Info.Dtch_bd_config[UE_index].Next_eNBeck_frame=Rrc_xface->Frame_index+1;
-              eNB_rrc_inst[Mod_id].Info.Nb_ue++;
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA3.a3_Offset = 1;//10;
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA3.reportOnLeave = 1;
+    
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
+    
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.hysteresis   = 0.5;
+    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.timeToTrigger = TimeToTrigger_ms40;
+    ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A3);
+    
+    ReportConfig_A4->reportConfigId                                                              = 5;
+    ReportConfig_A4->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.present                   = ReportConfigEUTRA__triggerType_PR_event;
+    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA4;
+    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA4.a4_Threshold.present = ThresholdEUTRA_PR_threshold_RSRP;
+    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA4.a4_Threshold.choice.threshold_RSRP = 10;
+    
+    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
+    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
+    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
+    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
+    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
+    
+    ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A4);
+    
+    ReportConfig_A5->reportConfigId                                                              = 6;
+    ReportConfig_A5->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.present                                    = ReportConfigEUTRA__triggerType_PR_event;
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present              = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA5;
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold1.present = ThresholdEUTRA_PR_threshold_RSRP;
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold2.present = ThresholdEUTRA_PR_threshold_RSRP;
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold1.choice.threshold_RSRP = 10;
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold2.choice.threshold_RSRP = 10;
+    
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
+    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
+    
+    ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A5);
+    //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->reportConfigToAddModList = ReportConfig_list;
 
-#ifndef NO_RRM
-              send_msg (&S_rrc, msg_rrc_MR_attach_ind (Mod_id, Mac_id));
-#else
+    rsrp=CALLOC(1,sizeof(RSRP_Range_t));
+    *rsrp=20;
+    
+    Sparams = CALLOC(1,sizeof(*Sparams));
+    Sparams->present=MeasConfig__speedStatePars_PR_setup;
+    Sparams->choice.setup.timeToTrigger_SF.sf_High=SpeedStateScaleFactors__sf_Medium_oDot75;
+    Sparams->choice.setup.timeToTrigger_SF.sf_Medium=SpeedStateScaleFactors__sf_High_oDot5;
+    Sparams->choice.setup.mobilityStateParameters.n_CellChangeHigh=10;
+    Sparams->choice.setup.mobilityStateParameters.n_CellChangeMedium=5;
+    Sparams->choice.setup.mobilityStateParameters.t_Evaluation=MobilityStateParameters__t_Evaluation_s60;
+    Sparams->choice.setup.mobilityStateParameters.t_HystNormal=MobilityStateParameters__t_HystNormal_s120;
+    
+    quantityConfig = CALLOC(1,sizeof(*quantityConfig));
+    memset((void *)quantityConfig,0,sizeof(*quantityConfig));
+    quantityConfig->quantityConfigEUTRA = CALLOC(1,sizeof(struct QuantityConfigEUTRA));
+    memset((void *)quantityConfig->quantityConfigEUTRA,0,sizeof(*quantityConfig->quantityConfigEUTRA));
+    quantityConfig->quantityConfigCDMA2000 = NULL;
+    quantityConfig->quantityConfigGERAN = NULL;
+    quantityConfig->quantityConfigUTRA = NULL;
+    quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP = CALLOC(1,sizeof(*(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP)));
+    quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = CALLOC(1,sizeof(*(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ)));
+    *quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP = FilterCoefficient_fc4;
+    *quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = FilterCoefficient_fc4;
+  
+    LOG_I(RRC,"[eNB %d] Frame %d: potential handover preparation: store the information in an intermediate structure in case of failure\n",Mod_id, frame);
+    // store the information in an intermediate structure for Hanodver management
+    //rrc_inst->handover_info.as_config.sourceRadioResourceConfig.srb_ToAddModList = CALLOC(1,sizeof());
+    rrc_inst->handover_info[UE_index] = CALLOC(1,sizeof(*(rrc_inst->handover_info[UE_index])));
+    //memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.srb_ToAddModList,(void *)SRB_list,sizeof(SRB_ToAddModList_t));
+    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.srb_ToAddModList = SRB_configList2;
+    //memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.drb_ToAddModList,(void *)DRB_list,sizeof(DRB_ToAddModList_t));
+    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.drb_ToAddModList = *DRB_configList;
+    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.drb_ToReleaseList = NULL;
+    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.mac_MainConfig = CALLOC(1, sizeof(*rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.mac_MainConfig));
+    memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.mac_MainConfig,
+           (void *)mac_MainConfig,
+           sizeof(MAC_MainConfig_t));
+    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.physicalConfigDedicated = CALLOC(1,sizeof(PhysicalConfigDedicated_t));
+    memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.physicalConfigDedicated,
+           (void *)rrc_inst->physicalConfigDedicated[UE_index],
+           sizeof(PhysicalConfigDedicated_t));
+    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.sps_Config = NULL;
+    //memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.sps_Config,(void *)rrc_inst->sps_Config[UE_index],sizeof(SPS_Config_t));
 
-              Idx = (UE_index * NB_RB_MAX) + DCCH;
-              // SRB1
-              eNB_rrc_inst[Mod_id].Srb1[UE_index].Active = 1;
-              eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.Srb_id = Idx;
-              memcpy (&eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.
-                      Lchan_desc[0], &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
-              memcpy (&eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.
-                      Lchan_desc[1], &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
+  }
+   
+  memset (buffer, 0, RRC_BUF_SIZE);
 
-              // SRB2
-              eNB_rrc_inst[Mod_id].Srb2[UE_index].Active = 1;
-              eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.Srb_id = Idx;
-              memcpy (&eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.
-                      Lchan_desc[0], &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
-              memcpy (&eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.
-                      Lchan_desc[1], &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
+  size = do_RRCConnectionReconfiguration (Mod_id, buffer, UE_index, rrc_eNB_get_next_transaction_identifier(Mod_id),  //Transaction_id,
+                                          SRB_configList2, *DRB_configList, NULL,       // DRB2_list,
+                                          NULL, //*sps_Config,
+                                          physicalConfigDedicated[UE_index], MeasObj_list, ReportConfig_list, 
+                                          quantityConfig,
+                                          MeasId_list, mac_MainConfig, NULL,NULL,Sparams,rsrp,
+                                          cba_RNTI, nas_pdu, nas_length);
 
-              rrc_eNB_generate_RRCConnectionSetup (Mod_id, frame, UE_index);
-              //LOG_D(RRC, "[MSC_NBOX][FRAME %05d][RRC_eNB][MOD %02d][][Tx RRCConnectionSetup][RRC_eNB][MOD %02d][]\n",
-              //      frame, Mod_id, Mod_id);
+  LOG_I (RRC,"[eNB %d] Frame %d, Logical Channel DL-DCCH, Generate RRCConnectionReconfiguration (bytes %d, UE id %d)\n",
+         Mod_id, frame, size, UE_index);
 
-              //LOG_D(RRC,"[eNB %d] RLC AM allocation index@0 is %d\n",Mod_id,rlc[Mod_id].m_rlc_am_array[0].allocation);
-              //LOG_D(RRC,"[eNB %d] RLC AM allocation index@1 is %d\n",Mod_id,rlc[Mod_id].m_rlc_am_array[1].allocation);
-              LOG_I (RRC,"[eNB %d] CALLING RLC CONFIG SRB1 (rbid %d) for UE %d\n",Mod_id, Idx, UE_index);
+  LOG_D (RRC,"[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %d MUI %d) --->][PDCP][MOD %02d][RB %02d]\n",
+         frame, Mod_id, size, UE_index, rrc_eNB_mui, Mod_id,
+         (UE_index * NB_RB_MAX) + DCCH);
+  //rrc_rlc_data_req(Mod_id,frame, 1,(UE_index*NB_RB_MAX)+DCCH,rrc_eNB_mui++,0,size,(char*)buffer);
+  pdcp_rrc_data_req (Mod_id, frame, 1, (UE_index * NB_RB_MAX) + DCCH,
+                     rrc_eNB_mui++, 0, size, buffer, 1);
 
-              //      rrc_pdcp_config_req (Mod_id, frame, 1, ACTION_ADD, idx, UNDEF_SECURITY_MODE);
+}
 
-              //      rrc_rlc_config_req(Mod_id,frame,1,ACTION_ADD,Idx,SIGNALLING_RADIO_BEARER,Rlc_info_am_config);
+/*------------------------------------------------------------------------------*/
+void rrc_eNB_process_MeasurementReport (u8 Mod_id, u32 frame, u16 UE_index,
+                                   MeasResults_t * measResults2)
+{
 
-              rrc_pdcp_config_asn1_req (Mod_id, frame, 1, UE_index,
-                                        eNB_rrc_inst[Mod_id].
-                                        SRB_configList[UE_index],
-                                        (DRB_ToAddModList_t *) NULL,
-                                        (DRB_ToReleaseList_t *) NULL,
-                                        0xff,
-                                        NULL,
-                                        NULL,
-                                        NULL
+  LOG_I (RRC,"[eNB %d] Frame %d: Process Measurement Report From UE %d (Measurement Id %d)\n",
+         Mod_id, frame, UE_index, (int) measResults2->measId);
+  if (measResults2->measResultNeighCells->choice.measResultListEUTRA.list.count > 0) {
+      LOG_I (RRC, "Physical Cell Id %d\n",
+             (int) measResults2->measResultNeighCells->choice.measResultListEUTRA.list.array[0]->physCellId);
+      LOG_I (RRC, "RSRP of Target %d\n",
+             (int) *(measResults2->measResultNeighCells->choice.measResultListEUTRA.list.array[0]->measResult.rsrpResult));
+      LOG_I (RRC, "RSRQ of Target %d\n",
+             (int) *(measResults2->measResultNeighCells->choice.measResultListEUTRA.list.array[0]->measResult.rsrqResult));
+  }
 #ifdef Rel10
-                                        , (PMCH_InfoList_r9_t *) NULL
+  LOG_I (RRC, "RSRP of Source %d\n",
+         measResults2->measResultPCell.rsrpResult);
+  LOG_I (RRC, "RSRQ of Source %d\n",
+         measResults2->measResultPCell.rsrqResult);
+#else
+  LOG_I (RRC, "RSRP of Source %d\n",
+         measResults2->measResultServCell.rsrpResult);
+  LOG_I (RRC, "RSRQ of Source %d\n",
+         measResults2->measResultServCell.rsrqResult);
 #endif
-                );
 
-              rrc_rlc_config_asn1_req (Mod_id, frame, 1, UE_index,
-                                       eNB_rrc_inst[Mod_id].
-                                       SRB_configList[UE_index],
-                                       (DRB_ToAddModList_t *) NULL,
-                                       (DRB_ToReleaseList_t *) NULL
-#ifdef Rel10
-                                       , (PMCH_InfoList_r9_t *) NULL
-#endif
-                );
-              //LOG_D(RRC,"[eNB %d] RLC AM allocation index@0 is %d\n",Mod_id,rlc[Mod_id].m_rlc_am_array[0].allocation);
-              //LOG_D(RRC,"[eNB %d] RLC AM allocation index@1 is %d\n",Mod_id,rlc[Mod_id].m_rlc_am_array[1].allocation);
+  if(eNB_rrc_inst[Mod_id].handover_info[UE_index]->ho_prepare != 0xF0){
+    rrc_eNB_generate_HandoverPreparationInformation(Mod_id,
+                                                    frame,
+                                                    UE_index,
+                                                    measResults2->measResultNeighCells->choice.measResultListEUTRA.list.array[0]->physCellId);
+  }else{
+    LOG_D(RRC,"[eNB %d] Frame %d: Ignoring MeasReport from UE %d as Handover is in progress... \n",Mod_id,frame, UE_index);
+  }
+  //Look for IP address of the target eNB
+  //Send Handover Request -> target eNB
+  //Wait for Handover Acknowledgement <- target eNB
+  //Send Handover Command
 
-              /*
+  //x2delay();
+  //    handover_request_x2(UE_index,Mod_id,measResults2->measResultNeighCells->choice.measResultListEUTRA.list.array[0]->physCellId);
 
-                 LOG_D(RRC,"[eNB %d] CALLING RLC CONFIG SRB2 (rbid %d) for UE %d\n",
-                 Mod_id,Idx+1,UE_index);
-                 Mac_rlc_xface->rrc_rlc_config_req(Mod_id,ACTION_ADD,Idx+1,SIGNALLING_RADIO_BEARER,Rlc_info_am_config);
-                 LOG_D(RRC,"[eNB %d] RLC AM allocation index@0 is %d\n",Mod_id,rlc[Mod_id].m_rlc_am_array[0].allocation);
-                 LOG_D(RRC,"[eNB %d] RLC AM allocation index@1 is %d\n",rlc[Mod_id].m_rlc_am_array[1].allocation);
-               */
-#endif //NO_RRM
-            }
-          else
-            {
-              LOG_E (RRC, "can't add UE, max user count reached!\n");
-            }
-          break;
+  //    u8 buffer[100];
+  //    int size=rrc_eNB_generate_Handover_Command_TeNB(0,0,buffer);
+  //
+  //      send_check_message((char*)buffer,size);
+  //send_handover_command();
 
-        default:
-          LOG_E (RRC, "[eNB %d] Frame %d : Unknown message\n", Mod_id, frame);
-          rval = -1;
-          break;
-        }
-      rval = 0;
-    }
-  else
-    {
-      LOG_E (RRC, "[eNB %d] Frame %d : Unknown error \n", Mod_id, frame);
-      rval = -1;
-    }
-  return rval;
 }
 
+/*------------------------------------------------------------------------------*/
+void rrc_eNB_generate_HandoverPreparationInformation (u8 Mod_id, u32 frame, u8 UE_index, PhysCellId_t targetPhyId) {
+  u8 UE_id_target;
+  u8 mod_id_target = get_adjacent_cell_mod_id(targetPhyId);
+  HANDOVER_INFO *handoverInfo = CALLOC(1,sizeof(*handoverInfo));
+  /*
+  u8 buffer[100];
+  u8 size;
+  struct PhysicalConfigDedicated  **physicalConfigDedicated = &eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index];
+  RadioResourceConfigDedicated_t *radioResourceConfigDedicated = CALLOC(1,sizeof(RadioResourceConfigDedicated_t));
+  */
 
-void rrc_eNB_process_RRCConnectionSetupComplete (u8 Mod_id,
-                                                 u32 frame,
-                                                 u8 UE_index,
-                                                 RRCConnectionSetupComplete_r8_IEs_t *rrcConnectionSetupComplete)
-{
-  LOG_I (RRC, "[eNB %d][RAPROC] Frame %d : Logical Channel UL-DCCH, ""processing RRCConnectionSetupComplete from UE %d\n",
-         Mod_id, frame, UE_index);
+  handoverInfo->as_config.antennaInfoCommon.antennaPortsCount =  0; //Not used 0- but check value
+  handoverInfo->as_config.sourceDl_CarrierFreq = 36090; //Verify!
+  memcpy((void*) &handoverInfo->as_config.sourceMasterInformationBlock, 
+         (void*) &eNB_rrc_inst[Mod_id].mib,
+         sizeof(MasterInformationBlock_t));
+  memcpy((void*) &handoverInfo->as_config.sourceMeasConfig, 
+         (void*) &eNB_rrc_inst[Mod_id].measConfig[UE_index],
+         sizeof(MeasConfig_t));
+  //to be configured
+  memset((void *)&eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_config.sourceSecurityAlgorithmConfig,
+         0,
+         sizeof(SecurityAlgorithmConfig_t));
 
-#if defined(ENABLE_USE_MME)
-  if (EPC_MODE_ENABLED == 1)
-  {
-    // Forward message to S1AP layer
-    rrc_eNB_send_S1AP_NAS_FIRST_REQ(Mod_id, UE_index, rrcConnectionSetupComplete);
+  memcpy((void *)&eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_config.sourceSystemInformationBlockType1,
+         (void *)&eNB_rrc_inst[Mod_id].SIB1,
+         sizeof(SystemInformationBlockType1_t));
+  memcpy((void *)&eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_config.sourceSystemInformationBlockType2,
+         (void *)&eNB_rrc_inst[Mod_id].SIB23,
+         sizeof(SystemInformationBlockType2_t));
+
+  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo = CALLOC(1,sizeof(ReestablishmentInfo_t));
+  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo->sourcePhysCellId = eNB_rrc_inst[Mod_id].physCellId;
+  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo->targetCellShortMAC_I.buf = NULL; // Check values later
+  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo->targetCellShortMAC_I.size = 0;
+  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo->targetCellShortMAC_I.bits_unused = 0;
+  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo->additionalReestabInfoList = NULL;
+
+  eNB_rrc_inst[Mod_id].handover_info[UE_index]->ho_prepare = 0xFF;//0xF0;
+  eNB_rrc_inst[Mod_id].handover_info[UE_index]->ho_complete = 0;
+
+  if (mod_id_target != 0xFF) {
+    //UE_id_target = rrc_find_free_ue_index(modid_target);
+    UE_id_target = rrc_eNB_get_next_free_UE_index(mod_id_target,(u8 *)eNB_rrc_inst[Mod_id].Info.UE_list[UE_index]); //this should return a new index
+
+    if (UE_id_target!=0xFF) {
+      LOG_N(RRC,"[eNB %d] Frame %d : Emulate sending HandoverPreparationInformation msg from eNB source %d to eNB target %d: source UE_id %d target UE_id %d source_modId: %d target_modId: %d\n",Mod_id,frame,eNB_rrc_inst[Mod_id].physCellId,targetPhyId,UE_index,UE_id_target,Mod_id,mod_id_target);
+      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target] = CALLOC(1,sizeof(*(eNB_rrc_inst[mod_id_target].handover_info[UE_id_target])));
+      memcpy((void *)&eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->as_context, 
+             (void *)&eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context,
+             sizeof(AS_Context_t));
+      memcpy((void *)&eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->as_config, 
+             (void *)&eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_config,
+             sizeof(AS_Config_t));
+      
+      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->ho_prepare = 0xFF;
+      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->ho_complete = 0;
+
+      eNB_rrc_inst[Mod_id].handover_info[UE_index]->modid_t = mod_id_target;
+      eNB_rrc_inst[Mod_id].handover_info[UE_index]->ueid_s = UE_index;
+      eNB_rrc_inst[Mod_id].handover_info[UE_index]->modid_s = Mod_id;
+      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->modid_t = mod_id_target;
+      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->modid_s = Mod_id;
+      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->ueid_t = UE_id_target;
+    }
+    else
+      LOG_E(RRC,"\nError in obtaining free UE id in target eNB %l for handover \n", targetPhyId);
   }
   else
-#endif
-  {
-    // RRC loop back (no S1AP), send SecurityModeCommand to UE
-    rrc_eNB_generate_SecurityModeCommand (Mod_id, frame, UE_index);
-    // rrc_eNB_generate_UECapabilityEnquiry(Mod_id,frame,UE_index);
-  }
+    LOG_E(RRC,"\nError in obtaining Module ID of target eNB for handover \n");
 }
 
-void rrc_eNB_generate_UECapabilityEnquiry (u8 Mod_id, u32 frame, u16 UE_index)
-{
-
-  uint8_t buffer[100];
-  uint8_t size;
+/*------------------------------------------------------------------------------*/
+void rrc_eNB_process_handoverPreparationInformation(u8 Mod_id,u32 frame, u16 UE_index) {
 
-  size = do_UECapabilityEnquiry (Mod_id, buffer, UE_index, rrc_eNB_get_next_transaction_identifier(Mod_id));
+  LOG_I(RRC,"[eNB %d] Frame %d : Logical Channel UL-DCCH, processing RRCHandoverPreparationInformation, sending RRCConnectionReconfiguration to UE %d \n",Mod_id,frame,UE_index);
 
-  LOG_I (RRC,
-         "[eNB %d] Frame %d, Logical Channel DL-DCCH, Generate UECapabilityEnquiry (bytes %d, UE id %d)\n",
-         Mod_id, frame, size, UE_index);
 
+  //eNB_rrc_inst[Mod_id].Info.UE_list[UE_index]
+  rrc_eNB_generate_RRCConnectionReconfiguration_handover(Mod_id,frame,UE_index,NULL,0);
 
-  LOG_D (RRC,
-         "[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- PDCP_DATA_REQ/%d Bytes (UECapabilityEnquiry to UE %d MUI %d) --->][PDCP][MOD %02d][RB %02d]\n",
-         frame, Mod_id, size, UE_index, rrc_eNB_mui, Mod_id,
-         (UE_index * NB_RB_MAX) + DCCH);
-  //rrc_rlc_data_req(Mod_id,frame, 1,(UE_index*NB_RB_MAX)+DCCH,rrc_eNB_mui++,0,size,(char*)buffer);
-  pdcp_rrc_data_req (Mod_id, frame, 1, (UE_index * NB_RB_MAX) + DCCH,
-                     rrc_eNB_mui++, 0, size, buffer, 1);
+}
 
+/*------------------------------------------------------------------------------*/
+void check_handovers(u8 Mod_id, u32 frame) {
+  u8 i;
+  for (i=0;i<NUMBER_OF_UE_MAX;i++) {
+    if(eNB_rrc_inst[Mod_id].handover_info[i] != NULL) {
+      if(eNB_rrc_inst[Mod_id].handover_info[i]->ho_prepare == 0xFF) {
+        LOG_D(RRC,"[eNB %d] Frame %d: Incoming handover detected for new UE_idx %d (source eNB %d->target eNB %d) \n",
+              Mod_id, frame, i,Mod_id, eNB_rrc_inst[Mod_id].handover_info[i]->modid_t);
+        // source eNB generates rrcconnectionreconfiguration to prepare the HO
+        rrc_eNB_process_handoverPreparationInformation(Mod_id,frame,i);
+        eNB_rrc_inst[Mod_id].handover_info[i]->ho_prepare = 0xF1;
+      }
+      
+      if(eNB_rrc_inst[Mod_id].handover_info[i]->ho_complete == 0xF1) {
+        LOG_D(RRC,"[eNB %d] Frame %d: handover Command received for new UE_idx %d current eNB %d target eNB: %d \n",
+              Mod_id, frame, i,Mod_id,eNB_rrc_inst[Mod_id].handover_info[i]->modid_t);
+        //rrc_eNB_process_handoverPreparationInformation(Mod_id,frame,i);
+        pdcp_data_req(Mod_id,frame, 1,
+                      (i* NB_RB_MAX)+DCCH,
+                      rrc_eNB_mui++,0,
+                      eNB_rrc_inst[Mod_id].handover_info[i]->size,
+                      eNB_rrc_inst[Mod_id].handover_info[i]->buf,1);
+        eNB_rrc_inst[Mod_id].handover_info[i]->ho_complete = 0xF2;
+      }
+    }
+  }
 }
 
-void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 frame,
-                                                           u16 UE_index,
-                                                           u8 * nas_pdu,
-                                                           u32 nas_length,
-                                                           u8 ho_state)
-{
+/*------------------------------------------------------------------------------*/
+// 5.3.5.4 RRCConnectionReconfiguration including the mobilityControlInfo to prepare the UE handover
+void rrc_eNB_generate_RRCConnectionReconfiguration_handover (u8 Mod_id, u32 frame,u16 UE_index,u8 *nas_pdu,u32 nas_length)  {
 
   u8 buffer[RRC_BUF_SIZE];
   u8 size;
   int i;
-
+  uint8_t rv[2];
+  u16 Idx;
   // configure SRB1/SRB2, PhysicalConfigDedicated, MAC_MainConfig for UE
   eNB_RRC_INST *rrc_inst = &eNB_rrc_inst[Mod_id];
 
-
   struct PhysicalConfigDedicated **physicalConfigDedicated = &rrc_inst->physicalConfigDedicated[UE_index];
 
-
   struct SRB_ToAddMod *SRB2_config;
   struct SRB_ToAddMod__rlc_Config *SRB2_rlc_config;
   struct SRB_ToAddMod__logicalChannelConfig *SRB2_lchan_config;
-  struct LogicalChannelConfig__ul_SpecificParameters
-    *SRB2_ul_SpecificParameters;
-  SRB_ToAddModList_t *SRB_configList = rrc_inst->SRB_configList[UE_index];
+  struct LogicalChannelConfig__ul_SpecificParameters  *SRB2_ul_SpecificParameters; 
+  LogicalChannelConfig_t *SRB1_logicalChannelConfig = NULL;
+  SRB_ToAddModList_t *SRB_configList = rrc_inst->SRB_configList[UE_index]; // not used in this context: may be removed
   SRB_ToAddModList_t *SRB_configList2;
 
   struct DRB_ToAddMod *DRB_config;
@@ -1260,9 +1250,9 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 frame,
   struct PDCP_Config *DRB_pdcp_config;
   struct PDCP_Config__rlc_UM *PDCP_rlc_UM;
   struct LogicalChannelConfig *DRB_lchan_config;
-  struct LogicalChannelConfig__ul_SpecificParameters
-    *DRB_ul_SpecificParameters;
-  DRB_ToAddModList_t **DRB_configList = &rrc_inst->DRB_configList[UE_index];
+  struct LogicalChannelConfig__ul_SpecificParameters   *DRB_ul_SpecificParameters;
+  // DRB_ToAddModList_t **DRB_configList = &rrc_inst->DRB_configList[UE_index];
+  DRB_ToAddModList_t *DRB_configList2;
 
   MAC_MainConfig_t *mac_MainConfig;
   MeasObjectToAddModList_t *MeasObj_list;
@@ -1272,6 +1262,10 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 frame,
     *ReportConfig_A2, *ReportConfig_A3, *ReportConfig_A4, *ReportConfig_A5;
   MeasIdToAddModList_t *MeasId_list;
   MeasIdToAddMod_t *MeasId0, *MeasId1, *MeasId2, *MeasId3, *MeasId4, *MeasId5;
+  QuantityConfig_t *quantityConfig;
+  MobilityControlInfo_t *mobilityInfo;
+  // HandoverCommand_t handoverCommand;
+  u8 sourceModId = get_adjacent_cell_mod_id(rrc_inst->handover_info[UE_index]->as_context.reestablishmentInfo->sourcePhysCellId);
 #if Rel10
   long *sr_ProhibitTimer_r9;
 #endif
@@ -1279,1728 +1273,1741 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 frame,
   long *logicalchannelgroup, *logicalchannelgroup_drb;
   long *maxHARQ_Tx, *periodicBSR_Timer;
 
-  RSRP_Range_t *rsrp=NULL;
-  struct MeasConfig__speedStatePars *Sparams=NULL;
-  QuantityConfig_t *quantityConfig=NULL;
+  // RSRP_Range_t *rsrp;
+  struct MeasConfig__speedStatePars *Sparams;
   CellsToAddMod_t *CellToAdd;
   CellsToAddModList_t *CellsToAddModList;
+  // srb 1: for HO
+  struct SRB_ToAddMod *SRB1_config;
+  struct SRB_ToAddMod__rlc_Config *SRB1_rlc_config;
+  struct SRB_ToAddMod__logicalChannelConfig *SRB1_lchan_config;
+  struct LogicalChannelConfig__ul_SpecificParameters *SRB1_ul_SpecificParameters;
+  // phy config dedicated
+  PhysicalConfigDedicated_t *physicalConfigDedicated2;
+  
 
-  C_RNTI_t *cba_RNTI = NULL;
-#ifdef CBA
-  //struct PUSCH_CBAConfigDedicated_vlola  *pusch_CBAConfigDedicated_vlola;
-  uint8_t *cba_RNTI_buf;
-  cba_RNTI = CALLOC (1, sizeof (C_RNTI_t));
-  cba_RNTI_buf = CALLOC (1, 2 * sizeof (uint8_t));
-  cba_RNTI->buf = cba_RNTI_buf;
-  cba_RNTI->size = 2;
-  cba_RNTI->bits_unused = 0;
-  // associate UEs to the CBa groups as a function of their UE id
-  if (rrc_inst->num_active_cba_groups)
-    {
-      cba_RNTI->buf[0] =
-        rrc_inst->cba_rnti[UE_index % rrc_inst->num_active_cba_groups] & 0xff;
-      cba_RNTI->buf[1] = 0xff;
-      LOG_D (RRC,
-             "[eNB %d] Frame %d: cba_RNTI = %x in group %d is attribued to UE %d\n",
-             Mod_id, frame,
-             rrc_inst->cba_rnti[UE_index % rrc_inst->num_active_cba_groups],
-             UE_index % rrc_inst->num_active_cba_groups, UE_index);
-    }
-  else
-    {
-      cba_RNTI->buf[0] = 0x0;
-      cba_RNTI->buf[1] = 0x0;
-      LOG_D (RRC, "[eNB %d] Frame %d: no cba_RNTI is configured for UE %d\n",
-             Mod_id, frame, UE_index);
-    }
-
-
-#endif
-  // Configure SRB2
-  /// SRB2
-  SRB2_config = CALLOC (1, sizeof (*SRB2_config));
-  SRB_configList2 = CALLOC (1, sizeof (*SRB_configList2));
-  memset (SRB_configList2, 0, sizeof (*SRB_configList2));
-
-  SRB2_config->srb_Identity = 2;
-  SRB2_rlc_config = CALLOC (1, sizeof (*SRB2_rlc_config));
-  SRB2_config->rlc_Config = SRB2_rlc_config;
-
-  SRB2_rlc_config->present = SRB_ToAddMod__rlc_Config_PR_explicitValue;
-  SRB2_rlc_config->choice.explicitValue.present = RLC_Config_PR_am;
-  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.t_PollRetransmit = T_PollRetransmit_ms15;
-  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollPDU = PollPDU_p8;
-  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollByte = PollByte_kB1000;
-  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.maxRetxThreshold = UL_AM_RLC__maxRetxThreshold_t32;
-  SRB2_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_Reordering = T_Reordering_ms50;
-  SRB2_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_StatusProhibit =  T_StatusProhibit_ms10;
-
-  SRB2_lchan_config = CALLOC (1, sizeof (*SRB2_lchan_config));
-  SRB2_config->logicalChannelConfig = SRB2_lchan_config;
-
-  SRB2_lchan_config->present =  SRB_ToAddMod__logicalChannelConfig_PR_explicitValue;
-
-
-  SRB2_ul_SpecificParameters = CALLOC (1, sizeof (*SRB2_ul_SpecificParameters));
-
-  SRB2_ul_SpecificParameters->priority = 1;
-  SRB2_ul_SpecificParameters->prioritisedBitRate = LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
-  SRB2_ul_SpecificParameters->bucketSizeDuration = LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
-
-  // LCG for CCCH and DCCH is 0 as defined in 36331
-  logicalchannelgroup = CALLOC (1, sizeof (long));
-  *logicalchannelgroup = 0;
-
-  SRB2_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup;
-
-  SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters =  SRB2_ul_SpecificParameters;
-  ASN_SEQUENCE_ADD (&SRB_configList->list, SRB2_config);
-  ASN_SEQUENCE_ADD (&SRB_configList2->list, SRB2_config);
-
-  // Configure DRB
-  *DRB_configList = CALLOC (1, sizeof (*DRB_configList));
-  /// DRB
-  DRB_config = CALLOC (1, sizeof (*DRB_config));
-
-  //DRB_config->drb_Identity = (DRB_Identity_t) 1; //allowed values 1..32
-  // NN: this is the 1st DRB for this ue, so set it to 1
-  DRB_config->drb_Identity = (DRB_Identity_t) 1;        // (UE_index+1); //allowed values 1..32
-  DRB_config->logicalChannelIdentity = CALLOC (1, sizeof (long));
-  *(DRB_config->logicalChannelIdentity) = (long) 3;
-  DRB_rlc_config = CALLOC (1, sizeof (*DRB_rlc_config));
-  DRB_config->rlc_Config = DRB_rlc_config;
-  DRB_rlc_config->present = RLC_Config_PR_um_Bi_Directional;
-  DRB_rlc_config->choice.um_Bi_Directional.ul_UM_RLC.sn_FieldLength =  SN_FieldLength_size10;
-  DRB_rlc_config->choice.um_Bi_Directional.dl_UM_RLC.sn_FieldLength =  SN_FieldLength_size10;
-  DRB_rlc_config->choice.um_Bi_Directional.dl_UM_RLC.t_Reordering =   T_Reordering_ms5;
-
-  DRB_pdcp_config = CALLOC (1, sizeof (*DRB_pdcp_config));
-  DRB_config->pdcp_Config = DRB_pdcp_config;
-  DRB_pdcp_config->discardTimer = NULL;
-  DRB_pdcp_config->rlc_AM = NULL;
-  PDCP_rlc_UM = CALLOC (1, sizeof (*PDCP_rlc_UM));
-  DRB_pdcp_config->rlc_UM = PDCP_rlc_UM;
-  PDCP_rlc_UM->pdcp_SN_Size = PDCP_Config__rlc_UM__pdcp_SN_Size_len12bits;
-  DRB_pdcp_config->headerCompression.present = PDCP_Config__headerCompression_PR_notUsed;
-
-  DRB_lchan_config = CALLOC (1, sizeof (*DRB_lchan_config));
-  DRB_config->logicalChannelConfig = DRB_lchan_config;
-  DRB_ul_SpecificParameters = CALLOC (1, sizeof (*DRB_ul_SpecificParameters));
-  DRB_lchan_config->ul_SpecificParameters = DRB_ul_SpecificParameters;
-
-
-  DRB_ul_SpecificParameters->priority = 2;      // lower priority than srb1, srb2
-  DRB_ul_SpecificParameters->prioritisedBitRate = LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
-  DRB_ul_SpecificParameters->bucketSizeDuration = LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
-
-  // LCG for DTCH can take the value from 1 to 3 as defined in 36331: normally controlled by upper layers (like RRM)
-  logicalchannelgroup_drb = CALLOC (1, sizeof (long));
-  *logicalchannelgroup_drb = 1;
-  DRB_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup_drb;
-
-  ASN_SEQUENCE_ADD (&(*DRB_configList)->list, DRB_config);
-
-  mac_MainConfig = CALLOC (1, sizeof (*mac_MainConfig));
-  eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index] = mac_MainConfig;
-
-  mac_MainConfig->ul_SCH_Config = CALLOC (1, sizeof (*mac_MainConfig->ul_SCH_Config));
-
-  maxHARQ_Tx = CALLOC (1, sizeof (long));
-  *maxHARQ_Tx = MAC_MainConfig__ul_SCH_Config__maxHARQ_Tx_n5;
-  mac_MainConfig->ul_SCH_Config->maxHARQ_Tx = maxHARQ_Tx;
-  periodicBSR_Timer = CALLOC (1, sizeof (long));
-  *periodicBSR_Timer = MAC_MainConfig__ul_SCH_Config__periodicBSR_Timer_sf64;
-  mac_MainConfig->ul_SCH_Config->periodicBSR_Timer = periodicBSR_Timer;
-  mac_MainConfig->ul_SCH_Config->retxBSR_Timer =  MAC_MainConfig__ul_SCH_Config__retxBSR_Timer_sf320;
-  mac_MainConfig->ul_SCH_Config->ttiBundling = 0;       // FALSE
-
-  mac_MainConfig->drx_Config = NULL;
-
-  mac_MainConfig->phr_Config =  CALLOC (1, sizeof (*mac_MainConfig->phr_Config));
-
-  mac_MainConfig->phr_Config->present = MAC_MainConfig__phr_Config_PR_setup;
-  mac_MainConfig->phr_Config->choice.setup.periodicPHR_Timer = MAC_MainConfig__phr_Config__setup__periodicPHR_Timer_sf20;       // sf20 = 20 subframes
-
-  mac_MainConfig->phr_Config->choice.setup.prohibitPHR_Timer = MAC_MainConfig__phr_Config__setup__prohibitPHR_Timer_sf20;       // sf20 = 20 subframes
-
-  mac_MainConfig->phr_Config->choice.setup.dl_PathlossChange = MAC_MainConfig__phr_Config__setup__dl_PathlossChange_dB1;        // Value dB1 =1 dB, dB3 = 3 dB
-
+  LOG_D(RRC,"[eNB %d] Frame %d: handover preparation: get the newSourceUEIdentity (C-RNTI): ", Mod_id, frame);
+  for (i=0;i<2;i++) {
+    rv[i]=taus()&0xff;
+    LOG_D(RRC," %x.",rv[i]);
+  }
+ 
+  LOG_D(RRC,"[eNB %d] Frame %d : handover reparation: add target eNB SRB1 and PHYConfigDedicated reconfiguration\n",Mod_id, frame);
+  // 1st: reconfigure SRB
+  SRB_configList2 = CALLOC(1,sizeof(*SRB_configList));
+  SRB1_config = CALLOC(1,sizeof(*SRB1_config));
+  SRB1_config->srb_Identity = 1;
+  SRB1_rlc_config = CALLOC(1,sizeof(*SRB1_rlc_config));
+  SRB1_config->rlc_Config   = SRB1_rlc_config;
+    
+  SRB1_rlc_config->present = SRB_ToAddMod__rlc_Config_PR_explicitValue;
+  SRB1_rlc_config->choice.explicitValue.present=RLC_Config_PR_am;
+  SRB1_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.t_PollRetransmit=T_PollRetransmit_ms15;
+  SRB1_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollPDU=PollPDU_p8;
+  SRB1_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollByte=PollByte_kB1000;
+  SRB1_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.maxRetxThreshold=UL_AM_RLC__maxRetxThreshold_t16;
+  SRB1_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_Reordering=T_Reordering_ms50;
+  SRB1_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_StatusProhibit=T_StatusProhibit_ms10;
+    
+  SRB1_lchan_config = CALLOC(1,sizeof(*SRB1_lchan_config));
+  SRB1_config->logicalChannelConfig   = SRB1_lchan_config;
+  
+  SRB1_lchan_config->present = SRB_ToAddMod__logicalChannelConfig_PR_explicitValue;
+  SRB1_ul_SpecificParameters = CALLOC(1,sizeof(*SRB1_ul_SpecificParameters));
+  
+  SRB1_lchan_config->choice.explicitValue.ul_SpecificParameters = SRB1_ul_SpecificParameters;
+  
+  SRB1_ul_SpecificParameters->priority = 1;
+  
+  //assign_enum(&SRB1_ul_SpecificParameters->prioritisedBitRate,LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity);
+  SRB1_ul_SpecificParameters->prioritisedBitRate=LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
+  
+  //assign_enum(&SRB1_ul_SpecificParameters->bucketSizeDuration,LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50);
+  SRB1_ul_SpecificParameters->bucketSizeDuration=LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
+  
+  logicalchannelgroup = CALLOC(1,sizeof(long));
+  *logicalchannelgroup=0;
+  SRB1_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup;
+  
+  ASN_SEQUENCE_ADD(&SRB_configList2->list,SRB1_config);
+    
+  //2nd: now reconfigure phy config dedicated 
+  physicalConfigDedicated2 = CALLOC(1,sizeof(*physicalConfigDedicated2));
+  *physicalConfigDedicated = physicalConfigDedicated2;
+  
+  physicalConfigDedicated2->pdsch_ConfigDedicated         = CALLOC(1,sizeof(*physicalConfigDedicated2->pdsch_ConfigDedicated));
+  physicalConfigDedicated2->pucch_ConfigDedicated         = CALLOC(1,sizeof(*physicalConfigDedicated2->pucch_ConfigDedicated));
+  physicalConfigDedicated2->pusch_ConfigDedicated         = CALLOC(1,sizeof(*physicalConfigDedicated2->pusch_ConfigDedicated));
+  physicalConfigDedicated2->uplinkPowerControlDedicated   = CALLOC(1,sizeof(*physicalConfigDedicated2->uplinkPowerControlDedicated));
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH         = CALLOC(1,sizeof(*physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH));
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH         = CALLOC(1,sizeof(*physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH));
+  physicalConfigDedicated2->cqi_ReportConfig              = NULL;//CALLOC(1,sizeof(*physicalConfigDedicated2->cqi_ReportConfig));
+  physicalConfigDedicated2->soundingRS_UL_ConfigDedicated = NULL;//CALLOC(1,sizeof(*physicalConfigDedicated2->soundingRS_UL_ConfigDedicated));
+  physicalConfigDedicated2->antennaInfo                   = CALLOC(1,sizeof(*physicalConfigDedicated2->antennaInfo));
+  physicalConfigDedicated2->schedulingRequestConfig       = CALLOC(1,sizeof(*physicalConfigDedicated2->schedulingRequestConfig));
+  // PDSCH
+  //assign_enum(&physicalConfigDedicated2->pdsch_ConfigDedicated->p_a,
+  //          PDSCH_ConfigDedicated__p_a_dB0);
+  physicalConfigDedicated2->pdsch_ConfigDedicated->p_a=   PDSCH_ConfigDedicated__p_a_dB0;
+  
+  // PUCCH
+  physicalConfigDedicated2->pucch_ConfigDedicated->ackNackRepetition.present=PUCCH_ConfigDedicated__ackNackRepetition_PR_release;
+  physicalConfigDedicated2->pucch_ConfigDedicated->ackNackRepetition.choice.release=0;
+  physicalConfigDedicated2->pucch_ConfigDedicated->tdd_AckNackFeedbackMode=NULL;//PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing;
+  
+  // Pusch_config_dedicated
+  physicalConfigDedicated2->pusch_ConfigDedicated->betaOffset_ACK_Index = 0; // 2.00
+  physicalConfigDedicated2->pusch_ConfigDedicated->betaOffset_RI_Index  = 0; // 1.25
+  physicalConfigDedicated2->pusch_ConfigDedicated->betaOffset_CQI_Index = 8; // 2.25
+  
+  // UplinkPowerControlDedicated
+  physicalConfigDedicated2->uplinkPowerControlDedicated->p0_UE_PUSCH = 0; // 0 dB
+  //assign_enum(&physicalConfigDedicated2->uplinkPowerControlDedicated->deltaMCS_Enabled,
+  // UplinkPowerControlDedicated__deltaMCS_Enabled_en1);
+  physicalConfigDedicated2->uplinkPowerControlDedicated->deltaMCS_Enabled= UplinkPowerControlDedicated__deltaMCS_Enabled_en1;
+  physicalConfigDedicated2->uplinkPowerControlDedicated->accumulationEnabled = 1;  // FALSE
+  physicalConfigDedicated2->uplinkPowerControlDedicated->p0_UE_PUCCH = 0; // 0 dB
+  physicalConfigDedicated2->uplinkPowerControlDedicated->pSRS_Offset = 0; // 0 dB
+  physicalConfigDedicated2->uplinkPowerControlDedicated->filterCoefficient = CALLOC(1,sizeof(*physicalConfigDedicated2->uplinkPowerControlDedicated->filterCoefficient));
+  //  assign_enum(physicalConfigDedicated2->uplinkPowerControlDedicated->filterCoefficient,FilterCoefficient_fc4); // fc4 dB
+  *physicalConfigDedicated2->uplinkPowerControlDedicated->filterCoefficient=FilterCoefficient_fc4; // fc4 dB
+  
+  // TPC-PDCCH-Config
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->present=TPC_PDCCH_Config_PR_setup;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_Index.present = TPC_Index_PR_indexOfFormat3;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_Index.choice.indexOfFormat3 = 1;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_RNTI.buf=CALLOC(1,2);
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_RNTI.size=2;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_RNTI.buf[0]=0x12;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_RNTI.buf[1]=0x34+UE_index;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_RNTI.bits_unused=0;
+  
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->present=TPC_PDCCH_Config_PR_setup;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_Index.present = TPC_Index_PR_indexOfFormat3;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_Index.choice.indexOfFormat3 = 1;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_RNTI.buf=CALLOC(1,2);
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_RNTI.size=2;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_RNTI.buf[0]=0x22;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_RNTI.buf[1]=0x34+UE_index;
+  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_RNTI.bits_unused=0;
+  
+  // CQI ReportConfig
+  /*
+    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportModeAperiodic=CALLOC(1,sizeof(*physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportModeAperiodic));
+    assign_enum(physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportModeAperiodic,
+    CQI_ReportConfig__cqi_ReportModeAperiodic_rm30); // HLC CQI, no PMI
+    physicalConfigDedicated2->cqi_ReportConfig->nomPDSCH_RS_EPRE_Offset = 0; // 0 dB
+    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic=CALLOC(1,sizeof(*physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic));
+    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->present =  CQI_ReportPeriodic_PR_setup;
+    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_PUCCH_ResourceIndex = 0;  // n2_pucch
+    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_pmi_ConfigIndex = 0;  // Icqi/pmi
+    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.present = CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_subbandCQI;  // subband CQI
+    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.choice.subbandCQI.k=4;
+    
+    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.ri_ConfigIndex=NULL;
+    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.simultaneousAckNackAndCQI=0;
+  */
+  
+  //soundingRS-UL-ConfigDedicated
+  /*
+    physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->present = SoundingRS_UL_ConfigDedicated_PR_setup;
+    assign_enum(&physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.srs_Bandwidth,
+    SoundingRS_UL_ConfigDedicated__setup__srs_Bandwidth_bw0);
+    assign_enum(&physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.srs_HoppingBandwidth,
+    SoundingRS_UL_ConfigDedicated__setup__srs_HoppingBandwidth_hbw0);
+    physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.freqDomainPosition=0;
+    physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.duration=1;
+    physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.srs_ConfigIndex=1;
+    physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.transmissionComb=0;
+    assign_enum(&physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.cyclicShift,
+    SoundingRS_UL_ConfigDedicated__setup__cyclicShift_cs0);
+  */
+  
+  //AntennaInfoDedicated
+  physicalConfigDedicated2->antennaInfo = CALLOC(1,sizeof(*physicalConfigDedicated2->antennaInfo));
+  physicalConfigDedicated2->antennaInfo->present = PhysicalConfigDedicated__antennaInfo_PR_explicitValue;
+  //assign_enum(&physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode,
+  //     AntennaInfoDedicated__transmissionMode_tm2);
+  /*  
+  switch (transmission_mode){
+  case 1:
+    physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode=     AntennaInfoDedicated__transmissionMode_tm1;
+    break;
+  case 2:
+    physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode=     AntennaInfoDedicated__transmissionMode_tm2;
+    break;
+  case 4:
+    physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode=     AntennaInfoDedicated__transmissionMode_tm4;
+    break;
+  case 5:
+    physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode=     AntennaInfoDedicated__transmissionMode_tm5;
+    break;
+  case 6:
+    physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode=     AntennaInfoDedicated__transmissionMode_tm6;
+    break;
+  }
+  */
+  physicalConfigDedicated2->antennaInfo->choice.explicitValue.ue_TransmitAntennaSelection.present = AntennaInfoDedicated__ue_TransmitAntennaSelection_PR_release;
+  physicalConfigDedicated2->antennaInfo->choice.explicitValue.ue_TransmitAntennaSelection.choice.release = 0;
+  
+  // SchedulingRequestConfig
+  physicalConfigDedicated2->schedulingRequestConfig->present = SchedulingRequestConfig_PR_setup;
+  physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = UE_index;
+  
+  if (mac_xface->lte_frame_parms->frame_type == 0){ // FDD
+    physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 5+(UE_index%10);  // Isr = 5 (every 10 subframes, offset=2+UE_id mod3)
+} else {
+    switch (mac_xface->lte_frame_parms->tdd_config) {
+    case 1:
+      physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7+(UE_index&1)+((UE_index&3)>>1)*5;  // Isr = 5 (every 10 subframes, offset=2 for UE0, 3 for UE1, 7 for UE2, 8 for UE3 , 2 for UE4 etc..)
+      break;
+    case 3:
+      physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7+(UE_index%3);  // Isr = 5 (every 10 subframes, offset=2 for UE0, 3 for UE1, 3 for UE2, 2 for UE3 , etc..)
+      break;
+    case 4:
+      physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7+(UE_index&1);  // Isr = 5 (every 10 subframes, offset=2 for UE0, 3 for UE1, 3 for UE2, 2 for UE3 , etc..)
+      break;
+    default:
+      physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7;  // Isr = 5 (every 10 subframes, offset=2 for all UE0 etc..)
+      break;
+    }
+  }
+  
+  //  assign_enum(&physicalConfigDedicated2->schedulingRequestConfig->choice.setup.dsr_TransMax,
+  //SchedulingRequestConfig__setup__dsr_TransMax_n4);
+  //  assign_enum(&physicalConfigDedicated2->schedulingRequestConfig->choice.setup.dsr_TransMax = SchedulingRequestConfig__setup__dsr_TransMax_n4;
+  physicalConfigDedicated2->schedulingRequestConfig->choice.setup.dsr_TransMax = SchedulingRequestConfig__setup__dsr_TransMax_n4;
+   
+  LOG_D(RRC,"handover_config [MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- MAC_CONFIG_REQ  (SRB1 UE %d) --->][MAC_eNB][MOD %02d][]\n",
+                frame, Mod_id, UE_index, Mod_id);
+  rrc_mac_config_req (Mod_id, 1, UE_index, 0,
+                      (RadioResourceConfigCommonSIB_t *) NULL,
+                      eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index],
+                      (MeasObjectToAddMod_t **) NULL,
+                      eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index],
+                      1,
+                      SRB1_logicalChannelConfig,
+                      eNB_rrc_inst[Mod_id].measGapConfig[UE_index],
+                      (TDD_Config_t *) NULL,
+                      (MobilityControlInfo_t *)NULL,
+                      (u8 *) NULL,(u16 *) NULL, NULL, NULL, NULL,
+                      (MBSFN_SubframeConfigList_t *) NULL
 #ifdef Rel10
-  sr_ProhibitTimer_r9 = CALLOC (1, sizeof (long));
-  *sr_ProhibitTimer_r9 = 0;     // SR tx on PUCCH, Value in number of SR period(s). Value 0 = no timer for SR, Value 2= 2*SR
-  mac_MainConfig->sr_ProhibitTimer_r9 = sr_ProhibitTimer_r9;
-  //sps_RA_ConfigList_rlola = NULL;
+                      ,
+                      0,
+                      (MBSFN_AreaInfoList_r9_t *) NULL,
+                      (PMCH_InfoList_r9_t *) NULL
 #endif
+#ifdef CBA
+                      ,
+                      eNB_rrc_inst[Mod_id].
+                      num_active_cba_groups,
+                      eNB_rrc_inst[Mod_id].cba_rnti[0]
+#endif
+                      );
+  
 
+  // Configure target eNB SRB2
+  /// SRB2
+  SRB2_config = CALLOC (1, sizeof (*SRB2_config));
+  SRB_configList2 = CALLOC (1, sizeof (*SRB_configList2));
+  memset (SRB_configList2, 0, sizeof (*SRB_configList2));
 
-  // Measurement ID list
-  MeasId_list = CALLOC (1, sizeof (*MeasId_list));
-  memset ((void *) MeasId_list, 0, sizeof (*MeasId_list));
-
-  MeasId0 = CALLOC (1, sizeof (*MeasId0));
-  MeasId0->measId = 1;
-  MeasId0->measObjectId = 1;
-  MeasId0->reportConfigId = 1;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId0);
-
-  MeasId1 = CALLOC (1, sizeof (*MeasId1));
-  MeasId1->measId = 2;
-  MeasId1->measObjectId = 1;
-  MeasId1->reportConfigId = 2;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId1);
-
-  MeasId2 = CALLOC (1, sizeof (*MeasId2));
-  MeasId2->measId = 3;
-  MeasId2->measObjectId = 1;
-  MeasId2->reportConfigId = 3;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId2);
-
-  MeasId3 = CALLOC (1, sizeof (*MeasId3));
-  MeasId3->measId = 4;
-  MeasId3->measObjectId = 1;
-  MeasId3->reportConfigId = 4;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId3);
-
-  MeasId4 = CALLOC (1, sizeof (*MeasId4));
-  MeasId4->measId = 5;
-  MeasId4->measObjectId = 1;
-  MeasId4->reportConfigId = 5;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId4);
-
-  MeasId5 = CALLOC (1, sizeof (*MeasId5));
-  MeasId5->measId = 6;
-  MeasId5->measObjectId = 1;
-  MeasId5->reportConfigId = 6;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId5);
-
-  //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->measIdToAddModList = MeasId_list;
-
-  // Add one EUTRA Measurement Object
-  MeasObj_list = CALLOC (1, sizeof (*MeasObj_list));
-  memset ((void *) MeasObj_list, 0, sizeof (*MeasObj_list));
-
-  // Configure MeasObject
-
-  MeasObj = CALLOC (1, sizeof (*MeasObj));
-  memset ((void *) MeasObj, 0, sizeof (*MeasObj));
-
-  MeasObj->measObjectId = 1;
-  MeasObj->measObject.present =  MeasObjectToAddMod__measObject_PR_measObjectEUTRA;
-  MeasObj->measObject.choice.measObjectEUTRA.carrierFreq = 36090;
-  MeasObj->measObject.choice.measObjectEUTRA.allowedMeasBandwidth = AllowedMeasBandwidth_mbw25;
-  MeasObj->measObject.choice.measObjectEUTRA.presenceAntennaPort1 = 1;
-  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.buf = CALLOC (1, sizeof (uint8_t));
-  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.buf[0] = 0;
-  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.size = 1;
-  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.bits_unused = 6;
-  MeasObj->measObject.choice.measObjectEUTRA.offsetFreq = NULL; // Default is 15 or 0dB
+  SRB2_config->srb_Identity = 2;
+  SRB2_rlc_config = CALLOC (1, sizeof (*SRB2_rlc_config));
+  SRB2_config->rlc_Config = SRB2_rlc_config;
 
-  MeasObj->measObject.choice.measObjectEUTRA.cellsToAddModList = (CellsToAddModList_t *) CALLOC (1, sizeof (*CellsToAddModList));
+  SRB2_rlc_config->present = SRB_ToAddMod__rlc_Config_PR_explicitValue;
+  SRB2_rlc_config->choice.explicitValue.present = RLC_Config_PR_am;
+  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.t_PollRetransmit = T_PollRetransmit_ms15;
+  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollPDU = PollPDU_p8;
+  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollByte = PollByte_kB1000;
+  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.maxRetxThreshold = UL_AM_RLC__maxRetxThreshold_t32;
+  SRB2_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_Reordering = T_Reordering_ms50;
+  SRB2_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_StatusProhibit = T_StatusProhibit_ms10;
 
-  CellsToAddModList = MeasObj->measObject.choice.measObjectEUTRA.cellsToAddModList;
+  SRB2_lchan_config = CALLOC (1, sizeof (*SRB2_lchan_config));
+  SRB2_config->logicalChannelConfig = SRB2_lchan_config;
 
-  // Add adjacent cell lists (6 per eNB)
-  for (i = 0; i < 6; i++)   {
-      CellToAdd = (CellsToAddMod_t *) CALLOC (1, sizeof (*CellToAdd));
-      CellToAdd->cellIndex = i + 1;
-      CellToAdd->physCellId = get_adjacent_cell_id (Mod_id, i);
-      CellToAdd->cellIndividualOffset = Q_OffsetRange_dB0;
+  SRB2_lchan_config->present =  SRB_ToAddMod__logicalChannelConfig_PR_explicitValue;
 
-      ASN_SEQUENCE_ADD (&CellsToAddModList->list, CellToAdd);
-  }
+  SRB2_ul_SpecificParameters =  CALLOC (1, sizeof (*SRB2_ul_SpecificParameters));
 
-  ASN_SEQUENCE_ADD (&MeasObj_list->list, MeasObj);
-  //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->measObjectToAddModList = MeasObj_list;
+  SRB2_ul_SpecificParameters->priority = 1;
+  SRB2_ul_SpecificParameters->prioritisedBitRate = LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
+  SRB2_ul_SpecificParameters->bucketSizeDuration = LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
 
-  // Report Configurations for periodical, A1-A5 events
-  ReportConfig_list = CALLOC (1, sizeof (*ReportConfig_list));
-  memset ((void *) ReportConfig_list, 0, sizeof (*ReportConfig_list));
+  // LCG for CCCH and DCCH is 0 as defined in 36331
+  logicalchannelgroup = CALLOC (1, sizeof (long));
+  *logicalchannelgroup = 0;
 
-  ReportConfig_per = CALLOC (1, sizeof (*ReportConfig_per));
-  memset ((void *) ReportConfig_per, 0, sizeof (*ReportConfig_per));
+  SRB2_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup;
+  SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters =  SRB2_ul_SpecificParameters;
+  ASN_SEQUENCE_ADD (&SRB_configList->list, SRB2_config);
+  ASN_SEQUENCE_ADD (&SRB_configList2->list, SRB2_config);
 
-  ReportConfig_A1 = CALLOC (1, sizeof (*ReportConfig_A1));
-  memset ((void *) ReportConfig_A1, 0, sizeof (*ReportConfig_A1));
+  // Configure target eNB DRB
+  DRB_configList2 = CALLOC (1, sizeof (*DRB_configList2));
+  /// DRB
+  DRB_config = CALLOC (1, sizeof (*DRB_config));
 
-  ReportConfig_A2 = CALLOC (1, sizeof (*ReportConfig_A2));
-  memset ((void *) ReportConfig_A2, 0, sizeof (*ReportConfig_A2));
+  //DRB_config->drb_Identity = (DRB_Identity_t) 1; //allowed values 1..32
+  // NN: this is the 1st DRB for this ue, so set it to 1
+  DRB_config->drb_Identity = (DRB_Identity_t) 1;        // (UE_index+1); //allowed values 1..32
+  DRB_config->logicalChannelIdentity = CALLOC (1, sizeof (long));
+  *(DRB_config->logicalChannelIdentity) = (long) 3;
+  DRB_rlc_config = CALLOC (1, sizeof (*DRB_rlc_config));
+  DRB_config->rlc_Config = DRB_rlc_config;
+  DRB_rlc_config->present = RLC_Config_PR_um_Bi_Directional;
+  DRB_rlc_config->choice.um_Bi_Directional.ul_UM_RLC.sn_FieldLength =  SN_FieldLength_size10;
+  DRB_rlc_config->choice.um_Bi_Directional.dl_UM_RLC.sn_FieldLength = SN_FieldLength_size10;
+  DRB_rlc_config->choice.um_Bi_Directional.dl_UM_RLC.t_Reordering = T_Reordering_ms5;
 
-  ReportConfig_A3 = CALLOC (1, sizeof (*ReportConfig_A3));
-  memset ((void *) ReportConfig_A3, 0, sizeof (*ReportConfig_A3));
+  DRB_pdcp_config = CALLOC (1, sizeof (*DRB_pdcp_config));
+  DRB_config->pdcp_Config = DRB_pdcp_config;
+  DRB_pdcp_config->discardTimer = NULL;
+  DRB_pdcp_config->rlc_AM = NULL;
+  PDCP_rlc_UM = CALLOC (1, sizeof (*PDCP_rlc_UM));
+  DRB_pdcp_config->rlc_UM = PDCP_rlc_UM;
+  PDCP_rlc_UM->pdcp_SN_Size = PDCP_Config__rlc_UM__pdcp_SN_Size_len12bits;
+  DRB_pdcp_config->headerCompression.present =  PDCP_Config__headerCompression_PR_notUsed;
 
-  ReportConfig_A4 = CALLOC (1, sizeof (*ReportConfig_A4));
-  memset ((void *) ReportConfig_A4, 0, sizeof (*ReportConfig_A4));
+  DRB_lchan_config = CALLOC (1, sizeof (*DRB_lchan_config));
+  DRB_config->logicalChannelConfig = DRB_lchan_config;
+  DRB_ul_SpecificParameters = CALLOC (1, sizeof (*DRB_ul_SpecificParameters));
+  DRB_lchan_config->ul_SpecificParameters = DRB_ul_SpecificParameters;
 
-  ReportConfig_A5 = CALLOC (1, sizeof (*ReportConfig_A5));
-  memset ((void *) ReportConfig_A5, 0, sizeof (*ReportConfig_A5));
 
-  ReportConfig_per->reportConfigId = 1;
-  ReportConfig_per->reportConfig.present = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerType.present = ReportConfigEUTRA__triggerType_PR_periodical;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerType.choice.periodical.purpose = ReportConfigEUTRA__triggerType__periodical__purpose_reportStrongestCells;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerQuantity = ReportConfigEUTRA__triggerQuantity_rsrp;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportQuantity = ReportConfigEUTRA__reportQuantity_both;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.maxReportCells = 2;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportInterval = ReportInterval_ms120;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportAmount = ReportConfigEUTRA__reportAmount_infinity;
+  DRB_ul_SpecificParameters->priority = 2;      // lower priority than srb1, srb2
+  DRB_ul_SpecificParameters->prioritisedBitRate = LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
+  DRB_ul_SpecificParameters->bucketSizeDuration = LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
 
-  ASN_SEQUENCE_ADD (&ReportConfig_list->list, ReportConfig_per);
- 
-  ReportConfig_A1->reportConfigId = 2;
-  ReportConfig_A1->reportConfig.present = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.present = ReportConfigEUTRA__triggerType_PR_event;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA1;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA1.a1_Threshold.present =
-    ThresholdEUTRA_PR_threshold_RSRP;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA1.a1_Threshold.choice.threshold_RSRP = 10;
+  // LCG for DTCH can take the value from 1 to 3 as defined in 36331: normally controlled by upper layers (like RRM)
+  logicalchannelgroup_drb = CALLOC (1, sizeof (long));
+  *logicalchannelgroup_drb = 1;
+  DRB_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup_drb;
 
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerQuantity = ReportConfigEUTRA__triggerQuantity_rsrp;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportQuantity = ReportConfigEUTRA__reportQuantity_both;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.maxReportCells = 2;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportInterval = ReportInterval_ms120;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportAmount = ReportConfigEUTRA__reportAmount_infinity;
 
-  ASN_SEQUENCE_ADD (&ReportConfig_list->list, ReportConfig_A1);
+  ASN_SEQUENCE_ADD (&DRB_configList2->list, DRB_config);
 
-  if (ho_state == 1 /*HO_MEASURMENT*/ ){
-    LOG_I(RRC,"[eNB %d] frame %d: requesting A2, A3, A4, A5, and A6 event reporting\n", Mod_id, frame);
-    ReportConfig_A2->reportConfigId                                                              = 3;
-    ReportConfig_A2->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.present                  = ReportConfigEUTRA__triggerType_PR_event;
-    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present= ReportConfigEUTRA__triggerType__event__eventId_PR_eventA2;
-    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA2.a2_Threshold.present = ThresholdEUTRA_PR_threshold_RSRP;
-    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA2.a2_Threshold.choice.threshold_RSRP = 10;
-    
-    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
-    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
-    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
-    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
-    ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
-    
-    ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A2);
+  mac_MainConfig = CALLOC (1, sizeof (*mac_MainConfig));
+  eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index] = mac_MainConfig;
 
-    ReportConfig_A3->reportConfigId                                                              = 4;
-    ReportConfig_A3->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.present                   = ReportConfigEUTRA__triggerType_PR_event;
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA3;
+  mac_MainConfig->ul_SCH_Config = CALLOC (1, sizeof (*mac_MainConfig->ul_SCH_Config));
 
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA3.a3_Offset = 1;//10;
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA3.reportOnLeave = 1;
-    
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
-    
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.hysteresis   = 0.5;
-    ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.timeToTrigger = TimeToTrigger_ms40;
-    ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A3);
-    
-    ReportConfig_A4->reportConfigId                                                              = 5;
-    ReportConfig_A4->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.present                   = ReportConfigEUTRA__triggerType_PR_event;
-    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA4;
-    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA4.a4_Threshold.present = ThresholdEUTRA_PR_threshold_RSRP;
-    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA4.a4_Threshold.choice.threshold_RSRP = 10;
-    
-    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
-    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
-    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
-    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
-    ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
-    
-    ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A4);
-    
-    ReportConfig_A5->reportConfigId                                                              = 6;
-    ReportConfig_A5->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.present                                    = ReportConfigEUTRA__triggerType_PR_event;
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present              = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA5;
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold1.present = ThresholdEUTRA_PR_threshold_RSRP;
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold2.present = ThresholdEUTRA_PR_threshold_RSRP;
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold1.choice.threshold_RSRP = 10;
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold2.choice.threshold_RSRP = 10;
-    
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
-    ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
-    
-    ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A5);
-    //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->reportConfigToAddModList = ReportConfig_list;
+  maxHARQ_Tx = CALLOC (1, sizeof (long));
+  *maxHARQ_Tx = MAC_MainConfig__ul_SCH_Config__maxHARQ_Tx_n5;
+  mac_MainConfig->ul_SCH_Config->maxHARQ_Tx = maxHARQ_Tx;
 
-    rsrp=CALLOC(1,sizeof(RSRP_Range_t));
-    *rsrp=20;
-    
-    Sparams = CALLOC(1,sizeof(*Sparams));
-    Sparams->present=MeasConfig__speedStatePars_PR_setup;
-    Sparams->choice.setup.timeToTrigger_SF.sf_High=SpeedStateScaleFactors__sf_Medium_oDot75;
-    Sparams->choice.setup.timeToTrigger_SF.sf_Medium=SpeedStateScaleFactors__sf_High_oDot5;
-    Sparams->choice.setup.mobilityStateParameters.n_CellChangeHigh=10;
-    Sparams->choice.setup.mobilityStateParameters.n_CellChangeMedium=5;
-    Sparams->choice.setup.mobilityStateParameters.t_Evaluation=MobilityStateParameters__t_Evaluation_s60;
-    Sparams->choice.setup.mobilityStateParameters.t_HystNormal=MobilityStateParameters__t_HystNormal_s120;
-    
-    quantityConfig = CALLOC(1,sizeof(*quantityConfig));
-    memset((void *)quantityConfig,0,sizeof(*quantityConfig));
-    quantityConfig->quantityConfigEUTRA = CALLOC(1,sizeof(struct QuantityConfigEUTRA));
-    memset((void *)quantityConfig->quantityConfigEUTRA,0,sizeof(*quantityConfig->quantityConfigEUTRA));
-    quantityConfig->quantityConfigCDMA2000 = NULL;
-    quantityConfig->quantityConfigGERAN = NULL;
-    quantityConfig->quantityConfigUTRA = NULL;
-    quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP = CALLOC(1,sizeof(*(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP)));
-    quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = CALLOC(1,sizeof(*(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ)));
-    *quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP = FilterCoefficient_fc4;
-    *quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = FilterCoefficient_fc4;
-  
-    LOG_I(RRC,"[eNB %d] Frame %d: potential handover preparation: store the information in an intermediate structure in case of failure\n",Mod_id, frame);
-    // store the information in an intermediate structure for Hanodver management
-    //rrc_inst->handover_info.as_config.sourceRadioResourceConfig.srb_ToAddModList = CALLOC(1,sizeof());
-    rrc_inst->handover_info[UE_index] = CALLOC(1,sizeof(*(rrc_inst->handover_info[UE_index])));
-    //memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.srb_ToAddModList,(void *)SRB_list,sizeof(SRB_ToAddModList_t));
-    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.srb_ToAddModList = SRB_configList2;
-    //memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.drb_ToAddModList,(void *)DRB_list,sizeof(DRB_ToAddModList_t));
-    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.drb_ToAddModList = *DRB_configList;
-    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.drb_ToReleaseList = NULL;
-    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.mac_MainConfig = CALLOC(1, sizeof(*rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.mac_MainConfig));
-    memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.mac_MainConfig,
-	   (void *)mac_MainConfig,
-	   sizeof(MAC_MainConfig_t));
-    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.physicalConfigDedicated = CALLOC(1,sizeof(PhysicalConfigDedicated_t));
-    memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.physicalConfigDedicated,
-	   (void *)rrc_inst->physicalConfigDedicated[UE_index],
-	   sizeof(PhysicalConfigDedicated_t));
-    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.sps_Config = NULL;
-    //memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.sps_Config,(void *)rrc_inst->sps_Config[UE_index],sizeof(SPS_Config_t));
+  periodicBSR_Timer = CALLOC (1, sizeof (long));
+  *periodicBSR_Timer = MAC_MainConfig__ul_SCH_Config__periodicBSR_Timer_sf64;
+  mac_MainConfig->ul_SCH_Config->periodicBSR_Timer = periodicBSR_Timer;
 
-  }
-   
-  memset (buffer, 0, RRC_BUF_SIZE);
+  mac_MainConfig->ul_SCH_Config->retxBSR_Timer = MAC_MainConfig__ul_SCH_Config__retxBSR_Timer_sf320;
 
-  size = do_RRCConnectionReconfiguration (Mod_id, buffer, UE_index, rrc_eNB_get_next_transaction_identifier(Mod_id),  //Transaction_id,
-                                          SRB_configList2, *DRB_configList, NULL,       // DRB2_list,
-                                          NULL, //*sps_Config,
-                                          physicalConfigDedicated[UE_index], MeasObj_list, ReportConfig_list, 
-					  quantityConfig,
-                                          MeasId_list, mac_MainConfig, NULL,NULL,Sparams,rsrp,
-					  cba_RNTI, nas_pdu, nas_length);  
+  mac_MainConfig->ul_SCH_Config->ttiBundling = 0;       // FALSE
 
-  LOG_I (RRC,"[eNB %d] Frame %d, Logical Channel DL-DCCH, Generate RRCConnectionReconfiguration (bytes %d, UE id %d)\n",
-         Mod_id, frame, size, UE_index);
+  mac_MainConfig->drx_Config = NULL;
 
-  LOG_D (RRC,"[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %d MUI %d) --->][PDCP][MOD %02d][RB %02d]\n",
-         frame, Mod_id, size, UE_index, rrc_eNB_mui, Mod_id,
-         (UE_index * NB_RB_MAX) + DCCH);
-  //rrc_rlc_data_req(Mod_id,frame, 1,(UE_index*NB_RB_MAX)+DCCH,rrc_eNB_mui++,0,size,(char*)buffer);
-  pdcp_rrc_data_req (Mod_id, frame, 1, (UE_index * NB_RB_MAX) + DCCH,
-                     rrc_eNB_mui++, 0, size, buffer, 1);
+  mac_MainConfig->phr_Config = CALLOC (1, sizeof (*mac_MainConfig->phr_Config));
 
-}
+  mac_MainConfig->phr_Config->present = MAC_MainConfig__phr_Config_PR_setup;
+  mac_MainConfig->phr_Config->choice.setup.periodicPHR_Timer = MAC_MainConfig__phr_Config__setup__periodicPHR_Timer_sf20;       // sf20 = 20 subframes
 
-void rrc_eNB_process_MeasurementReport (u8 Mod_id, u32 frame, u16 UE_index,
-                                   MeasResults_t * measResults2)
-{
+  mac_MainConfig->phr_Config->choice.setup.prohibitPHR_Timer = MAC_MainConfig__phr_Config__setup__prohibitPHR_Timer_sf20;       // sf20 = 20 subframes
+
+  mac_MainConfig->phr_Config->choice.setup.dl_PathlossChange = MAC_MainConfig__phr_Config__setup__dl_PathlossChange_dB1;        // Value dB1 =1 dB, dB3 = 3 dB
 
-  LOG_I (RRC,"[eNB %d] Frame %d: Process Measurement Report From UE %d (Measurement Id %d)\n",
-         Mod_id, frame, UE_index, (int) measResults2->measId);
-  if (measResults2->measResultNeighCells->choice.measResultListEUTRA.list.count > 0) {
-      LOG_I (RRC, "Physical Cell Id %d\n",
-             (int) measResults2->measResultNeighCells->choice.measResultListEUTRA.list.array[0]->physCellId);
-      LOG_I (RRC, "RSRP of Target %d\n",
-             (int) *(measResults2->measResultNeighCells->choice.measResultListEUTRA.list.array[0]->measResult.rsrpResult));
-      LOG_I (RRC, "RSRQ of Target %d\n",
-             (int) *(measResults2->measResultNeighCells->choice.measResultListEUTRA.list.array[0]->measResult.rsrqResult));
-  }
 #ifdef Rel10
-  LOG_I (RRC, "RSRP of Source %d\n",
-         measResults2->measResultPCell.rsrpResult);
-  LOG_I (RRC, "RSRQ of Source %d\n",
-         measResults2->measResultPCell.rsrqResult);
-#else
-  LOG_I (RRC, "RSRP of Source %d\n",
-         measResults2->measResultServCell.rsrpResult);
-  LOG_I (RRC, "RSRQ of Source %d\n",
-         measResults2->measResultServCell.rsrqResult);
+  sr_ProhibitTimer_r9 = CALLOC (1, sizeof (long));
+  *sr_ProhibitTimer_r9 = 0;     // SR tx on PUCCH, Value in number of SR period(s). Value 0 = no timer for SR, Value 2= 2*SR
+  mac_MainConfig->sr_ProhibitTimer_r9 = sr_ProhibitTimer_r9;
+  //sps_RA_ConfigList_rlola = NULL;
 #endif
+  // Measurement ID list
+  MeasId_list = CALLOC (1, sizeof (*MeasId_list));
+  memset ((void *) MeasId_list, 0, sizeof (*MeasId_list));
 
-  if(eNB_rrc_inst[Mod_id].handover_info[UE_index]->ho_prepare != 0xF0){
-    rrc_eNB_generate_HandoverPreparationInformation(Mod_id,
-						    frame, 
-						    UE_index,
-						    measResults2->measResultNeighCells->choice.measResultListEUTRA.list.array[0]->physCellId);
-  }else{
-    LOG_D(RRC,"[eNB %d] Frame %d: Ignoring MeasReport from UE %d as Handover is in progress... \n",Mod_id,frame, UE_index);
-  }
-  //Look for IP address of the target eNB
-  //Send Handover Request -> target eNB
-  //Wait for Handover Acknowledgement <- target eNB
-  //Send Handover Command
+  MeasId0 = CALLOC (1, sizeof (*MeasId0));
+  MeasId0->measId = 1;
+  MeasId0->measObjectId = 1;
+  MeasId0->reportConfigId = 1;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId0);
 
-  //x2delay();
-  //    handover_request_x2(UE_index,Mod_id,measResults2->measResultNeighCells->choice.measResultListEUTRA.list.array[0]->physCellId);
+  MeasId1 = CALLOC (1, sizeof (*MeasId1));
+  MeasId1->measId = 2;
+  MeasId1->measObjectId = 1;
+  MeasId1->reportConfigId = 2;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId1);
 
-  //    u8 buffer[100];
-  //    int size=rrc_eNB_generate_Handover_Command_TeNB(0,0,buffer);
-  //
-  //      send_check_message((char*)buffer,size);
-  //send_handover_command();
+  MeasId2 = CALLOC (1, sizeof (*MeasId2));
+  MeasId2->measId = 3;
+  MeasId2->measObjectId = 1;
+  MeasId2->reportConfigId = 3;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId2);
 
-}
+  MeasId3 = CALLOC (1, sizeof (*MeasId3));
+  MeasId3->measId = 4;
+  MeasId3->measObjectId = 1;
+  MeasId3->reportConfigId = 4;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId3);
 
-void rrc_eNB_generate_HandoverPreparationInformation (u8 Mod_id, u32 frame, u8 UE_index, PhysCellId_t targetPhyId) {
-  u8 UE_id_target;
-  u8 mod_id_target = get_adjacent_cell_mod_id(targetPhyId);
-  HANDOVER_INFO *handoverInfo = CALLOC(1,sizeof(*handoverInfo));
-  /*
-  u8 buffer[100];
-  u8 size;
-  struct PhysicalConfigDedicated  **physicalConfigDedicated = &eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index];
-  RadioResourceConfigDedicated_t *radioResourceConfigDedicated = CALLOC(1,sizeof(RadioResourceConfigDedicated_t));
-  */
+  MeasId4 = CALLOC (1, sizeof (*MeasId4));
+  MeasId4->measId = 5;
+  MeasId4->measObjectId = 1;
+  MeasId4->reportConfigId = 5;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId4);
+
+  MeasId5 = CALLOC (1, sizeof (*MeasId5));
+  MeasId5->measId = 6;
+  MeasId5->measObjectId = 1;
+  MeasId5->reportConfigId = 6;
+  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId5);
 
-  handoverInfo->as_config.antennaInfoCommon.antennaPortsCount =  0; //Not used 0- but check value
-  handoverInfo->as_config.sourceDl_CarrierFreq = 36090; //Verify!
-  memcpy((void*) &handoverInfo->as_config.sourceMasterInformationBlock, 
-	 (void*) &eNB_rrc_inst[Mod_id].mib,
-	 sizeof(MasterInformationBlock_t));
-  memcpy((void*) &handoverInfo->as_config.sourceMeasConfig, 
-	 (void*) &eNB_rrc_inst[Mod_id].measConfig[UE_index],
-	 sizeof(MeasConfig_t));
-  //to be configured
-  memset((void *)&eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_config.sourceSecurityAlgorithmConfig,
-	 0,
-	 sizeof(SecurityAlgorithmConfig_t));
+  //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->measIdToAddModList = MeasId_list;
 
-  memcpy((void *)&eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_config.sourceSystemInformationBlockType1,
-	 (void *)&eNB_rrc_inst[Mod_id].SIB1, 
-	 sizeof(SystemInformationBlockType1_t));
-  memcpy((void *)&eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_config.sourceSystemInformationBlockType2,
-	 (void *)&eNB_rrc_inst[Mod_id].SIB23, 
-	 sizeof(SystemInformationBlockType2_t));
+  // Add one EUTRA Measurement Object
+  MeasObj_list = CALLOC (1, sizeof (*MeasObj_list));
+  memset ((void *) MeasObj_list, 0, sizeof (*MeasObj_list));
 
-  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo = CALLOC(1,sizeof(ReestablishmentInfo_t));
-  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo->sourcePhysCellId = eNB_rrc_inst[Mod_id].physCellId;
-  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo->targetCellShortMAC_I.buf = NULL; // Check values later
-  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo->targetCellShortMAC_I.size = 0;
-  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo->targetCellShortMAC_I.bits_unused = 0;
-  eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context.reestablishmentInfo->additionalReestabInfoList = NULL;
+  // Configure MeasObject
 
-  eNB_rrc_inst[Mod_id].handover_info[UE_index]->ho_prepare = 0xFF;//0xF0;
-  eNB_rrc_inst[Mod_id].handover_info[UE_index]->ho_complete = 0;
+  MeasObj = CALLOC (1, sizeof (*MeasObj));
+  memset ((void *) MeasObj, 0, sizeof (*MeasObj));
 
-  if (mod_id_target != 0xFF) {
-    //UE_id_target = rrc_find_free_ue_index(modid_target);
-    UE_id_target = rrc_eNB_get_next_free_UE_index(mod_id_target,(u8 *)eNB_rrc_inst[Mod_id].Info.UE_list[UE_index]); //this should return a new index
+  MeasObj->measObjectId = 1;
+  MeasObj->measObject.present = MeasObjectToAddMod__measObject_PR_measObjectEUTRA;
+  MeasObj->measObject.choice.measObjectEUTRA.carrierFreq = 36090;
+  MeasObj->measObject.choice.measObjectEUTRA.allowedMeasBandwidth =  AllowedMeasBandwidth_mbw25;
+  MeasObj->measObject.choice.measObjectEUTRA.presenceAntennaPort1 = 1;
+  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.buf = CALLOC (1, sizeof (uint8_t));
+  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.buf[0] = 0;
+  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.size = 1;
+  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.bits_unused = 6;
+  MeasObj->measObject.choice.measObjectEUTRA.offsetFreq = NULL; // Default is 15 or 0dB
 
-    if (UE_id_target!=0xFF) {
-      LOG_N(RRC,"[eNB %d] Frame %d : Emulate sending HandoverPreparationInformation msg from eNB source %d to eNB target %d: source UE_id %d target UE_id %d source_modId: %d target_modId: %d\n",Mod_id,frame,eNB_rrc_inst[Mod_id].physCellId,targetPhyId,UE_index,UE_id_target,Mod_id,mod_id_target);
-      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target] = CALLOC(1,sizeof(*(eNB_rrc_inst[mod_id_target].handover_info[UE_id_target])));
-      memcpy((void *)&eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->as_context, 
-	     (void *)&eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_context, 
-	     sizeof(AS_Context_t));
-      memcpy((void *)&eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->as_config, 
-	     (void *)&eNB_rrc_inst[Mod_id].handover_info[UE_index]->as_config, 
-	     sizeof(AS_Config_t));
-      
-      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->ho_prepare = 0xFF;
-      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->ho_complete = 0;
+  MeasObj->measObject.choice.measObjectEUTRA.cellsToAddModList = (CellsToAddModList_t *) CALLOC (1, sizeof (*CellsToAddModList));
+  CellsToAddModList = MeasObj->measObject.choice.measObjectEUTRA.cellsToAddModList;
 
-      eNB_rrc_inst[Mod_id].handover_info[UE_index]->modid_t = mod_id_target;
-      eNB_rrc_inst[Mod_id].handover_info[UE_index]->ueid_s = UE_index;
-      eNB_rrc_inst[Mod_id].handover_info[UE_index]->modid_s = Mod_id;
-      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->modid_t = mod_id_target;
-      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->modid_s = Mod_id;
-      eNB_rrc_inst[mod_id_target].handover_info[UE_id_target]->ueid_t = UE_id_target;
-    }
-    else
-      LOG_E(RRC,"\nError in obtaining free UE id in target eNB %l for handover \n", targetPhyId);
-  }
-  else
-    LOG_E(RRC,"\nError in obtaining Module ID of target eNB for handover \n");
-}
+  // Add adjacent cell lists (6 per eNB)
+  for (i = 0; i < 6; i++)   {
+      CellToAdd = (CellsToAddMod_t *) CALLOC (1, sizeof (*CellToAdd));
+      CellToAdd->cellIndex = i + 1;
+      CellToAdd->physCellId = get_adjacent_cell_id (Mod_id, i);
+      CellToAdd->cellIndividualOffset = Q_OffsetRange_dB0;
 
-void rrc_eNB_process_handoverPreparationInformation(u8 Mod_id,u32 frame, u16 UE_index) {
+      ASN_SEQUENCE_ADD (&CellsToAddModList->list, CellToAdd);
+  }
 
-  LOG_I(RRC,"[eNB %d] Frame %d : Logical Channel UL-DCCH, processing RRCHandoverPreparationInformation, sending RRCConnectionReconfiguration to UE %d \n",Mod_id,frame,UE_index);
+  ASN_SEQUENCE_ADD (&MeasObj_list->list, MeasObj);
+  //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->measObjectToAddModList = MeasObj_list;
 
+  // Report Configurations for periodical, A1-A5 events
+  ReportConfig_list = CALLOC (1, sizeof (*ReportConfig_list));
+  memset ((void *) ReportConfig_list, 0, sizeof (*ReportConfig_list));
 
-  //eNB_rrc_inst[Mod_id].Info.UE_list[UE_index]
-  rrc_eNB_generate_RRCConnectionReconfiguration_handover(Mod_id,frame,UE_index,NULL,0);
+  ReportConfig_per = CALLOC (1, sizeof (*ReportConfig_per));
+  memset ((void *) ReportConfig_per, 0, sizeof (*ReportConfig_per));
 
-}
+  ReportConfig_A1 = CALLOC (1, sizeof (*ReportConfig_A1));
+  memset ((void *) ReportConfig_A1, 0, sizeof (*ReportConfig_A1));
 
-void check_handovers(u8 Mod_id, u32 frame) {
-  u8 i;
-  for (i=0;i<NUMBER_OF_UE_MAX;i++) {
-    if(eNB_rrc_inst[Mod_id].handover_info[i] != NULL) {
-      if(eNB_rrc_inst[Mod_id].handover_info[i]->ho_prepare == 0xFF) {
-	LOG_D(RRC,"[eNB %d] Frame %d: Incoming handover detected for new UE_idx %d (source eNB %d->target eNB %d) \n",
-	      Mod_id, frame, i,Mod_id, eNB_rrc_inst[Mod_id].handover_info[i]->modid_t);
-	// source eNB generates rrcconnectionreconfiguration to prepare the HO
-	rrc_eNB_process_handoverPreparationInformation(Mod_id,frame,i);
-	eNB_rrc_inst[Mod_id].handover_info[i]->ho_prepare = 0xF1;
-      }
-      
-      if(eNB_rrc_inst[Mod_id].handover_info[i]->ho_complete == 0xF1) {
-	LOG_D(RRC,"[eNB %d] Frame %d: handover Command received for new UE_idx %d current eNB %d target eNB: %d \n",
-	      Mod_id, frame, i,Mod_id,eNB_rrc_inst[Mod_id].handover_info[i]->modid_t);
-	//rrc_eNB_process_handoverPreparationInformation(Mod_id,frame,i);
-	pdcp_data_req(Mod_id,frame, 1,
-		      (i* NB_RB_MAX)+DCCH,
-		      rrc_eNB_mui++,0,
-		      eNB_rrc_inst[Mod_id].handover_info[i]->size,
-		      eNB_rrc_inst[Mod_id].handover_info[i]->buf,1);
-	eNB_rrc_inst[Mod_id].handover_info[i]->ho_complete = 0xF2;
-      }
-    }
-  }
-}
+  ReportConfig_A2 = CALLOC (1, sizeof (*ReportConfig_A2));
+  memset ((void *) ReportConfig_A2, 0, sizeof (*ReportConfig_A2));
 
-// 5.3.5.4 RRCConnectionReconfiguration including the mobilityControlInfo to prepare the UE handover
-void rrc_eNB_generate_RRCConnectionReconfiguration_handover (u8 Mod_id, u32 frame,u16 UE_index,u8 *nas_pdu,u32 nas_length)  {
+  ReportConfig_A3 = CALLOC (1, sizeof (*ReportConfig_A3));
+  memset ((void *) ReportConfig_A3, 0, sizeof (*ReportConfig_A3));
 
-  u8 buffer[RRC_BUF_SIZE];
-  u8 size;
-  int i;
-  uint8_t rv[2];
-  u16 Idx;
-  // configure SRB1/SRB2, PhysicalConfigDedicated, MAC_MainConfig for UE
-  eNB_RRC_INST *rrc_inst = &eNB_rrc_inst[Mod_id];
+  ReportConfig_A4 = CALLOC (1, sizeof (*ReportConfig_A4));
+  memset ((void *) ReportConfig_A4, 0, sizeof (*ReportConfig_A4));
 
-  struct PhysicalConfigDedicated **physicalConfigDedicated = &rrc_inst->physicalConfigDedicated[UE_index];
+  ReportConfig_A5 = CALLOC (1, sizeof (*ReportConfig_A5));
+  memset ((void *) ReportConfig_A5, 0, sizeof (*ReportConfig_A5));
 
-  struct SRB_ToAddMod *SRB2_config;
-  struct SRB_ToAddMod__rlc_Config *SRB2_rlc_config;
-  struct SRB_ToAddMod__logicalChannelConfig *SRB2_lchan_config;
-  struct LogicalChannelConfig__ul_SpecificParameters  *SRB2_ul_SpecificParameters; 
-  LogicalChannelConfig_t *SRB1_logicalChannelConfig = NULL;
-  SRB_ToAddModList_t *SRB_configList = rrc_inst->SRB_configList[UE_index]; // not used in this context: may be removed
-  SRB_ToAddModList_t *SRB_configList2;
+  ReportConfig_per->reportConfigId = 1;
+  ReportConfig_per->reportConfig.present = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerType.present = ReportConfigEUTRA__triggerType_PR_periodical;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerType.choice.periodical.purpose =ReportConfigEUTRA__triggerType__periodical__purpose_reportStrongestCells;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerQuantity = ReportConfigEUTRA__triggerQuantity_rsrp;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportQuantity = ReportConfigEUTRA__reportQuantity_both;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.maxReportCells = 2;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportInterval = ReportInterval_ms120;
+  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportAmount = ReportConfigEUTRA__reportAmount_infinity;
 
-  struct DRB_ToAddMod *DRB_config;
-  struct RLC_Config *DRB_rlc_config;
-  struct PDCP_Config *DRB_pdcp_config;
-  struct PDCP_Config__rlc_UM *PDCP_rlc_UM;
-  struct LogicalChannelConfig *DRB_lchan_config;
-  struct LogicalChannelConfig__ul_SpecificParameters   *DRB_ul_SpecificParameters;
-  // DRB_ToAddModList_t **DRB_configList = &rrc_inst->DRB_configList[UE_index];
-  DRB_ToAddModList_t *DRB_configList2;
+  ASN_SEQUENCE_ADD (&ReportConfig_list->list, ReportConfig_per);
 
-  MAC_MainConfig_t *mac_MainConfig;
-  MeasObjectToAddModList_t *MeasObj_list;
-  MeasObjectToAddMod_t *MeasObj;
-  ReportConfigToAddModList_t *ReportConfig_list;
-  ReportConfigToAddMod_t *ReportConfig_per, *ReportConfig_A1,
-    *ReportConfig_A2, *ReportConfig_A3, *ReportConfig_A4, *ReportConfig_A5;
-  MeasIdToAddModList_t *MeasId_list;
-  MeasIdToAddMod_t *MeasId0, *MeasId1, *MeasId2, *MeasId3, *MeasId4, *MeasId5;
-  QuantityConfig_t *quantityConfig;
-  MobilityControlInfo_t *mobilityInfo;
-  // HandoverCommand_t handoverCommand;
-  u8 sourceModId = get_adjacent_cell_mod_id(rrc_inst->handover_info[UE_index]->as_context.reestablishmentInfo->sourcePhysCellId);
-#if Rel10
-  long *sr_ProhibitTimer_r9;
-#endif
+  ReportConfig_A1->reportConfigId = 2;
+  ReportConfig_A1->reportConfig.present = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.present = ReportConfigEUTRA__triggerType_PR_event;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA1;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA1.a1_Threshold.present = ThresholdEUTRA_PR_threshold_RSRP;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA1.a1_Threshold.choice.threshold_RSRP = 10;
 
-  long *logicalchannelgroup, *logicalchannelgroup_drb;
-  long *maxHARQ_Tx, *periodicBSR_Timer;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerQuantity = ReportConfigEUTRA__triggerQuantity_rsrp;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportQuantity = ReportConfigEUTRA__reportQuantity_both;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.maxReportCells = 2;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportInterval = ReportInterval_ms120;
+  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportAmount = ReportConfigEUTRA__reportAmount_infinity;
 
-  // RSRP_Range_t *rsrp;
-  struct MeasConfig__speedStatePars *Sparams;
-  CellsToAddMod_t *CellToAdd;
-  CellsToAddModList_t *CellsToAddModList;
-  // srb 1: for HO
-  struct SRB_ToAddMod *SRB1_config;
-  struct SRB_ToAddMod__rlc_Config *SRB1_rlc_config;
-  struct SRB_ToAddMod__logicalChannelConfig *SRB1_lchan_config;
-  struct LogicalChannelConfig__ul_SpecificParameters *SRB1_ul_SpecificParameters;
-  // phy config dedicated
-  PhysicalConfigDedicated_t *physicalConfigDedicated2;
-  
+  ASN_SEQUENCE_ADD (&ReportConfig_list->list, ReportConfig_A1);
 
-  LOG_D(RRC,"[eNB %d] Frame %d: handover preparation: get the newSourceUEIdentity (C-RNTI): ", Mod_id, frame);
-  for (i=0;i<2;i++) {
-    rv[i]=taus()&0xff;
-    LOG_D(RRC," %x.",rv[i]);
-  }
- 
-  LOG_D(RRC,"[eNB %d] Frame %d : handover reparation: add target eNB SRB1 and PHYConfigDedicated reconfiguration\n",Mod_id, frame);
-  // 1st: reconfigure SRB
-  SRB_configList2 = CALLOC(1,sizeof(*SRB_configList));
-  SRB1_config = CALLOC(1,sizeof(*SRB1_config));
-  SRB1_config->srb_Identity = 1;
-  SRB1_rlc_config = CALLOC(1,sizeof(*SRB1_rlc_config));
-  SRB1_config->rlc_Config   = SRB1_rlc_config;
-    
-  SRB1_rlc_config->present = SRB_ToAddMod__rlc_Config_PR_explicitValue;
-  SRB1_rlc_config->choice.explicitValue.present=RLC_Config_PR_am;
-  SRB1_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.t_PollRetransmit=T_PollRetransmit_ms15;
-  SRB1_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollPDU=PollPDU_p8;
-  SRB1_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollByte=PollByte_kB1000;
-  SRB1_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.maxRetxThreshold=UL_AM_RLC__maxRetxThreshold_t16;
-  SRB1_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_Reordering=T_Reordering_ms50;
-  SRB1_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_StatusProhibit=T_StatusProhibit_ms10;
-    
-  SRB1_lchan_config = CALLOC(1,sizeof(*SRB1_lchan_config));
-  SRB1_config->logicalChannelConfig   = SRB1_lchan_config;
+  ReportConfig_A2->reportConfigId                                                              = 3;
+  ReportConfig_A2->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.present                    = ReportConfigEUTRA__triggerType_PR_event;
+  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA2;
+  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA2.a2_Threshold.present = ThresholdEUTRA_PR_threshold_RSRP;
+  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA2.a2_Threshold.choice.threshold_RSRP = 10;
   
-  SRB1_lchan_config->present = SRB_ToAddMod__logicalChannelConfig_PR_explicitValue;
-  SRB1_ul_SpecificParameters = CALLOC(1,sizeof(*SRB1_ul_SpecificParameters));
+  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
+  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
+  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
+  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
+  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
   
-  SRB1_lchan_config->choice.explicitValue.ul_SpecificParameters = SRB1_ul_SpecificParameters;
+  ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A2);
   
-  SRB1_ul_SpecificParameters->priority = 1;
+  ReportConfig_A3->reportConfigId                                                              = 4;
+  ReportConfig_A3->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.present                     = ReportConfigEUTRA__triggerType_PR_event;
+  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present= ReportConfigEUTRA__triggerType__event__eventId_PR_eventA3;
+  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA3.a3_Offset = 10;
+  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA3.reportOnLeave = 1;
+    
+  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
+  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
+  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
+  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
+  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
   
-  //assign_enum(&SRB1_ul_SpecificParameters->prioritisedBitRate,LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity);
-  SRB1_ul_SpecificParameters->prioritisedBitRate=LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
+  ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A3);
   
-  //assign_enum(&SRB1_ul_SpecificParameters->bucketSizeDuration,LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50);
-  SRB1_ul_SpecificParameters->bucketSizeDuration=LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
+  ReportConfig_A4->reportConfigId                                                              = 5;
+  ReportConfig_A4->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.present                   = ReportConfigEUTRA__triggerType_PR_event;
+  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present= ReportConfigEUTRA__triggerType__event__eventId_PR_eventA4;
+  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA4.a4_Threshold.present = ThresholdEUTRA_PR_threshold_RSRP;
+  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA4.a4_Threshold.choice.threshold_RSRP = 10;
   
-  logicalchannelgroup = CALLOC(1,sizeof(long));
-  *logicalchannelgroup=0;
-  SRB1_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup;
+  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
+  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
+  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
+  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
+  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
   
-  ASN_SEQUENCE_ADD(&SRB_configList2->list,SRB1_config);
-    
-  //2nd: now reconfigure phy config dedicated 
-  physicalConfigDedicated2 = CALLOC(1,sizeof(*physicalConfigDedicated2));
-  *physicalConfigDedicated = physicalConfigDedicated2;
+  ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A4);
   
-  physicalConfigDedicated2->pdsch_ConfigDedicated         = CALLOC(1,sizeof(*physicalConfigDedicated2->pdsch_ConfigDedicated));
-  physicalConfigDedicated2->pucch_ConfigDedicated         = CALLOC(1,sizeof(*physicalConfigDedicated2->pucch_ConfigDedicated));
-  physicalConfigDedicated2->pusch_ConfigDedicated         = CALLOC(1,sizeof(*physicalConfigDedicated2->pusch_ConfigDedicated));
-  physicalConfigDedicated2->uplinkPowerControlDedicated   = CALLOC(1,sizeof(*physicalConfigDedicated2->uplinkPowerControlDedicated));
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH         = CALLOC(1,sizeof(*physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH));
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH         = CALLOC(1,sizeof(*physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH));
-  physicalConfigDedicated2->cqi_ReportConfig              = NULL;//CALLOC(1,sizeof(*physicalConfigDedicated2->cqi_ReportConfig));
-  physicalConfigDedicated2->soundingRS_UL_ConfigDedicated = NULL;//CALLOC(1,sizeof(*physicalConfigDedicated2->soundingRS_UL_ConfigDedicated));
-  physicalConfigDedicated2->antennaInfo                   = CALLOC(1,sizeof(*physicalConfigDedicated2->antennaInfo));
-  physicalConfigDedicated2->schedulingRequestConfig       = CALLOC(1,sizeof(*physicalConfigDedicated2->schedulingRequestConfig));
-  // PDSCH
-  //assign_enum(&physicalConfigDedicated2->pdsch_ConfigDedicated->p_a,
-  //	      PDSCH_ConfigDedicated__p_a_dB0);
-  physicalConfigDedicated2->pdsch_ConfigDedicated->p_a=   PDSCH_ConfigDedicated__p_a_dB0;
+  ReportConfig_A5->reportConfigId                                                              = 6;
+  ReportConfig_A5->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.present                   = ReportConfigEUTRA__triggerType_PR_event;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA5;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold1.present = ThresholdEUTRA_PR_threshold_RSRP;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold2.present = ThresholdEUTRA_PR_threshold_RSRP;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold1.choice.threshold_RSRP = 10;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold2.choice.threshold_RSRP = 10;
   
-  // PUCCH
-  physicalConfigDedicated2->pucch_ConfigDedicated->ackNackRepetition.present=PUCCH_ConfigDedicated__ackNackRepetition_PR_release;
-  physicalConfigDedicated2->pucch_ConfigDedicated->ackNackRepetition.choice.release=0;
-  physicalConfigDedicated2->pucch_ConfigDedicated->tdd_AckNackFeedbackMode=NULL;//PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
+  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
   
-  // Pusch_config_dedicated
-  physicalConfigDedicated2->pusch_ConfigDedicated->betaOffset_ACK_Index = 0; // 2.00
-  physicalConfigDedicated2->pusch_ConfigDedicated->betaOffset_RI_Index  = 0; // 1.25
-  physicalConfigDedicated2->pusch_ConfigDedicated->betaOffset_CQI_Index = 8; // 2.25
+  ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A5);
   
-  // UplinkPowerControlDedicated
-  physicalConfigDedicated2->uplinkPowerControlDedicated->p0_UE_PUSCH = 0; // 0 dB
-  //assign_enum(&physicalConfigDedicated2->uplinkPowerControlDedicated->deltaMCS_Enabled,
-  // UplinkPowerControlDedicated__deltaMCS_Enabled_en1);
-  physicalConfigDedicated2->uplinkPowerControlDedicated->deltaMCS_Enabled= UplinkPowerControlDedicated__deltaMCS_Enabled_en1;
-  physicalConfigDedicated2->uplinkPowerControlDedicated->accumulationEnabled = 1;  // FALSE
-  physicalConfigDedicated2->uplinkPowerControlDedicated->p0_UE_PUCCH = 0; // 0 dB
-  physicalConfigDedicated2->uplinkPowerControlDedicated->pSRS_Offset = 0; // 0 dB
-  physicalConfigDedicated2->uplinkPowerControlDedicated->filterCoefficient = CALLOC(1,sizeof(*physicalConfigDedicated2->uplinkPowerControlDedicated->filterCoefficient));
-  //  assign_enum(physicalConfigDedicated2->uplinkPowerControlDedicated->filterCoefficient,FilterCoefficient_fc4); // fc4 dB
-  *physicalConfigDedicated2->uplinkPowerControlDedicated->filterCoefficient=FilterCoefficient_fc4; // fc4 dB
+  Sparams = CALLOC(1,sizeof(*Sparams));
+  Sparams->present=MeasConfig__speedStatePars_PR_setup;
+  Sparams->choice.setup.timeToTrigger_SF.sf_High=SpeedStateScaleFactors__sf_Medium_oDot75;
+  Sparams->choice.setup.timeToTrigger_SF.sf_Medium=SpeedStateScaleFactors__sf_High_oDot5;
+  Sparams->choice.setup.mobilityStateParameters.n_CellChangeHigh=10;
+  Sparams->choice.setup.mobilityStateParameters.n_CellChangeMedium=5;
+  Sparams->choice.setup.mobilityStateParameters.t_Evaluation=MobilityStateParameters__t_Evaluation_s60;
+  Sparams->choice.setup.mobilityStateParameters.t_HystNormal=MobilityStateParameters__t_HystNormal_s120;
   
-  // TPC-PDCCH-Config
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->present=TPC_PDCCH_Config_PR_setup;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_Index.present = TPC_Index_PR_indexOfFormat3;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_Index.choice.indexOfFormat3 = 1;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_RNTI.buf=CALLOC(1,2);
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_RNTI.size=2;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_RNTI.buf[0]=0x12;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_RNTI.buf[1]=0x34+UE_index;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUCCH->choice.setup.tpc_RNTI.bits_unused=0;
+  quantityConfig = CALLOC(1,sizeof(*quantityConfig));
+  memset((void *)quantityConfig,0,sizeof(*quantityConfig));
+  quantityConfig->quantityConfigEUTRA = CALLOC(1,sizeof(*quantityConfig->quantityConfigEUTRA));
+  memset((void *)quantityConfig->quantityConfigEUTRA,0,sizeof(*quantityConfig->quantityConfigEUTRA));
+  quantityConfig->quantityConfigCDMA2000 = NULL;
+  quantityConfig->quantityConfigGERAN = NULL;
+  quantityConfig->quantityConfigUTRA = NULL;
+  quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP = CALLOC(1,sizeof(*quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP));
+  quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = CALLOC(1,sizeof(*quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ));
+  *quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP = FilterCoefficient_fc4;
+  *quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = FilterCoefficient_fc4;
+
+
+  /* mobilityinfo  */
+
+  mobilityInfo = CALLOC(1,sizeof(*mobilityInfo));
+  memset((void *)mobilityInfo,0,sizeof(*mobilityInfo));
+  mobilityInfo->targetPhysCellId = (PhysCellId_t) two_tier_hexagonal_cellIds[rrc_inst->handover_info[UE_index]->modid_t];
+  LOG_D(RRC,"[eNB %d] Frame %d: handover preparation: targetPhysCellId: %d mod_id: %d UE_index: %d \n",
+        Mod_id,frame, mobilityInfo->targetPhysCellId,Mod_id,UE_index);
+
+  mobilityInfo->additionalSpectrumEmission = CALLOC(1,sizeof(*mobilityInfo->additionalSpectrumEmission));
+  *mobilityInfo->additionalSpectrumEmission = 1; //Check this value!
   
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->present=TPC_PDCCH_Config_PR_setup;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_Index.present = TPC_Index_PR_indexOfFormat3;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_Index.choice.indexOfFormat3 = 1;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_RNTI.buf=CALLOC(1,2);
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_RNTI.size=2;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_RNTI.buf[0]=0x22;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_RNTI.buf[1]=0x34+UE_index;
-  physicalConfigDedicated2->tpc_PDCCH_ConfigPUSCH->choice.setup.tpc_RNTI.bits_unused=0;
+  mobilityInfo->t304 = MobilityControlInfo__t304_ms50; // need to configure an appropriate value here
   
-  // CQI ReportConfig
-  /*
-    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportModeAperiodic=CALLOC(1,sizeof(*physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportModeAperiodic));
-    assign_enum(physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportModeAperiodic,
-    CQI_ReportConfig__cqi_ReportModeAperiodic_rm30); // HLC CQI, no PMI
-    physicalConfigDedicated2->cqi_ReportConfig->nomPDSCH_RS_EPRE_Offset = 0; // 0 dB
-    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic=CALLOC(1,sizeof(*physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic));
-    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->present =  CQI_ReportPeriodic_PR_setup;
-    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_PUCCH_ResourceIndex = 0;  // n2_pucch
-    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_pmi_ConfigIndex = 0;  // Icqi/pmi
-    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.present = CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_subbandCQI;  // subband CQI
-    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.choice.subbandCQI.k=4;
-    
-    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.ri_ConfigIndex=NULL;
-    physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->choice.setup.simultaneousAckNackAndCQI=0;
-  */
+  // New UE Identity (C-RNTI) to identify an UE uniquely in a cell
+  mobilityInfo->newUE_Identity.size = 2;
+  mobilityInfo->newUE_Identity.bits_unused = 0;
+  mobilityInfo->newUE_Identity.buf = rv;
+  mobilityInfo->newUE_Identity.buf[0] = rv[0];
+  mobilityInfo->newUE_Identity.buf[1] = rv[1];
   
-  //soundingRS-UL-ConfigDedicated
-  /*
-    physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->present = SoundingRS_UL_ConfigDedicated_PR_setup;
-    assign_enum(&physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.srs_Bandwidth,
-    SoundingRS_UL_ConfigDedicated__setup__srs_Bandwidth_bw0);
-    assign_enum(&physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.srs_HoppingBandwidth,
-    SoundingRS_UL_ConfigDedicated__setup__srs_HoppingBandwidth_hbw0);
-    physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.freqDomainPosition=0;
-    physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.duration=1;
-    physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.srs_ConfigIndex=1;
-    physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.transmissionComb=0;
-    assign_enum(&physicalConfigDedicated2->soundingRS_UL_ConfigDedicated->choice.setup.cyclicShift,
-    SoundingRS_UL_ConfigDedicated__setup__cyclicShift_cs0);
-  */
+  //memset((void *)&mobilityInfo->radioResourceConfigCommon,(void *)&rrc_inst->sib2->radioResourceConfigCommon,sizeof(RadioResourceConfigCommon_t));
+  //memset((void *)&mobilityInfo->radioResourceConfigCommon,0,sizeof(RadioResourceConfigCommon_t));
+
+  // Configuring radioResourceConfigCommon
+  mobilityInfo->radioResourceConfigCommon.rach_ConfigCommon = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.rach_ConfigCommon));
+  memcpy((void *)mobilityInfo->radioResourceConfigCommon.rach_ConfigCommon, 
+         (void *)&rrc_inst->sib2->radioResourceConfigCommon.rach_ConfigCommon,
+         sizeof(RACH_ConfigCommon_t));
+  mobilityInfo->radioResourceConfigCommon.prach_Config.prach_ConfigInfo = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.prach_Config.prach_ConfigInfo));
+  memcpy((void *)mobilityInfo->radioResourceConfigCommon.prach_Config.prach_ConfigInfo, 
+         (void *)&rrc_inst->sib2->radioResourceConfigCommon.prach_Config.prach_ConfigInfo,
+         sizeof(PRACH_ConfigInfo_t));
   
-  //AntennaInfoDedicated
-  physicalConfigDedicated2->antennaInfo = CALLOC(1,sizeof(*physicalConfigDedicated2->antennaInfo));
-  physicalConfigDedicated2->antennaInfo->present = PhysicalConfigDedicated__antennaInfo_PR_explicitValue;
-  //assign_enum(&physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode,
-  //     AntennaInfoDedicated__transmissionMode_tm2);
-  /*  
-  switch (transmission_mode){
-  case 1:
-    physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode=     AntennaInfoDedicated__transmissionMode_tm1;
-    break;
-  case 2:
-    physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode=     AntennaInfoDedicated__transmissionMode_tm2;
-    break;
-  case 4:
-    physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode=     AntennaInfoDedicated__transmissionMode_tm4;
-    break;
-  case 5:
-    physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode=     AntennaInfoDedicated__transmissionMode_tm5;
-    break;
-  case 6:
-    physicalConfigDedicated2->antennaInfo->choice.explicitValue.transmissionMode=     AntennaInfoDedicated__transmissionMode_tm6;
-    break;
-  }
-  */
-  physicalConfigDedicated2->antennaInfo->choice.explicitValue.ue_TransmitAntennaSelection.present = AntennaInfoDedicated__ue_TransmitAntennaSelection_PR_release;
-  physicalConfigDedicated2->antennaInfo->choice.explicitValue.ue_TransmitAntennaSelection.choice.release = 0;
+  mobilityInfo->radioResourceConfigCommon.prach_Config.rootSequenceIndex = rrc_inst->sib2->radioResourceConfigCommon.prach_Config.rootSequenceIndex;
+  mobilityInfo->radioResourceConfigCommon.pdsch_ConfigCommon = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.pdsch_ConfigCommon));
+  memcpy((void *)mobilityInfo->radioResourceConfigCommon.pdsch_ConfigCommon, 
+         (void *)&rrc_inst->sib2->radioResourceConfigCommon.pdsch_ConfigCommon,
+         sizeof(PDSCH_ConfigCommon_t));
+  memcpy((void *)&mobilityInfo->radioResourceConfigCommon.pusch_ConfigCommon,
+         (void *)&rrc_inst->sib2->radioResourceConfigCommon.pusch_ConfigCommon,
+         sizeof(PUSCH_ConfigCommon_t));
+  mobilityInfo->radioResourceConfigCommon.phich_Config = NULL;
+  mobilityInfo->radioResourceConfigCommon.pucch_ConfigCommon = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.pucch_ConfigCommon));
+  memcpy((void *)mobilityInfo->radioResourceConfigCommon.pucch_ConfigCommon, 
+         (void *)&rrc_inst->sib2->radioResourceConfigCommon.pucch_ConfigCommon,
+         sizeof(PUCCH_ConfigCommon_t));
+  mobilityInfo->radioResourceConfigCommon.soundingRS_UL_ConfigCommon = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.soundingRS_UL_ConfigCommon));
+  memcpy((void *)mobilityInfo->radioResourceConfigCommon.soundingRS_UL_ConfigCommon, 
+         (void *)&rrc_inst->sib2->radioResourceConfigCommon.soundingRS_UL_ConfigCommon,
+         sizeof(SoundingRS_UL_ConfigCommon_t));
+  mobilityInfo->radioResourceConfigCommon.uplinkPowerControlCommon = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.uplinkPowerControlCommon));
+  memcpy((void *)mobilityInfo->radioResourceConfigCommon.uplinkPowerControlCommon, 
+         (void *)&rrc_inst->sib2->radioResourceConfigCommon.uplinkPowerControlCommon,
+         sizeof(UplinkPowerControlCommon_t));
+  mobilityInfo->radioResourceConfigCommon.antennaInfoCommon = NULL;
+  mobilityInfo->radioResourceConfigCommon.p_Max = NULL; // CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.p_Max));
+  //memcpy((void *)mobilityInfo->radioResourceConfigCommon.p_Max,(void *)rrc_inst->sib1->p_Max,sizeof(P_Max_t));
+  mobilityInfo->radioResourceConfigCommon.tdd_Config = NULL; //CALLOC(1,sizeof(TDD_Config_t));
+  //memcpy((void *)mobilityInfo->radioResourceConfigCommon.tdd_Config,(void *)rrc_inst->sib1->tdd_Config,sizeof(TDD_Config_t));
+  mobilityInfo->radioResourceConfigCommon.ul_CyclicPrefixLength = rrc_inst->sib2->radioResourceConfigCommon.ul_CyclicPrefixLength;
+  //End of configuration of radioResourceConfigCommon
+
+  mobilityInfo->carrierFreq = CALLOC(1,sizeof(*mobilityInfo->carrierFreq)); //CALLOC(1,sizeof(CarrierFreqEUTRA_t)); 36090
+  mobilityInfo->carrierFreq->dl_CarrierFreq = 36090;
+  mobilityInfo->carrierFreq->ul_CarrierFreq = NULL;
   
-  // SchedulingRequestConfig
-  physicalConfigDedicated2->schedulingRequestConfig->present = SchedulingRequestConfig_PR_setup;
-  physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = UE_index;
+  mobilityInfo->carrierBandwidth = CALLOC(1,sizeof(*mobilityInfo->carrierBandwidth)); //CALLOC(1,sizeof(struct CarrierBandwidthEUTRA));  AllowedMeasBandwidth_mbw25
+  mobilityInfo->carrierBandwidth->dl_Bandwidth = CarrierBandwidthEUTRA__dl_Bandwidth_n25;
+  mobilityInfo->carrierBandwidth->ul_Bandwidth = NULL;
+  mobilityInfo->rach_ConfigDedicated = NULL;
   
-  if (mac_xface->lte_frame_parms->frame_type == 0){ // FDD
-    physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 5+(UE_index%10);  // Isr = 5 (every 10 subframes, offset=2+UE_id mod3)
-} else {
-    switch (mac_xface->lte_frame_parms->tdd_config) {
-    case 1:
-      physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7+(UE_index&1)+((UE_index&3)>>1)*5;  // Isr = 5 (every 10 subframes, offset=2 for UE0, 3 for UE1, 7 for UE2, 8 for UE3 , 2 for UE4 etc..)
-      break;
-    case 3:
-      physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7+(UE_index%3);  // Isr = 5 (every 10 subframes, offset=2 for UE0, 3 for UE1, 3 for UE2, 2 for UE3 , etc..)
-      break;
-    case 4:
-      physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7+(UE_index&1);  // Isr = 5 (every 10 subframes, offset=2 for UE0, 3 for UE1, 3 for UE2, 2 for UE3 , etc..)
-      break;
-    default:
-      physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7;  // Isr = 5 (every 10 subframes, offset=2 for all UE0 etc..)
-      break;
+
+  // store the srb and drb list for ho management, mainly in case of failure
+  
+  memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.srb_ToAddModList,
+         (void *)SRB_configList2,
+         sizeof(SRB_ToAddModList_t));
+  memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.drb_ToAddModList,
+         (void *)DRB_configList2,
+         sizeof(DRB_ToAddModList_t));
+    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.drb_ToReleaseList = NULL;
+    memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.mac_MainConfig,
+           (void *)mac_MainConfig,
+           sizeof(MAC_MainConfig_t));
+    memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.physicalConfigDedicated,
+           (void *)rrc_inst->physicalConfigDedicated[UE_index],
+           sizeof(PhysicalConfigDedicated_t));
+    /*    memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.sps_Config,
+           (void *)rrc_inst->sps_Config[UE_index],
+           sizeof(SPS_Config_t));
+    */
+    LOG_I(RRC,"[eNB %d] Frame %d: adding new UE\n");
+    Idx = (UE_index * NB_RB_MAX) + DCCH;
+    // SRB1
+    eNB_rrc_inst[Mod_id].Srb1[UE_index].Active = 1;
+    eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.Srb_id = Idx;
+    memcpy (&eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.Lchan_desc[0], 
+            &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
+    memcpy (&eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.Lchan_desc[1], 
+            &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
+    
+    // SRB2
+    eNB_rrc_inst[Mod_id].Srb2[UE_index].Active = 1;
+    eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.Srb_id = Idx;
+    memcpy (&eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.Lchan_desc[0], 
+            &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
+    memcpy (&eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.Lchan_desc[1], 
+            &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
+    
+    LOG_I (RRC,"[eNB %d] CALLING RLC CONFIG SRB1 (rbid %d) for UE %d\n",Mod_id, Idx, UE_index);
+    
+    //      rrc_pdcp_config_req (Mod_id, frame, 1, ACTION_ADD, idx, UNDEF_SECURITY_MODE);
+    //      rrc_rlc_config_req(Mod_id,frame,1,ACTION_ADD,Idx,SIGNALLING_RADIO_BEARER,Rlc_info_am_config);
+    
+    rrc_pdcp_config_asn1_req (Mod_id, frame, 1, UE_index,
+                              eNB_rrc_inst[Mod_id].SRB_configList[UE_index],
+                              (DRB_ToAddModList_t *) NULL,
+                              (DRB_ToReleaseList_t *) NULL,
+                              0xff,
+                              NULL,
+                              NULL,
+                              NULL
+#ifdef Rel10
+                              , (PMCH_InfoList_r9_t *) NULL
+#endif
+                              );
+    
+    rrc_rlc_config_asn1_req (Mod_id, frame, 1, UE_index,
+                             eNB_rrc_inst[Mod_id].SRB_configList[UE_index],
+                             (DRB_ToAddModList_t *) NULL,
+                             (DRB_ToReleaseList_t *) NULL
+#ifdef Rel10
+                             , (PMCH_InfoList_r9_t *) NULL
+#endif
+                             );
+    
+    
+  //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->reportConfigToAddModList = ReportConfig_list;
+    memset (buffer, 0, RRC_BUF_SIZE);
+
+    size = do_RRCConnectionReconfiguration (Mod_id, buffer, UE_index, rrc_eNB_get_next_transaction_identifier(Mod_id),  //Transaction_id,
+                                          SRB_configList2, DRB_configList2, NULL,       // DRB2_list,
+                                          NULL, //*sps_Config,
+                                          physicalConfigDedicated[UE_index], MeasObj_list, ReportConfig_list,
+                                          NULL, //quantityConfig,
+                                          MeasId_list, mac_MainConfig, NULL, mobilityInfo,Sparams,
+                                          NULL, NULL, nas_pdu, nas_length);
+
+    LOG_I (RRC,"[eNB %d] Frame %d, Logical Channel DL-DCCH, Generate RRCConnectionReconfiguration for handover (bytes %d, UE id %d)\n",
+         Mod_id, frame, size, UE_index);
+  // to be updated if needed
+  /*if (eNB_rrc_inst[Mod_id].SRB1_config[UE_index]->logicalChannelConfig) {
+    if (eNB_rrc_inst[Mod_id].SRB1_config[UE_index]->logicalChannelConfig->present == SRB_ToAddMod__logicalChannelConfig_PR_explicitValue) {
+      SRB1_logicalChannelConfig = &eNB_rrc_inst[Mod_id].SRB1_config[UE_index]->logicalChannelConfig->choice.explicitValue;
+    }
+    else {
+      SRB1_logicalChannelConfig = &SRB1_logicalChannelConfig_defaultValue;
     }
   }
+  else {
+    SRB1_logicalChannelConfig = &SRB1_logicalChannelConfig_defaultValue;
+  }
+  */
+
+  LOG_D (RRC,"[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration_handover to UE %d MUI %d) --->][PDCP][MOD %02d][RB %02d]\n",
+         frame, Mod_id, size, UE_index, rrc_eNB_mui, Mod_id,
+         (UE_index * NB_RB_MAX) + DCCH);
   
-  //  assign_enum(&physicalConfigDedicated2->schedulingRequestConfig->choice.setup.dsr_TransMax,
-  //SchedulingRequestConfig__setup__dsr_TransMax_n4);
-  //  assign_enum(&physicalConfigDedicated2->schedulingRequestConfig->choice.setup.dsr_TransMax = SchedulingRequestConfig__setup__dsr_TransMax_n4;
-  physicalConfigDedicated2->schedulingRequestConfig->choice.setup.dsr_TransMax = SchedulingRequestConfig__setup__dsr_TransMax_n4;
-   
-  LOG_D(RRC,"handover_config [MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- MAC_CONFIG_REQ  (SRB1 UE %d) --->][MAC_eNB][MOD %02d][]\n",
-		frame, Mod_id, UE_index, Mod_id);
-  rrc_mac_config_req (Mod_id, 1, UE_index, 0,
-		      (RadioResourceConfigCommonSIB_t *) NULL,
-		      eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index],
-		      (MeasObjectToAddMod_t **) NULL,
-		      eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index], 
-		      1, 
-		      SRB1_logicalChannelConfig,
-		      eNB_rrc_inst[Mod_id].measGapConfig[UE_index],
-		      (TDD_Config_t *) NULL, 
-		      (MobilityControlInfo_t *)NULL,
-		      (u8 *) NULL,(u16 *) NULL, NULL, NULL, NULL,
-		      (MBSFN_SubframeConfigList_t *) NULL
+  //rrc_rlc_data_req(Mod_id,frame, 1,(UE_index*NB_RB_MAX)+DCCH,rrc_eNB_mui++,0,size,(char*)buffer);
+  //pdcp_data_req (Mod_id, frame, 1, (UE_index * NB_RB_MAX) + DCCH,rrc_eNB_mui++, 0, size, (char *) buffer, 1);
+   rrc_mac_config_req (Mod_id, 1, UE_index, 0,
+                      (RadioResourceConfigCommonSIB_t *) NULL,
+                      eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index],
+                      (MeasObjectToAddMod_t **) NULL,
+                      eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index],
+                      1,
+                      SRB1_logicalChannelConfig,
+                      eNB_rrc_inst[Mod_id].measGapConfig[UE_index],
+                      (TDD_Config_t *) NULL,
+                      (MobilityControlInfo_t *)mobilityInfo,
+                      (u8 *) NULL,(u16 *) NULL, NULL, NULL, NULL,
+                      (MBSFN_SubframeConfigList_t *) NULL
 #ifdef Rel10
-		      ,
-		      0,
-		      (MBSFN_AreaInfoList_r9_t *) NULL,
-		      (PMCH_InfoList_r9_t *) NULL
+                      ,
+                      0,
+                      (MBSFN_AreaInfoList_r9_t *) NULL,
+                      (PMCH_InfoList_r9_t *) NULL
 #endif
 #ifdef CBA
-		      ,
-		      eNB_rrc_inst[Mod_id].
-		      num_active_cba_groups,
-		      eNB_rrc_inst[Mod_id].cba_rnti[0]
+                       ,
+                       0,
+                       0,
 #endif
-		      );
-  
+                      );
+ 
 
-  // Configure target eNB SRB2
-  /// SRB2
-  SRB2_config = CALLOC (1, sizeof (*SRB2_config));
-  SRB_configList2 = CALLOC (1, sizeof (*SRB_configList2));
-  memset (SRB_configList2, 0, sizeof (*SRB_configList2));
+  /*
+  handoverCommand.criticalExtensions.present = HandoverCommand__criticalExtensions_PR_c1;
+  handoverCommand.criticalExtensions.choice.c1.present = HandoverCommand__criticalExtensions__c1_PR_handoverCommand_r8;
+  handoverCommand.criticalExtensions.choice.c1.choice.handoverCommand_r8.handoverCommandMessage.buf = buffer;
+  handoverCommand.criticalExtensions.choice.c1.choice.handoverCommand_r8.handoverCommandMessage.size = size;
+  */
 
-  SRB2_config->srb_Identity = 2;
-  SRB2_rlc_config = CALLOC (1, sizeof (*SRB2_rlc_config));
-  SRB2_config->rlc_Config = SRB2_rlc_config;
+  if (sourceModId != 0xFF) {
+    memcpy(eNB_rrc_inst[sourceModId].handover_info[eNB_rrc_inst[Mod_id].handover_info[UE_index]->ueid_s]->buf,
+           (void *)buffer,
+           size);
+    eNB_rrc_inst[sourceModId].handover_info[eNB_rrc_inst[Mod_id].handover_info[UE_index]->ueid_s]->size = size;
+    eNB_rrc_inst[sourceModId].handover_info[eNB_rrc_inst[Mod_id].handover_info[UE_index]->ueid_s]->ho_complete = 0xF1;
+    //eNB_rrc_inst[Mod_id].handover_info[UE_index]->ho_complete = 0xFF;
+    LOG_D(RRC,"[eNB %d] Frame %d: setting handover complete to 0xF1 for (%d,%d) and to 0xFF for (%d,%d)\n", 
+          Mod_id, frame,
+          sourceModId,eNB_rrc_inst[Mod_id].handover_info[UE_index]->ueid_s,
+          Mod_id, UE_index);
+  }
+  else
+    LOG_W(RRC,"[eNB %d] Frame %d: rrc_eNB_generate_RRCConnectionReconfiguration_handover: Could not find source eNB mod_id.\n", 
+          Mod_id, frame);
 
-  SRB2_rlc_config->present = SRB_ToAddMod__rlc_Config_PR_explicitValue;
-  SRB2_rlc_config->choice.explicitValue.present = RLC_Config_PR_am;
-  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.t_PollRetransmit = T_PollRetransmit_ms15;
-  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollPDU = PollPDU_p8;
-  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.pollByte = PollByte_kB1000;
-  SRB2_rlc_config->choice.explicitValue.choice.am.ul_AM_RLC.maxRetxThreshold = UL_AM_RLC__maxRetxThreshold_t32;
-  SRB2_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_Reordering = T_Reordering_ms50;
-  SRB2_rlc_config->choice.explicitValue.choice.am.dl_AM_RLC.t_StatusProhibit = T_StatusProhibit_ms10;
 
-  SRB2_lchan_config = CALLOC (1, sizeof (*SRB2_lchan_config));
-  SRB2_config->logicalChannelConfig = SRB2_lchan_config;
+}
 
-  SRB2_lchan_config->present =  SRB_ToAddMod__logicalChannelConfig_PR_explicitValue;
+/*
+  void ue_rrc_process_rrcConnectionReconfiguration(u8 Mod_id,u32 frame,
+  RRCConnectionReconfiguration_t *rrcConnectionReconfiguration,
+  u8 CH_index) {
 
-  SRB2_ul_SpecificParameters =  CALLOC (1, sizeof (*SRB2_ul_SpecificParameters));
+  if (rrcConnectionReconfiguration->criticalExtensions.present == RRCConnectionReconfiguration__criticalExtensions_PR_c1)
+  if (rrcConnectionReconfiguration->criticalExtensions.choice.c1.present == RRCConnectionReconfiguration__criticalExtensions__c1_PR_rrcConnectionReconfiguration_r8) {
 
-  SRB2_ul_SpecificParameters->priority = 1;
-  SRB2_ul_SpecificParameters->prioritisedBitRate = LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
-  SRB2_ul_SpecificParameters->bucketSizeDuration = LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
+  if (rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.radioResourceConfigDedicated) {
+  rrc_ue_process_radioResourceConfigDedicated(Mod_id,frame,CH_index,
+  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.radioResourceConfigDedicated);
 
-  // LCG for CCCH and DCCH is 0 as defined in 36331
-  logicalchannelgroup = CALLOC (1, sizeof (long));
-  *logicalchannelgroup = 0;
 
-  SRB2_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup;
-  SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters =  SRB2_ul_SpecificParameters;
-  ASN_SEQUENCE_ADD (&SRB_configList->list, SRB2_config);
-  ASN_SEQUENCE_ADD (&SRB_configList2->list, SRB2_config);
+  }
+
+  // check other fields for
+  }
+  }
+*/
+
+/*------------------------------------------------------------------------------*/
+void rrc_eNB_process_RRCConnectionReconfigurationComplete (u8 Mod_id, u32 frame,
+                                                      u8 UE_index,
+                                                      RRCConnectionReconfigurationComplete_r8_IEs_t *rrcConnectionReconfigurationComplete)
+{
+  int i;
+#ifdef NAS_NETLINK
+  int oip_ifup = 0;
+  int dest_ip_offset = 0;
+#endif
+
+  uint8_t *kRRCenc = NULL;
+  uint8_t *kRRCint = NULL;
+  uint8_t *kUPenc  = NULL;
+
+  DRB_ToAddModList_t *DRB_configList = eNB_rrc_inst[Mod_id].DRB_configList[UE_index];
+  SRB_ToAddModList_t *SRB_configList = eNB_rrc_inst[Mod_id].SRB_configList[UE_index];
+
+#if defined(ENABLE_SECURITY)
+  /* Derive the keys from kenb */
+  if (DRB_configList != NULL) {
+    derive_key_up_enc(eNB_rrc_inst[Mod_id].ciphering_algorithm[UE_index],
+                      eNB_rrc_inst[Mod_id].kenb[UE_index], &kUPenc);
+  }
+
+  derive_key_rrc_enc(eNB_rrc_inst[Mod_id].ciphering_algorithm[UE_index],
+                     eNB_rrc_inst[Mod_id].kenb[UE_index], &kRRCenc);
+  derive_key_rrc_int(eNB_rrc_inst[Mod_id].integrity_algorithm[UE_index],
+                     eNB_rrc_inst[Mod_id].kenb[UE_index], &kRRCint);
+#endif
+
+  // Refresh SRBs/DRBs
+  rrc_pdcp_config_asn1_req (Mod_id, frame, 1, UE_index,
+                            SRB_configList,
+                            DRB_configList, (DRB_ToReleaseList_t *) NULL,
+                            eNB_rrc_inst[Mod_id].ciphering_algorithm[UE_index] |
+                            (eNB_rrc_inst[Mod_id].integrity_algorithm[UE_index] << 4),
+                            kRRCenc,
+                            kRRCint,
+                            kUPenc
+#ifdef Rel10
+                            , (PMCH_InfoList_r9_t *) NULL
+#endif
+    );
+  // Refresh SRBs/DRBs
+  rrc_rlc_config_asn1_req (Mod_id, frame, 1, UE_index,
+                           SRB_configList,
+                           DRB_configList, (DRB_ToReleaseList_t *) NULL
+#ifdef Rel10
+                           , (PMCH_InfoList_r9_t *) NULL
+#endif
+    );
+
+
+  // Loop through DRBs and establish if necessary
+
+  if (DRB_configList != NULL)
+    {
+      for (i = 0; i < DRB_configList->list.count; i++)
+        {                       // num max DRB (11-3-8)
+          if (DRB_configList->list.array[i])
+            {
+              LOG_I (RRC,
+                     "[eNB %d] Frame  %d : Logical Channel UL-DCCH, Received RRCConnectionReconfigurationComplete from UE %d, reconfiguring DRB %d/LCID %d\n",
+                     Mod_id, frame, UE_index,
+                     (int) DRB_configList->list.array[i]->drb_Identity,
+                     (UE_index * NB_RB_MAX) +
+                     (int) *DRB_configList->list.array[i]->
+                     logicalChannelIdentity);
+              if (eNB_rrc_inst[Mod_id].DRB_active[UE_index][i] == 0)
+                {
+                  /*
+                     rrc_pdcp_config_req (Mod_id, frame, 1, ACTION_ADD,
+                     (UE_index * NB_RB_MAX) + *DRB_configList->list.array[i]->logicalChannelIdentity,UNDEF_SECURITY_MODE);
+                     rrc_rlc_config_req(Mod_id,frame,1,ACTION_ADD,
+                     (UE_index * NB_RB_MAX) + (int)*eNB_rrc_inst[Mod_id].DRB_config[UE_index][i]->logicalChannelIdentity,
+                     RADIO_ACCESS_BEARER,Rlc_info_um);
+                   */
+                  eNB_rrc_inst[Mod_id].DRB_active[UE_index][i] = 1;
+
+                  LOG_D (RRC,
+                         "[eNB %d] Frame %d: Establish RLC UM Bidirectional, DRB %d Active\n",
+                         Mod_id, frame,
+                         (int) DRB_configList->list.array[i]->drb_Identity);
+
+#ifdef NAS_NETLINK
+                  // can mean also IPV6 since ether -> ipv6 autoconf
+#if !defined(OAI_NW_DRIVER_TYPE_ETHERNET) && !defined(EXMIMO)
+                  LOG_I (OIP,
+                         "[eNB %d] trying to bring up the OAI interface oai%d\n",
+                         Mod_id, Mod_id);
+                  oip_ifup = nas_config (Mod_id,        // interface index
+                                         Mod_id + 1,    // thrid octet
+                                         Mod_id + 1);   // fourth octet
+
+                  if (oip_ifup == 0)
+                    {           // interface is up --> send a config the DRB
+#ifdef OAI_EMU
+                      oai_emulation.info.oai_ifup[Mod_id] = 1;
+                      dest_ip_offset = NB_eNB_INST;
+#else
+                      dest_ip_offset = 8;
+#endif
+                      LOG_I (OIP,
+                             "[eNB %d] Config the oai%d to send/receive pkt on DRB %d to/from the protocol stack\n",
+                             Mod_id, Mod_id,
+                             (UE_index * NB_RB_MAX) +
+                             *DRB_configList->list.array[i]->
+                             logicalChannelIdentity);
+                      rb_conf_ipv4 (0,  //add
+                                    UE_index,   //cx
+                                    Mod_id,     //inst
+                                    (UE_index * NB_RB_MAX) + *DRB_configList->list.array[i]->logicalChannelIdentity, 0, //dscp
+                                    ipv4_address (Mod_id + 1, Mod_id + 1),      //saddr
+                                    ipv4_address (Mod_id + 1, dest_ip_offset + UE_index + 1));  //daddr
+
+                      LOG_D (RRC, "[eNB %d] State = Attached (UE %d)\n",
+                             Mod_id, UE_index);
+                    }
+#else
+#ifdef OAI_EMU
+                  oai_emulation.info.oai_ifup[Mod_id] = 1;
+#endif
+#endif
+#endif
+
+                  LOG_D (RRC,
+                         "[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- MAC_CONFIG_REQ  (DRB UE %d) --->][MAC_eNB][MOD %02d][]\n",
+                         frame, Mod_id, UE_index, Mod_id);
+                  if (DRB_configList->list.array[i]->logicalChannelIdentity)
+                    DRB2LCHAN[i] =
+                      (u8) *
+                      DRB_configList->list.array[i]->logicalChannelIdentity;
+                  rrc_mac_config_req (Mod_id, 1, UE_index, 0,
+                                      (RadioResourceConfigCommonSIB_t *) NULL,
+                                      eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index],
+                                      (MeasObjectToAddMod_t **) NULL,
+                                      eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index], 
+                                      DRB2LCHAN[i],
+                                      DRB_configList->list.array[i]->logicalChannelConfig,
+                                      eNB_rrc_inst[Mod_id].measGapConfig[UE_index],
+                                      (TDD_Config_t *) NULL, 
+                                      NULL,
+                                      (u8 *) NULL,
+                                      (u16 *) NULL, NULL, NULL, NULL,
+                                      (MBSFN_SubframeConfigList_t *) NULL
+#ifdef Rel10
+                                      ,
+                                      0,
+                                      (MBSFN_AreaInfoList_r9_t *) NULL,
+                                      (PMCH_InfoList_r9_t *) NULL
+#endif
+#ifdef CBA
+                                      ,
+                                      eNB_rrc_inst[Mod_id].
+                                      num_active_cba_groups,
+                                      eNB_rrc_inst[Mod_id].cba_rnti[0]
+#endif
+                                      );
+
+                }
+              else
+                {               // remove LCHAN from MAC/PHY
 
-  // Configure target eNB DRB
-  DRB_configList2 = CALLOC (1, sizeof (*DRB_configList2));
-  /// DRB
-  DRB_config = CALLOC (1, sizeof (*DRB_config));
+                  if (eNB_rrc_inst[Mod_id].DRB_active[UE_index][i] == 1)
+                    {
+                      // DRB has just been removed so remove RLC + PDCP for DRB
+                      /*      rrc_pdcp_config_req (Mod_id, frame, 1, ACTION_REMOVE,
+                         (UE_index * NB_RB_MAX) + DRB2LCHAN[i],UNDEF_SECURITY_MODE);
+                       */
+                      rrc_rlc_config_req (Mod_id, frame, 1, ACTION_REMOVE,
+                                          (UE_index * NB_RB_MAX) +
+                                          DRB2LCHAN[i], RADIO_ACCESS_BEARER,
+                                          Rlc_info_um);
+                    }
+                  eNB_rrc_inst[Mod_id].DRB_active[UE_index][i] = 0;
+                  LOG_D (RRC,
+                         "[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- MAC_CONFIG_REQ  (DRB UE %d) --->][MAC_eNB][MOD %02d][]\n",
+                         frame, Mod_id, UE_index, Mod_id);
 
-  //DRB_config->drb_Identity = (DRB_Identity_t) 1; //allowed values 1..32
-  // NN: this is the 1st DRB for this ue, so set it to 1
-  DRB_config->drb_Identity = (DRB_Identity_t) 1;        // (UE_index+1); //allowed values 1..32
-  DRB_config->logicalChannelIdentity = CALLOC (1, sizeof (long));
-  *(DRB_config->logicalChannelIdentity) = (long) 3;
-  DRB_rlc_config = CALLOC (1, sizeof (*DRB_rlc_config));
-  DRB_config->rlc_Config = DRB_rlc_config;
-  DRB_rlc_config->present = RLC_Config_PR_um_Bi_Directional;
-  DRB_rlc_config->choice.um_Bi_Directional.ul_UM_RLC.sn_FieldLength =  SN_FieldLength_size10;
-  DRB_rlc_config->choice.um_Bi_Directional.dl_UM_RLC.sn_FieldLength = SN_FieldLength_size10;
-  DRB_rlc_config->choice.um_Bi_Directional.dl_UM_RLC.t_Reordering = T_Reordering_ms5;
+                  rrc_mac_config_req (Mod_id, 1, UE_index, 0,
+                                      (RadioResourceConfigCommonSIB_t *) NULL,
+                                      eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index],
+                                      (MeasObjectToAddMod_t **) NULL,
+                                      eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index], 
+                                      DRB2LCHAN[i],
+                                      (LogicalChannelConfig_t *) NULL,
+                                      (MeasGapConfig_t *) NULL,
+                                      (TDD_Config_t *) NULL, 
+                                      NULL,
+                                      (u8 *) NULL,
+                                      (u16 *) NULL, NULL, NULL, NULL, NULL
+#ifdef Rel10
+                                      ,0,
+                                      (MBSFN_AreaInfoList_r9_t *) NULL,
+                                      (PMCH_InfoList_r9_t *) NULL
+#endif
+#ifdef CBA
+                                      ,0, 
+                                      0
+#endif
+                    );
+                }
+            }
+        }
+    }
+}
 
-  DRB_pdcp_config = CALLOC (1, sizeof (*DRB_pdcp_config));
-  DRB_config->pdcp_Config = DRB_pdcp_config;
-  DRB_pdcp_config->discardTimer = NULL;
-  DRB_pdcp_config->rlc_AM = NULL;
-  PDCP_rlc_UM = CALLOC (1, sizeof (*PDCP_rlc_UM));
-  DRB_pdcp_config->rlc_UM = PDCP_rlc_UM;
-  PDCP_rlc_UM->pdcp_SN_Size = PDCP_Config__rlc_UM__pdcp_SN_Size_len12bits;
-  DRB_pdcp_config->headerCompression.present =  PDCP_Config__headerCompression_PR_notUsed;
+/*------------------------------------------------------------------------------*/
+void rrc_eNB_generate_RRCConnectionSetup (u8 Mod_id, u32 frame, u16 UE_index) {
 
-  DRB_lchan_config = CALLOC (1, sizeof (*DRB_lchan_config));
-  DRB_config->logicalChannelConfig = DRB_lchan_config;
-  DRB_ul_SpecificParameters = CALLOC (1, sizeof (*DRB_ul_SpecificParameters));
-  DRB_lchan_config->ul_SpecificParameters = DRB_ul_SpecificParameters;
+  LogicalChannelConfig_t *SRB1_logicalChannelConfig;    //,*SRB2_logicalChannelConfig;
+  SRB_ToAddModList_t **SRB_configList = &eNB_rrc_inst[Mod_id].SRB_configList[UE_index];
+  SRB_ToAddMod_t *SRB1_config;
+  int cnt;
 
+  eNB_rrc_inst[Mod_id].Srb0.Tx_buffer.payload_size =
+    do_RRCConnectionSetup ((u8 *) eNB_rrc_inst[Mod_id].Srb0.Tx_buffer.Payload,
+                           mac_xface->get_transmission_mode (Mod_id,
+                                                             find_UE_RNTI
+                                                             (Mod_id,
+                                                              UE_index)),
+                           UE_index, 0, mac_xface->lte_frame_parms,
+                           SRB_configList,
+                           &eNB_rrc_inst[Mod_id].
+                           physicalConfigDedicated[UE_index]);
 
-  DRB_ul_SpecificParameters->priority = 2;      // lower priority than srb1, srb2
-  DRB_ul_SpecificParameters->prioritisedBitRate = LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
-  DRB_ul_SpecificParameters->bucketSizeDuration = LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
+  // configure SRB1/SRB2, PhysicalConfigDedicated, MAC_MainConfig for UE
 
-  // LCG for DTCH can take the value from 1 to 3 as defined in 36331: normally controlled by upper layers (like RRM)
-  logicalchannelgroup_drb = CALLOC (1, sizeof (long));
-  *logicalchannelgroup_drb = 1;
-  DRB_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup_drb;
+  if (*SRB_configList != NULL)
+    {
+      for (cnt = 0; cnt < (*SRB_configList)->list.count; cnt++)
+        {
+          if ((*SRB_configList)->list.array[cnt]->srb_Identity == 1)
+          {
+              SRB1_config = (*SRB_configList)->list.array[cnt];
+              if (SRB1_config->logicalChannelConfig)
+                {
+                  if (SRB1_config->logicalChannelConfig->present == SRB_ToAddMod__logicalChannelConfig_PR_explicitValue)
+                    {
+                      SRB1_logicalChannelConfig = &SRB1_config->logicalChannelConfig->choice.explicitValue;
+                    }
+                  else
+                    {
+                      SRB1_logicalChannelConfig = &SRB1_logicalChannelConfig_defaultValue;
+                    }
+                }
+              else
+                {
+                  SRB1_logicalChannelConfig =  &SRB1_logicalChannelConfig_defaultValue;
+                }
 
+              LOG_D (RRC,
+                     "[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- MAC_CONFIG_REQ  (SRB1 UE %d) --->][MAC_eNB][MOD %02d][]\n",
+                     frame, Mod_id, UE_index, Mod_id);
+              rrc_mac_config_req (Mod_id, 1, UE_index, 0,
+                                  (RadioResourceConfigCommonSIB_t *) NULL,
+                                  eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index],
+                                  (MeasObjectToAddMod_t **) NULL,
+                                  eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index], 
+                                  1,
+                                  SRB1_logicalChannelConfig,
+                                  eNB_rrc_inst[Mod_id].measGapConfig[UE_index],
+                                  (TDD_Config_t *) NULL, 
+                                  NULL,
+                                  (u8 *) NULL,
+                                  (u16 *) NULL, NULL, NULL, NULL,
+                                  (MBSFN_SubframeConfigList_t *) NULL
+#ifdef Rel10
+                                  ,0,
+                                  (MBSFN_AreaInfoList_r9_t *) NULL,
+                                  (PMCH_InfoList_r9_t *) NULL
+#endif
+#ifdef CBA
+                                  ,0, 
+                                  0
+#endif
+                );
+              break;
+            }
+        }
+    }
+  LOG_I (RRC,
+         "[eNB %d][RAPROC] Frame %d : Logical Channel DL-CCCH, Generating RRCConnectionSetup (bytes %d, UE %d)\n",
+         Mod_id, frame, eNB_rrc_inst[Mod_id].Srb0.Tx_buffer.payload_size,
+         UE_index);
 
-  ASN_SEQUENCE_ADD (&DRB_configList2->list, DRB_config);
+}
 
-  mac_MainConfig = CALLOC (1, sizeof (*mac_MainConfig));
-  eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index] = mac_MainConfig;
+/*------------------------------------------------------------------------------*/
+char openair_rrc_lite_eNB_init (u8 Mod_id)
+{
+  /*-----------------------------------------------------------------------------*/
 
-  mac_MainConfig->ul_SCH_Config = CALLOC (1, sizeof (*mac_MainConfig->ul_SCH_Config));
+  unsigned char j;
+  LOG_I (RRC, "[eNB %d] Init (UE State = RRC_IDLE)...\n", Mod_id);
+  LOG_D (RRC, "[MSC_NEW][FRAME 00000][RRC_eNB][MOD %02d][]\n", Mod_id);
+  LOG_D (RRC, "[MSC_NEW][FRAME 00000][IP][MOD %02d][]\n", Mod_id);
 
-  maxHARQ_Tx = CALLOC (1, sizeof (long));
-  *maxHARQ_Tx = MAC_MainConfig__ul_SCH_Config__maxHARQ_Tx_n5;
-  mac_MainConfig->ul_SCH_Config->maxHARQ_Tx = maxHARQ_Tx;
+  for (j = 0; j < NUMBER_OF_UE_MAX; j++)
+    eNB_rrc_inst[Mod_id].Info.UE[j].Status = RRC_IDLE;     //CH_READY;
 
-  periodicBSR_Timer = CALLOC (1, sizeof (long));
-  *periodicBSR_Timer = MAC_MainConfig__ul_SCH_Config__periodicBSR_Timer_sf64;
-  mac_MainConfig->ul_SCH_Config->periodicBSR_Timer = periodicBSR_Timer;
+  /* Init security parameters */
+  for (j = 0; j < NUMBER_OF_UE_MAX; j++) {
+    eNB_rrc_inst[Mod_id].ciphering_algorithm[j] = SecurityAlgorithmConfig__cipheringAlgorithm_eea2;
+    eNB_rrc_inst[Mod_id].integrity_algorithm[j] = SecurityAlgorithmConfig__integrityProtAlgorithm_eia2;
+    rrc_lite_eNB_init_security(Mod_id, j);
+  }
 
-  mac_MainConfig->ul_SCH_Config->retxBSR_Timer = MAC_MainConfig__ul_SCH_Config__retxBSR_Timer_sf320;
+#if defined(ENABLE_USE_MME)
+  /* Connect eNB to MME */
+  if (EPC_MODE_ENABLED > 0)
+    {
+# if !defined(ENABLE_ITTI)
+      if (s1ap_eNB_init (EPC_MODE_MME_ADDRESS, Mod_id) < 0)
+        {
+          mac_xface->macphy_exit ("");
+          return -1;
+        }
+# endif
+    }
+#endif
 
-  mac_MainConfig->ul_SCH_Config->ttiBundling = 0;       // FALSE
+  eNB_rrc_inst[Mod_id].Info.Nb_ue = 0;
 
-  mac_MainConfig->drx_Config = NULL;
+  eNB_rrc_inst[Mod_id].Srb0.Active = 0;
 
-  mac_MainConfig->phr_Config = CALLOC (1, sizeof (*mac_MainConfig->phr_Config));
+  for (j = 0; j < (NUMBER_OF_UE_MAX + 1); j++)
+    {
+      eNB_rrc_inst[Mod_id].Srb2[j].Active = 0;
+    }
 
-  mac_MainConfig->phr_Config->present = MAC_MainConfig__phr_Config_PR_setup;
-  mac_MainConfig->phr_Config->choice.setup.periodicPHR_Timer = MAC_MainConfig__phr_Config__setup__periodicPHR_Timer_sf20;       // sf20 = 20 subframes
 
-  mac_MainConfig->phr_Config->choice.setup.prohibitPHR_Timer = MAC_MainConfig__phr_Config__setup__prohibitPHR_Timer_sf20;       // sf20 = 20 subframes
+  /// System Information INIT
 
-  mac_MainConfig->phr_Config->choice.setup.dl_PathlossChange = MAC_MainConfig__phr_Config__setup__dl_PathlossChange_dB1;        // Value dB1 =1 dB, dB3 = 3 dB
 
+  LOG_I (RRC, "Checking release \n");
 #ifdef Rel10
-  sr_ProhibitTimer_r9 = CALLOC (1, sizeof (long));
-  *sr_ProhibitTimer_r9 = 0;     // SR tx on PUCCH, Value in number of SR period(s). Value 0 = no timer for SR, Value 2= 2*SR
-  mac_MainConfig->sr_ProhibitTimer_r9 = sr_ProhibitTimer_r9;
-  //sps_RA_ConfigList_rlola = NULL;
-#endif
-  // Measurement ID list
-  MeasId_list = CALLOC (1, sizeof (*MeasId_list));
-  memset ((void *) MeasId_list, 0, sizeof (*MeasId_list));
 
-  MeasId0 = CALLOC (1, sizeof (*MeasId0));
-  MeasId0->measId = 1;
-  MeasId0->measObjectId = 1;
-  MeasId0->reportConfigId = 1;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId0);
+  // Thishas to come from some top-level configuration
+  printf ("Rel10 RRC detected, MBMS flag %d\n",
+          eNB_rrc_inst[Mod_id].MBMS_flag);
 
-  MeasId1 = CALLOC (1, sizeof (*MeasId1));
-  MeasId1->measId = 2;
-  MeasId1->measObjectId = 1;
-  MeasId1->reportConfigId = 2;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId1);
+#else
+  printf ("Rel8 RRC\n");
+#endif
+#ifdef CBA
+  for (j = 0; j < NUM_MAX_CBA_GROUP; j++)
+    eNB_rrc_inst[Mod_id].cba_rnti[j] = CBA_OFFSET + j;
 
-  MeasId2 = CALLOC (1, sizeof (*MeasId2));
-  MeasId2->measId = 3;
-  MeasId2->measObjectId = 1;
-  MeasId2->reportConfigId = 3;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId2);
+  if (eNB_rrc_inst[Mod_id].num_active_cba_groups > NUM_MAX_CBA_GROUP)
+    eNB_rrc_inst[Mod_id].num_active_cba_groups = NUM_MAX_CBA_GROUP;
 
-  MeasId3 = CALLOC (1, sizeof (*MeasId3));
-  MeasId3->measId = 4;
-  MeasId3->measObjectId = 1;
-  MeasId3->reportConfigId = 4;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId3);
+  LOG_D (RRC,
+         "[eNB %d] Initialization of 4 cba_RNTI values (%x %x %x %x) num active groups %d\n",
+         Mod_id, eNB_rrc_inst[Mod_id].cba_rnti[0],
+         eNB_rrc_inst[Mod_id].cba_rnti[1], eNB_rrc_inst[Mod_id].cba_rnti[2],
+         eNB_rrc_inst[Mod_id].cba_rnti[3],
+         eNB_rrc_inst[Mod_id].num_active_cba_groups);
+#endif
 
-  MeasId4 = CALLOC (1, sizeof (*MeasId4));
-  MeasId4->measId = 5;
-  MeasId4->measObjectId = 1;
-  MeasId4->reportConfigId = 5;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId4);
+  init_SI (Mod_id);
 
-  MeasId5 = CALLOC (1, sizeof (*MeasId5));
-  MeasId5->measId = 6;
-  MeasId5->measObjectId = 1;
-  MeasId5->reportConfigId = 6;
-  ASN_SEQUENCE_ADD (&MeasId_list->list, MeasId5);
+#ifdef Rel10
+  switch (eNB_rrc_inst[Mod_id].MBMS_flag) {
+  case 1:
+  case 2:
+  case 3:
+    LOG_I(RRC,"[eNB %d] Configuring 1 MBSFN sync area\n", Mod_id);
+    eNB_rrc_inst[Mod_id].num_mbsfn_sync_area=1;
+    break;
+  case 4:
+    LOG_I(RRC,"[eNB %d] Configuring 2 MBSFN sync area\n", Mod_id);
+    eNB_rrc_inst[Mod_id].num_mbsfn_sync_area=2;
+    break;
+  default:
+    eNB_rrc_inst[Mod_id].num_mbsfn_sync_area=0;
+    break;
+  }
+  // if we are here the eNB_rrc_inst[Mod_id].MBMS_flag > 0,
+  /// MCCH INIT
+  if (eNB_rrc_inst[Mod_id].MBMS_flag > 0 ) {
+    init_MCCH (Mod_id);
+    /// MTCH data bearer init
+    init_MBMS (Mod_id, 0);
+  }
 
-  //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->measIdToAddModList = MeasId_list;
+#endif
 
-  // Add one EUTRA Measurement Object
-  MeasObj_list = CALLOC (1, sizeof (*MeasObj_list));
-  memset ((void *) MeasObj_list, 0, sizeof (*MeasObj_list));
+#ifdef NO_RRM                   //init ch SRB0, SRB1 & BDTCH
+  openair_rrc_on (Mod_id, 1);
+#else
+  eNB_rrc_inst[Mod_id].Last_scan_req = 0;
+  send_msg (&S_rrc,
+            msg_rrc_phy_synch_to_MR_ind (Mod_id,
+                                         eNB_rrc_inst[Mod_id].Mac_id));
+#endif
 
-  // Configure MeasObject
+  return 0;
 
-  MeasObj = CALLOC (1, sizeof (*MeasObj));
-  memset ((void *) MeasObj, 0, sizeof (*MeasObj));
+}
 
-  MeasObj->measObjectId = 1;
-  MeasObj->measObject.present = MeasObjectToAddMod__measObject_PR_measObjectEUTRA;
-  MeasObj->measObject.choice.measObjectEUTRA.carrierFreq = 36090;
-  MeasObj->measObject.choice.measObjectEUTRA.allowedMeasBandwidth =  AllowedMeasBandwidth_mbw25;
-  MeasObj->measObject.choice.measObjectEUTRA.presenceAntennaPort1 = 1;
-  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.buf = CALLOC (1, sizeof (uint8_t));
-  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.buf[0] = 0;
-  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.size = 1;
-  MeasObj->measObject.choice.measObjectEUTRA.neighCellConfig.bits_unused = 6;
-  MeasObj->measObject.choice.measObjectEUTRA.offsetFreq = NULL; // Default is 15 or 0dB
+/*------------------------------------------------------------------------------*/
+int rrc_eNB_decode_ccch (u8 Mod_id, u32 frame, SRB_INFO * Srb_info)
+{
+  /*------------------------------------------------------------------------------*/
 
-  MeasObj->measObject.choice.measObjectEUTRA.cellsToAddModList = (CellsToAddModList_t *) CALLOC (1, sizeof (*CellsToAddModList));
-  CellsToAddModList = MeasObj->measObject.choice.measObjectEUTRA.cellsToAddModList;
+  u16 Idx, UE_index;
 
-  // Add adjacent cell lists (6 per eNB)
-  for (i = 0; i < 6; i++)   {
-      CellToAdd = (CellsToAddMod_t *) CALLOC (1, sizeof (*CellToAdd));
-      CellToAdd->cellIndex = i + 1;
-      CellToAdd->physCellId = get_adjacent_cell_id (Mod_id, i);
-      CellToAdd->cellIndividualOffset = Q_OffsetRange_dB0;
+  asn_dec_rval_t dec_rval;
+  //UL_CCCH_Message_t ulccchmsg;
+  UL_CCCH_Message_t *ul_ccch_msg = NULL;        //&ulccchmsg;
+  RRCConnectionRequest_r8_IEs_t *rrcConnectionRequest;
+  int i, rval;
 
-      ASN_SEQUENCE_ADD (&CellsToAddModList->list, CellToAdd);
-  }
 
-  ASN_SEQUENCE_ADD (&MeasObj_list->list, MeasObj);
-  //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->measObjectToAddModList = MeasObj_list;
+  //memset(ul_ccch_msg,0,sizeof(UL_CCCH_Message_t));
 
-  // Report Configurations for periodical, A1-A5 events
-  ReportConfig_list = CALLOC (1, sizeof (*ReportConfig_list));
-  memset ((void *) ReportConfig_list, 0, sizeof (*ReportConfig_list));
+  LOG_T (RRC, "[eNB %d] Frame %d: Decoding UL CCCH %x.%x.%x.%x.%x.%x (%p)\n",
+         Mod_id, frame, ((uint8_t *) Srb_info->Rx_buffer.Payload)[0],
+         ((uint8_t *) Srb_info->Rx_buffer.Payload)[1],
+         ((uint8_t *) Srb_info->Rx_buffer.Payload)[2],
+         ((uint8_t *) Srb_info->Rx_buffer.Payload)[3],
+         ((uint8_t *) Srb_info->Rx_buffer.Payload)[4],
+         ((uint8_t *) Srb_info->Rx_buffer.Payload)[5],
+         (uint8_t *) Srb_info->Rx_buffer.Payload);
+  dec_rval =
+    uper_decode (NULL, &asn_DEF_UL_CCCH_Message, (void **) &ul_ccch_msg,
+                 (uint8_t *) Srb_info->Rx_buffer.Payload, 100, 0, 0);
 
-  ReportConfig_per = CALLOC (1, sizeof (*ReportConfig_per));
-  memset ((void *) ReportConfig_per, 0, sizeof (*ReportConfig_per));
+#if defined(ENABLE_ITTI)
+  {
+    MessageDef *message_p;
 
-  ReportConfig_A1 = CALLOC (1, sizeof (*ReportConfig_A1));
-  memset ((void *) ReportConfig_A1, 0, sizeof (*ReportConfig_A1));
+    message_p = itti_alloc_new_message (TASK_RRC_ENB, RRC_UL_CCCH_MESSAGE);
+    memcpy (&message_p->msg, (void *) ul_ccch_msg, sizeof(RrcUlCcchMessage));
 
-  ReportConfig_A2 = CALLOC (1, sizeof (*ReportConfig_A2));
-  memset ((void *) ReportConfig_A2, 0, sizeof (*ReportConfig_A2));
+    itti_send_msg_to_task (TASK_UNKNOWN, Mod_id, message_p);
+  }
+#endif
 
-  ReportConfig_A3 = CALLOC (1, sizeof (*ReportConfig_A3));
-  memset ((void *) ReportConfig_A3, 0, sizeof (*ReportConfig_A3));
+for (i = 0; i < 8; i++)
+    LOG_T (RRC, "%x.", ((u8 *) & ul_ccch_msg)[i]);
+  if (dec_rval.consumed == 0)
+    {
+      LOG_E (RRC, "[eNB %d] FATAL Error in receiving CCCH\n", Mod_id);
+      return -1;                //mac_xface->macphy_exit(""); //exit(-1);
+    }
+  if (ul_ccch_msg->message.present == UL_CCCH_MessageType_PR_c1)
+    {
 
-  ReportConfig_A4 = CALLOC (1, sizeof (*ReportConfig_A4));
-  memset ((void *) ReportConfig_A4, 0, sizeof (*ReportConfig_A4));
+      switch (ul_ccch_msg->message.choice.c1.present)
+        {
 
-  ReportConfig_A5 = CALLOC (1, sizeof (*ReportConfig_A5));
-  memset ((void *) ReportConfig_A5, 0, sizeof (*ReportConfig_A5));
+        case UL_CCCH_MessageType__c1_PR_NOTHING:
+          LOG_I (RRC,
+                 "[eNB %d] Frame %d : Received PR_NOTHING on UL-CCCH-Message\n",
+                 Mod_id, frame);
+          break;
 
-  ReportConfig_per->reportConfigId = 1;
-  ReportConfig_per->reportConfig.present = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerType.present = ReportConfigEUTRA__triggerType_PR_periodical;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerType.choice.periodical.purpose =ReportConfigEUTRA__triggerType__periodical__purpose_reportStrongestCells;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.triggerQuantity = ReportConfigEUTRA__triggerQuantity_rsrp;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportQuantity = ReportConfigEUTRA__reportQuantity_both;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.maxReportCells = 2;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportInterval = ReportInterval_ms120;
-  ReportConfig_per->reportConfig.choice.reportConfigEUTRA.reportAmount = ReportConfigEUTRA__reportAmount_infinity;
+        case UL_CCCH_MessageType__c1_PR_rrcConnectionReestablishmentRequest:
+          LOG_D (RRC,
+                 "[MSC_MSG][FRAME %05d][MAC_eNB][MOD %02d][][--- MAC_DATA_IND (rrcConnectionReestablishmentRequest on SRB0) -->][RRC_eNB][MOD %02d][]\n",
+                 frame, Mod_id, Mod_id);
+          LOG_I (RRC,
+                 "[eNB %d] Frame %d : RRCConnectionReestablishmentRequest not supported yet\n",
+                 Mod_id, frame);
+          break;
 
-  ASN_SEQUENCE_ADD (&ReportConfig_list->list, ReportConfig_per);
+        case UL_CCCH_MessageType__c1_PR_rrcConnectionRequest:
+          LOG_D (RRC,
+                 "[MSC_MSG][FRAME %05d][MAC_eNB][MOD %02d][][--- MAC_DATA_IND  (rrcConnectionRequest on SRB0) -->][RRC_eNB][MOD %02d][]\n",
+                 frame, Mod_id, Mod_id);
 
-  ReportConfig_A1->reportConfigId = 2;
-  ReportConfig_A1->reportConfig.present = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.present = ReportConfigEUTRA__triggerType_PR_event;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA1;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA1.a1_Threshold.present = ThresholdEUTRA_PR_threshold_RSRP;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA1.a1_Threshold.choice.threshold_RSRP = 10;
+          rrcConnectionRequest = &ul_ccch_msg->message.choice.c1.choice.rrcConnectionRequest.criticalExtensions.choice.rrcConnectionRequest_r8;
+          UE_index = rrc_eNB_get_next_free_UE_index (Mod_id,
+                                        (u8 *) rrcConnectionRequest->ue_Identity.
+                                        choice.randomValue.buf);
 
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.triggerQuantity = ReportConfigEUTRA__triggerQuantity_rsrp;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportQuantity = ReportConfigEUTRA__reportQuantity_both;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.maxReportCells = 2;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportInterval = ReportInterval_ms120;
-  ReportConfig_A1->reportConfig.choice.reportConfigEUTRA.reportAmount = ReportConfigEUTRA__reportAmount_infinity;
+          if (UE_index != UE_INDEX_INVALID)
+            {
+#if defined(ENABLE_ITTI)
+              /* Check s-TMSI presence in message */
+              eNB_rrc_inst[Mod_id].Info.UE[UE_index].Initialue_identity_s_TMSI.presence =
+                      (rrcConnectionRequest->ue_Identity.present == InitialUE_Identity_PR_s_TMSI);
+              if (eNB_rrc_inst[Mod_id].Info.UE[UE_index].Initialue_identity_s_TMSI.presence) {
+                /* Save s-TMSI */
+                S_TMSI_t s_TMSI = rrcConnectionRequest->ue_Identity.choice.s_TMSI;
 
-  ASN_SEQUENCE_ADD (&ReportConfig_list->list, ReportConfig_A1);
+                eNB_rrc_inst[Mod_id].Info.UE[UE_index].Initialue_identity_s_TMSI.mme_code = BIT_STRING_to_uint8 (&s_TMSI.mmec);
+                eNB_rrc_inst[Mod_id].Info.UE[UE_index].Initialue_identity_s_TMSI.m_tmsi = BIT_STRING_to_uint32 (&s_TMSI.m_TMSI);
+              }
+              eNB_rrc_inst[Mod_id].Info.UE[UE_index].establishment_cause = rrcConnectionRequest->establishmentCause;
+#endif
 
-  ReportConfig_A2->reportConfigId                                                              = 3;
-  ReportConfig_A2->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.present                    = ReportConfigEUTRA__triggerType_PR_event;
-  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA2;
-  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA2.a2_Threshold.present = ThresholdEUTRA_PR_threshold_RSRP;
-  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA2.a2_Threshold.choice.threshold_RSRP = 10;
-  
-  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
-  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
-  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
-  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
-  ReportConfig_A2->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
-  
-  ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A2);
-  
-  ReportConfig_A3->reportConfigId                                                              = 4;
-  ReportConfig_A3->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.present                     = ReportConfigEUTRA__triggerType_PR_event;
-  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present= ReportConfigEUTRA__triggerType__event__eventId_PR_eventA3;
-  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA3.a3_Offset = 10;
-  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA3.reportOnLeave = 1;
-    
-  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
-  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
-  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
-  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
-  ReportConfig_A3->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
-  
-  ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A3);
-  
-  ReportConfig_A4->reportConfigId                                                              = 5;
-  ReportConfig_A4->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.present                   = ReportConfigEUTRA__triggerType_PR_event;
-  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present= ReportConfigEUTRA__triggerType__event__eventId_PR_eventA4;
-  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA4.a4_Threshold.present = ThresholdEUTRA_PR_threshold_RSRP;
-  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA4.a4_Threshold.choice.threshold_RSRP = 10;
-  
-  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
-  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
-  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
-  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
-  ReportConfig_A4->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
-  
-  ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A4);
-  
-  ReportConfig_A5->reportConfigId                                                              = 6;
-  ReportConfig_A5->reportConfig.present                                                        = ReportConfigToAddMod__reportConfig_PR_reportConfigEUTRA;
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.present                   = ReportConfigEUTRA__triggerType_PR_event;
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.present = ReportConfigEUTRA__triggerType__event__eventId_PR_eventA5;
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold1.present = ThresholdEUTRA_PR_threshold_RSRP;
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold2.present = ThresholdEUTRA_PR_threshold_RSRP;
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold1.choice.threshold_RSRP = 10;
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerType.choice.event.eventId.choice.eventA5.a5_Threshold2.choice.threshold_RSRP = 10;
-  
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.triggerQuantity                       = ReportConfigEUTRA__triggerQuantity_rsrp;
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportQuantity                        = ReportConfigEUTRA__reportQuantity_both;
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.maxReportCells                        = 2;
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportInterval                        = ReportInterval_ms120;
-  ReportConfig_A5->reportConfig.choice.reportConfigEUTRA.reportAmount                          = ReportConfigEUTRA__reportAmount_infinity;
-  
-  ASN_SEQUENCE_ADD(&ReportConfig_list->list,ReportConfig_A5);
-  
-  Sparams = CALLOC(1,sizeof(*Sparams));
-  Sparams->present=MeasConfig__speedStatePars_PR_setup;
-  Sparams->choice.setup.timeToTrigger_SF.sf_High=SpeedStateScaleFactors__sf_Medium_oDot75;
-  Sparams->choice.setup.timeToTrigger_SF.sf_Medium=SpeedStateScaleFactors__sf_High_oDot5;
-  Sparams->choice.setup.mobilityStateParameters.n_CellChangeHigh=10;
-  Sparams->choice.setup.mobilityStateParameters.n_CellChangeMedium=5;
-  Sparams->choice.setup.mobilityStateParameters.t_Evaluation=MobilityStateParameters__t_Evaluation_s60;
-  Sparams->choice.setup.mobilityStateParameters.t_HystNormal=MobilityStateParameters__t_HystNormal_s120;
-  
-  quantityConfig = CALLOC(1,sizeof(*quantityConfig));
-  memset((void *)quantityConfig,0,sizeof(*quantityConfig));
-  quantityConfig->quantityConfigEUTRA = CALLOC(1,sizeof(*quantityConfig->quantityConfigEUTRA));
-  memset((void *)quantityConfig->quantityConfigEUTRA,0,sizeof(*quantityConfig->quantityConfigEUTRA));
-  quantityConfig->quantityConfigCDMA2000 = NULL;
-  quantityConfig->quantityConfigGERAN = NULL;
-  quantityConfig->quantityConfigUTRA = NULL;
-  quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP = CALLOC(1,sizeof(*quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP));
-  quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = CALLOC(1,sizeof(*quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ));
-  *quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP = FilterCoefficient_fc4;
-  *quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = FilterCoefficient_fc4;
+              //      memcpy(&Rrc_xface->UE_id[Mod_id][UE_index],(u8 *)rrcConnectionRequest->ue_Identity.choice.randomValue.buf,5);
+              memcpy (&eNB_rrc_inst[Mod_id].Info.UE_list[UE_index],
+                      (u8 *) rrcConnectionRequest->ue_Identity.choice.randomValue.buf, 5);
 
+              LOG_I (RRC,
+                     "[eNB %d] Frame %d : Accept new connection from UE %d (%x%x%x%x%x)\n",
+                     Mod_id, frame, UE_index,
+                     eNB_rrc_inst[Mod_id].Info.UE_list[UE_index][0],
+                     eNB_rrc_inst[Mod_id].Info.UE_list[UE_index][1],
+                     eNB_rrc_inst[Mod_id].Info.UE_list[UE_index][2],
+                     eNB_rrc_inst[Mod_id].Info.UE_list[UE_index][3],
+                     eNB_rrc_inst[Mod_id].Info.UE_list[UE_index][4]);
 
-  /* mobilityinfo  */
+              //CONFIG SRB2  (DCCHs, ONE per User)  //meas && lchan Cfg
+              //eNB_rrc_inst[Mod_id].Info.Dtch_bd_config[UE_index].Status=NEED_RADIO_CONFIG;
+              //eNB_rrc_inst[Mod_id].Info.Dtch_bd_config[UE_index].Next_eNBeck_frame=Rrc_xface->Frame_index+1;
+              eNB_rrc_inst[Mod_id].Info.Nb_ue++;
 
-  mobilityInfo = CALLOC(1,sizeof(*mobilityInfo));
-  memset((void *)mobilityInfo,0,sizeof(*mobilityInfo));
-  mobilityInfo->targetPhysCellId = (PhysCellId_t) two_tier_hexagonal_cellIds[rrc_inst->handover_info[UE_index]->modid_t];
-  LOG_D(RRC,"[eNB %d] Frame %d: handover preparation: targetPhysCellId: %d mod_id: %d UE_index: %d \n",
-	Mod_id,frame, mobilityInfo->targetPhysCellId,Mod_id,UE_index);
+#ifndef NO_RRM
+              send_msg (&S_rrc, msg_rrc_MR_attach_ind (Mod_id, Mac_id));
+#else
 
-  mobilityInfo->additionalSpectrumEmission = CALLOC(1,sizeof(*mobilityInfo->additionalSpectrumEmission));
-  *mobilityInfo->additionalSpectrumEmission = 1; //Check this value!
-  
-  mobilityInfo->t304 = MobilityControlInfo__t304_ms50; // need to configure an appropriate value here
-  
-  // New UE Identity (C-RNTI) to identify an UE uniquely in a cell
-  mobilityInfo->newUE_Identity.size = 2;
-  mobilityInfo->newUE_Identity.bits_unused = 0;
-  mobilityInfo->newUE_Identity.buf = rv;
-  mobilityInfo->newUE_Identity.buf[0] = rv[0];
-  mobilityInfo->newUE_Identity.buf[1] = rv[1];
-  
-  //memset((void *)&mobilityInfo->radioResourceConfigCommon,(void *)&rrc_inst->sib2->radioResourceConfigCommon,sizeof(RadioResourceConfigCommon_t));
-  //memset((void *)&mobilityInfo->radioResourceConfigCommon,0,sizeof(RadioResourceConfigCommon_t));
+              Idx = (UE_index * NB_RB_MAX) + DCCH;
+              // SRB1
+              eNB_rrc_inst[Mod_id].Srb1[UE_index].Active = 1;
+              eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.Srb_id = Idx;
+              memcpy (&eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.
+                      Lchan_desc[0], &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
+              memcpy (&eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.
+                      Lchan_desc[1], &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
 
-  // Configuring radioResourceConfigCommon
-  mobilityInfo->radioResourceConfigCommon.rach_ConfigCommon = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.rach_ConfigCommon));
-  memcpy((void *)mobilityInfo->radioResourceConfigCommon.rach_ConfigCommon, 
-	 (void *)&rrc_inst->sib2->radioResourceConfigCommon.rach_ConfigCommon,
-	 sizeof(RACH_ConfigCommon_t));
-  mobilityInfo->radioResourceConfigCommon.prach_Config.prach_ConfigInfo = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.prach_Config.prach_ConfigInfo));
-  memcpy((void *)mobilityInfo->radioResourceConfigCommon.prach_Config.prach_ConfigInfo, 
-	 (void *)&rrc_inst->sib2->radioResourceConfigCommon.prach_Config.prach_ConfigInfo,
-	 sizeof(PRACH_ConfigInfo_t));
-  
-  mobilityInfo->radioResourceConfigCommon.prach_Config.rootSequenceIndex = rrc_inst->sib2->radioResourceConfigCommon.prach_Config.rootSequenceIndex;
-  mobilityInfo->radioResourceConfigCommon.pdsch_ConfigCommon = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.pdsch_ConfigCommon));
-  memcpy((void *)mobilityInfo->radioResourceConfigCommon.pdsch_ConfigCommon, 
-	 (void *)&rrc_inst->sib2->radioResourceConfigCommon.pdsch_ConfigCommon,
-	 sizeof(PDSCH_ConfigCommon_t));
-  memcpy((void *)&mobilityInfo->radioResourceConfigCommon.pusch_ConfigCommon,
-	 (void *)&rrc_inst->sib2->radioResourceConfigCommon.pusch_ConfigCommon,
-	 sizeof(PUSCH_ConfigCommon_t));
-  mobilityInfo->radioResourceConfigCommon.phich_Config = NULL;
-  mobilityInfo->radioResourceConfigCommon.pucch_ConfigCommon = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.pucch_ConfigCommon));
-  memcpy((void *)mobilityInfo->radioResourceConfigCommon.pucch_ConfigCommon, 
-	 (void *)&rrc_inst->sib2->radioResourceConfigCommon.pucch_ConfigCommon,
-	 sizeof(PUCCH_ConfigCommon_t));
-  mobilityInfo->radioResourceConfigCommon.soundingRS_UL_ConfigCommon = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.soundingRS_UL_ConfigCommon));
-  memcpy((void *)mobilityInfo->radioResourceConfigCommon.soundingRS_UL_ConfigCommon, 
-	 (void *)&rrc_inst->sib2->radioResourceConfigCommon.soundingRS_UL_ConfigCommon,
-	 sizeof(SoundingRS_UL_ConfigCommon_t));
-  mobilityInfo->radioResourceConfigCommon.uplinkPowerControlCommon = CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.uplinkPowerControlCommon));
-  memcpy((void *)mobilityInfo->radioResourceConfigCommon.uplinkPowerControlCommon, 
-	 (void *)&rrc_inst->sib2->radioResourceConfigCommon.uplinkPowerControlCommon,
-	 sizeof(UplinkPowerControlCommon_t));
-  mobilityInfo->radioResourceConfigCommon.antennaInfoCommon = NULL;
-  mobilityInfo->radioResourceConfigCommon.p_Max = NULL; // CALLOC(1,sizeof(*mobilityInfo->radioResourceConfigCommon.p_Max));
-  //memcpy((void *)mobilityInfo->radioResourceConfigCommon.p_Max,(void *)rrc_inst->sib1->p_Max,sizeof(P_Max_t));
-  mobilityInfo->radioResourceConfigCommon.tdd_Config = NULL; //CALLOC(1,sizeof(TDD_Config_t));
-  //memcpy((void *)mobilityInfo->radioResourceConfigCommon.tdd_Config,(void *)rrc_inst->sib1->tdd_Config,sizeof(TDD_Config_t));
-  mobilityInfo->radioResourceConfigCommon.ul_CyclicPrefixLength = rrc_inst->sib2->radioResourceConfigCommon.ul_CyclicPrefixLength;
-  //End of configuration of radioResourceConfigCommon
+              // SRB2
+              eNB_rrc_inst[Mod_id].Srb2[UE_index].Active = 1;
+              eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.Srb_id = Idx;
+              memcpy (&eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.
+                      Lchan_desc[0], &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
+              memcpy (&eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.
+                      Lchan_desc[1], &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
 
-  mobilityInfo->carrierFreq = CALLOC(1,sizeof(*mobilityInfo->carrierFreq)); //CALLOC(1,sizeof(CarrierFreqEUTRA_t)); 36090
-  mobilityInfo->carrierFreq->dl_CarrierFreq = 36090;
-  mobilityInfo->carrierFreq->ul_CarrierFreq = NULL;
-  
-  mobilityInfo->carrierBandwidth = CALLOC(1,sizeof(*mobilityInfo->carrierBandwidth)); //CALLOC(1,sizeof(struct CarrierBandwidthEUTRA));  AllowedMeasBandwidth_mbw25
-  mobilityInfo->carrierBandwidth->dl_Bandwidth = CarrierBandwidthEUTRA__dl_Bandwidth_n25;
-  mobilityInfo->carrierBandwidth->ul_Bandwidth = NULL;
-  mobilityInfo->rach_ConfigDedicated = NULL;
-  
+              rrc_eNB_generate_RRCConnectionSetup (Mod_id, frame, UE_index);
+              //LOG_D(RRC, "[MSC_NBOX][FRAME %05d][RRC_eNB][MOD %02d][][Tx RRCConnectionSetup][RRC_eNB][MOD %02d][]\n",
+              //      frame, Mod_id, Mod_id);
 
-  // store the srb and drb list for ho management, mainly in case of failure
-  
-  memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.srb_ToAddModList,
-	 (void *)SRB_configList2,
-	 sizeof(SRB_ToAddModList_t));
-  memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.drb_ToAddModList,
-	 (void *)DRB_configList2,
-	 sizeof(DRB_ToAddModList_t));
-    rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.drb_ToReleaseList = NULL;
-    memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.mac_MainConfig,
-	   (void *)mac_MainConfig,
-	   sizeof(MAC_MainConfig_t));
-    memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.physicalConfigDedicated,
-	   (void *)rrc_inst->physicalConfigDedicated[UE_index],
-	   sizeof(PhysicalConfigDedicated_t));
-    /*    memcpy((void *)rrc_inst->handover_info[UE_index]->as_config.sourceRadioResourceConfig.sps_Config,
-	   (void *)rrc_inst->sps_Config[UE_index],
-	   sizeof(SPS_Config_t));
-    */
-    LOG_I(RRC,"[eNB %d] Frame %d: adding new UE\n");
-    Idx = (UE_index * NB_RB_MAX) + DCCH;
-    // SRB1
-    eNB_rrc_inst[Mod_id].Srb1[UE_index].Active = 1;
-    eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.Srb_id = Idx;
-    memcpy (&eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.Lchan_desc[0], 
-	    &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
-    memcpy (&eNB_rrc_inst[Mod_id].Srb1[UE_index].Srb_info.Lchan_desc[1], 
-	    &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
-    
-    // SRB2
-    eNB_rrc_inst[Mod_id].Srb2[UE_index].Active = 1;
-    eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.Srb_id = Idx;
-    memcpy (&eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.Lchan_desc[0], 
-	    &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
-    memcpy (&eNB_rrc_inst[Mod_id].Srb2[UE_index].Srb_info.Lchan_desc[1], 
-	    &DCCH_LCHAN_DESC, LCHAN_DESC_SIZE);
-    
-    LOG_I (RRC,"[eNB %d] CALLING RLC CONFIG SRB1 (rbid %d) for UE %d\n",Mod_id, Idx, UE_index);
-    
-    //      rrc_pdcp_config_req (Mod_id, frame, 1, ACTION_ADD, idx, UNDEF_SECURITY_MODE);
-    //      rrc_rlc_config_req(Mod_id,frame,1,ACTION_ADD,Idx,SIGNALLING_RADIO_BEARER,Rlc_info_am_config);
-    
-    rrc_pdcp_config_asn1_req (Mod_id, frame, 1, UE_index,
-			      eNB_rrc_inst[Mod_id].SRB_configList[UE_index],
-			      (DRB_ToAddModList_t *) NULL,
-			      (DRB_ToReleaseList_t *) NULL,
-			      0xff,
-			      NULL,
-			      NULL,
-			      NULL
-#ifdef Rel10
-			      , (PMCH_InfoList_r9_t *) NULL
-#endif
-			      );
-    
-    rrc_rlc_config_asn1_req (Mod_id, frame, 1, UE_index,
-			     eNB_rrc_inst[Mod_id].SRB_configList[UE_index],
-			     (DRB_ToAddModList_t *) NULL,
-			     (DRB_ToReleaseList_t *) NULL
-#ifdef Rel10
-			     , (PMCH_InfoList_r9_t *) NULL
-#endif
-			     );
-    
-    
-  //  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.measConfig->reportConfigToAddModList = ReportConfig_list;
-    memset (buffer, 0, RRC_BUF_SIZE);
+              //LOG_D(RRC,"[eNB %d] RLC AM allocation index@0 is %d\n",Mod_id,rlc[Mod_id].m_rlc_am_array[0].allocation);
+              //LOG_D(RRC,"[eNB %d] RLC AM allocation index@1 is %d\n",Mod_id,rlc[Mod_id].m_rlc_am_array[1].allocation);
+              LOG_I (RRC,"[eNB %d] CALLING RLC CONFIG SRB1 (rbid %d) for UE %d\n",Mod_id, Idx, UE_index);
 
-    size = do_RRCConnectionReconfiguration (Mod_id, buffer, UE_index, rrc_eNB_get_next_transaction_identifier(Mod_id),  //Transaction_id,
-                                          SRB_configList2, DRB_configList2, NULL,       // DRB2_list,
-                                          NULL, //*sps_Config,
-                                          physicalConfigDedicated[UE_index], MeasObj_list, ReportConfig_list,
-					  NULL, //quantityConfig,
-                                          MeasId_list, mac_MainConfig, NULL, mobilityInfo,Sparams,
-					  NULL, NULL, nas_pdu, nas_length);   
+              //      rrc_pdcp_config_req (Mod_id, frame, 1, ACTION_ADD, idx, UNDEF_SECURITY_MODE);
 
-    LOG_I (RRC,"[eNB %d] Frame %d, Logical Channel DL-DCCH, Generate RRCConnectionReconfiguration for handover (bytes %d, UE id %d)\n",
-         Mod_id, frame, size, UE_index);
-  // to be updated if needed
-  /*if (eNB_rrc_inst[Mod_id].SRB1_config[UE_index]->logicalChannelConfig) {
-    if (eNB_rrc_inst[Mod_id].SRB1_config[UE_index]->logicalChannelConfig->present == SRB_ToAddMod__logicalChannelConfig_PR_explicitValue) {
-      SRB1_logicalChannelConfig = &eNB_rrc_inst[Mod_id].SRB1_config[UE_index]->logicalChannelConfig->choice.explicitValue;
-    }
-    else {
-      SRB1_logicalChannelConfig = &SRB1_logicalChannelConfig_defaultValue;
-    }
-  }
-  else {
-    SRB1_logicalChannelConfig = &SRB1_logicalChannelConfig_defaultValue;
-  }
-  */
+              //      rrc_rlc_config_req(Mod_id,frame,1,ACTION_ADD,Idx,SIGNALLING_RADIO_BEARER,Rlc_info_am_config);
 
-  LOG_D (RRC,"[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration_handover to UE %d MUI %d) --->][PDCP][MOD %02d][RB %02d]\n",
-	 frame, Mod_id, size, UE_index, rrc_eNB_mui, Mod_id,
-         (UE_index * NB_RB_MAX) + DCCH);
-  
-  //rrc_rlc_data_req(Mod_id,frame, 1,(UE_index*NB_RB_MAX)+DCCH,rrc_eNB_mui++,0,size,(char*)buffer);
-  //pdcp_data_req (Mod_id, frame, 1, (UE_index * NB_RB_MAX) + DCCH,rrc_eNB_mui++, 0, size, (char *) buffer, 1);
-   rrc_mac_config_req (Mod_id, 1, UE_index, 0,
-		      (RadioResourceConfigCommonSIB_t *) NULL,
-		      eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index],
-		      (MeasObjectToAddMod_t **) NULL,
-		      eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index], 
-		      1, 
-		      SRB1_logicalChannelConfig,
-		      eNB_rrc_inst[Mod_id].measGapConfig[UE_index],
-		      (TDD_Config_t *) NULL, 
-		      (MobilityControlInfo_t *)mobilityInfo,
-		      (u8 *) NULL,(u16 *) NULL, NULL, NULL, NULL,
-		      (MBSFN_SubframeConfigList_t *) NULL
+              rrc_pdcp_config_asn1_req (Mod_id, frame, 1, UE_index,
+                                        eNB_rrc_inst[Mod_id].
+                                        SRB_configList[UE_index],
+                                        (DRB_ToAddModList_t *) NULL,
+                                        (DRB_ToReleaseList_t *) NULL,
+                                        0xff,
+                                        NULL,
+                                        NULL,
+                                        NULL
 #ifdef Rel10
-		      ,
-		      0,
-		      (MBSFN_AreaInfoList_r9_t *) NULL,
-		      (PMCH_InfoList_r9_t *) NULL
-#endif
-#ifdef CBA
-		       ,
-		       0,
-		       0,
+                                        , (PMCH_InfoList_r9_t *) NULL
 #endif
-		      );
- 
+                );
 
-  /*
-  handoverCommand.criticalExtensions.present = HandoverCommand__criticalExtensions_PR_c1;
-  handoverCommand.criticalExtensions.choice.c1.present = HandoverCommand__criticalExtensions__c1_PR_handoverCommand_r8;
-  handoverCommand.criticalExtensions.choice.c1.choice.handoverCommand_r8.handoverCommandMessage.buf = buffer;
-  handoverCommand.criticalExtensions.choice.c1.choice.handoverCommand_r8.handoverCommandMessage.size = size;
-  */
+              rrc_rlc_config_asn1_req (Mod_id, frame, 1, UE_index,
+                                       eNB_rrc_inst[Mod_id].
+                                       SRB_configList[UE_index],
+                                       (DRB_ToAddModList_t *) NULL,
+                                       (DRB_ToReleaseList_t *) NULL
+#ifdef Rel10
+                                       , (PMCH_InfoList_r9_t *) NULL
+#endif
+                );
+              //LOG_D(RRC,"[eNB %d] RLC AM allocation index@0 is %d\n",Mod_id,rlc[Mod_id].m_rlc_am_array[0].allocation);
+              //LOG_D(RRC,"[eNB %d] RLC AM allocation index@1 is %d\n",Mod_id,rlc[Mod_id].m_rlc_am_array[1].allocation);
 
-  if (sourceModId != 0xFF) {
-    memcpy(eNB_rrc_inst[sourceModId].handover_info[eNB_rrc_inst[Mod_id].handover_info[UE_index]->ueid_s]->buf,
-	   (void *)buffer,
-	   size);
-    eNB_rrc_inst[sourceModId].handover_info[eNB_rrc_inst[Mod_id].handover_info[UE_index]->ueid_s]->size = size;
-    eNB_rrc_inst[sourceModId].handover_info[eNB_rrc_inst[Mod_id].handover_info[UE_index]->ueid_s]->ho_complete = 0xF1;
-    //eNB_rrc_inst[Mod_id].handover_info[UE_index]->ho_complete = 0xFF;
-    LOG_D(RRC,"[eNB %d] Frame %d: setting handover complete to 0xF1 for (%d,%d) and to 0xFF for (%d,%d)\n", 
-	  Mod_id, frame,
-	  sourceModId,eNB_rrc_inst[Mod_id].handover_info[UE_index]->ueid_s,
-	  Mod_id, UE_index);
-  }
-  else
-    LOG_W(RRC,"[eNB %d] Frame %d: rrc_eNB_generate_RRCConnectionReconfiguration_handover: Could not find source eNB mod_id.\n", 
-	  Mod_id, frame);
+              /*
 
+                 LOG_D(RRC,"[eNB %d] CALLING RLC CONFIG SRB2 (rbid %d) for UE %d\n",
+                 Mod_id,Idx+1,UE_index);
+                 Mac_rlc_xface->rrc_rlc_config_req(Mod_id,ACTION_ADD,Idx+1,SIGNALLING_RADIO_BEARER,Rlc_info_am_config);
+                 LOG_D(RRC,"[eNB %d] RLC AM allocation index@0 is %d\n",Mod_id,rlc[Mod_id].m_rlc_am_array[0].allocation);
+                 LOG_D(RRC,"[eNB %d] RLC AM allocation index@1 is %d\n",rlc[Mod_id].m_rlc_am_array[1].allocation);
+               */
+#endif //NO_RRM
+            }
+          else
+            {
+              LOG_E (RRC, "can't add UE, max user count reached!\n");
+            }
+          break;
 
+        default:
+          LOG_E (RRC, "[eNB %d] Frame %d : Unknown message\n", Mod_id, frame);
+          rval = -1;
+          break;
+        }
+      rval = 0;
+    }
+  else
+    {
+      LOG_E (RRC, "[eNB %d] Frame %d : Unknown error \n", Mod_id, frame);
+      rval = -1;
+    }
+  return rval;
 }
 
-void rrc_eNB_process_RRCConnectionReconfigurationComplete (u8 Mod_id, u32 frame,
-                                                      u8 UE_index,
-                                                      RRCConnectionReconfigurationComplete_r8_IEs_t *rrcConnectionReconfigurationComplete)
+/*------------------------------------------------------------------------------*/
+int rrc_eNB_decode_dcch (u8 Mod_id, u32 frame, u8 Srb_id, u8 UE_index,
+                     u8 * Rx_sdu, u8 sdu_size)
 {
+  /*------------------------------------------------------------------------------*/
+
+  asn_dec_rval_t dec_rval;
+  //UL_DCCH_Message_t uldcchmsg;
+  UL_DCCH_Message_t *ul_dcch_msg = NULL;        //&uldcchmsg;
+  UE_EUTRA_Capability_t *UE_EUTRA_Capability = NULL;
+
   int i;
-#ifdef NAS_NETLINK
-  int oip_ifup = 0;
-  int dest_ip_offset = 0;
-#endif
 
-  uint8_t *kRRCenc = NULL;
-  uint8_t *kRRCint = NULL;
-  uint8_t *kUPenc  = NULL;
+  if (Srb_id != 1)
+    {
+      LOG_E (RRC,
+             "[eNB %d] Frame %d: Received message on SRB%d, should not have ...\n",
+             Mod_id, frame, Srb_id);
+    }
 
-  DRB_ToAddModList_t *DRB_configList = eNB_rrc_inst[Mod_id].DRB_configList[UE_index];
-  SRB_ToAddModList_t *SRB_configList = eNB_rrc_inst[Mod_id].SRB_configList[UE_index];
+  //memset(ul_dcch_msg,0,sizeof(UL_DCCH_Message_t));
+
+  LOG_D (RRC, "[eNB %d] Frame %d: Decoding UL-DCCH Message\n", Mod_id, frame);
+  dec_rval = uper_decode (NULL,
+                          &asn_DEF_UL_DCCH_Message,
+                          (void **) &ul_dcch_msg, Rx_sdu, sdu_size, 0, 0);
 
-#if defined(ENABLE_SECURITY)
-  /* Derive the keys from kenb */
-  if (DRB_configList != NULL) {
-    derive_key_up_enc(eNB_rrc_inst[Mod_id].ciphering_algorithm[UE_index],
-                      eNB_rrc_inst[Mod_id].kenb[UE_index], &kUPenc);
-  }
+#if defined(ENABLE_ITTI)
+  {
+    MessageDef *message_p;
 
-  derive_key_rrc_enc(eNB_rrc_inst[Mod_id].ciphering_algorithm[UE_index],
-                     eNB_rrc_inst[Mod_id].kenb[UE_index], &kRRCenc);
-  derive_key_rrc_int(eNB_rrc_inst[Mod_id].integrity_algorithm[UE_index],
-                     eNB_rrc_inst[Mod_id].kenb[UE_index], &kRRCint);
-#endif
+    message_p = itti_alloc_new_message (TASK_RRC_ENB, RRC_UL_DCCH_MESSAGE);
+    memcpy (&message_p->msg, (void *) ul_dcch_msg, sizeof(RrcUlDcchMessage));
 
-  // Refresh SRBs/DRBs
-  rrc_pdcp_config_asn1_req (Mod_id, frame, 1, UE_index,
-                            SRB_configList,
-                            DRB_configList, (DRB_ToReleaseList_t *) NULL,
-                            eNB_rrc_inst[Mod_id].ciphering_algorithm[UE_index] |
-                            (eNB_rrc_inst[Mod_id].integrity_algorithm[UE_index] << 4),
-                            kRRCenc,
-                            kRRCint,
-                            kUPenc
-#ifdef Rel10
-                            , (PMCH_InfoList_r9_t *) NULL
-#endif
-    );
-  // Refresh SRBs/DRBs
-  rrc_rlc_config_asn1_req (Mod_id, frame, 1, UE_index,
-                           SRB_configList,
-                           DRB_configList, (DRB_ToReleaseList_t *) NULL
-#ifdef Rel10
-                           , (PMCH_InfoList_r9_t *) NULL
+    itti_send_msg_to_task (TASK_UNKNOWN, Mod_id, message_p);
+  }
 #endif
-    );
 
+  for (i = 0; i < sdu_size; i++)
+    LOG_T (RRC, "%x.", Rx_sdu[i]);
+  LOG_T (RRC, "\n");
 
-  // Loop through DRBs and establish if necessary
+  if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0))
+    {
+      LOG_E (RRC, "[UE %d] Frame %d : Failed to decode UL-DCCH (%d bytes)\n",
+             Mod_id, frame, dec_rval.consumed);
+      return -1;
+    }
 
-  if (DRB_configList != NULL)
+  if (ul_dcch_msg->message.present == UL_DCCH_MessageType_PR_c1)
     {
-      for (i = 0; i < DRB_configList->list.count; i++)
-        {                       // num max DRB (11-3-8)
-          if (DRB_configList->list.array[i])
-            {
-              LOG_I (RRC,
-                     "[eNB %d] Frame  %d : Logical Channel UL-DCCH, Received RRCConnectionReconfigurationComplete from UE %d, reconfiguring DRB %d/LCID %d\n",
-                     Mod_id, frame, UE_index,
-                     (int) DRB_configList->list.array[i]->drb_Identity,
-                     (UE_index * NB_RB_MAX) +
-                     (int) *DRB_configList->list.array[i]->
-                     logicalChannelIdentity);
-              if (eNB_rrc_inst[Mod_id].DRB_active[UE_index][i] == 0)
-                {
-                  /*
-                     rrc_pdcp_config_req (Mod_id, frame, 1, ACTION_ADD,
-                     (UE_index * NB_RB_MAX) + *DRB_configList->list.array[i]->logicalChannelIdentity,UNDEF_SECURITY_MODE);
-                     rrc_rlc_config_req(Mod_id,frame,1,ACTION_ADD,
-                     (UE_index * NB_RB_MAX) + (int)*eNB_rrc_inst[Mod_id].DRB_config[UE_index][i]->logicalChannelIdentity,
-                     RADIO_ACCESS_BEARER,Rlc_info_um);
-                   */
-                  eNB_rrc_inst[Mod_id].DRB_active[UE_index][i] = 1;
 
-                  LOG_D (RRC,
-                         "[eNB %d] Frame %d: Establish RLC UM Bidirectional, DRB %d Active\n",
-                         Mod_id, frame,
-                         (int) DRB_configList->list.array[i]->drb_Identity);
+      switch (ul_dcch_msg->message.choice.c1.present)
+        {
+        case UL_DCCH_MessageType__c1_PR_NOTHING:        /* No components present */
+          break;
 
-#ifdef NAS_NETLINK
-                  // can mean also IPV6 since ether -> ipv6 autoconf
-#if !defined(OAI_NW_DRIVER_TYPE_ETHERNET) && !defined(EXMIMO)
-                  LOG_I (OIP,
-                         "[eNB %d] trying to bring up the OAI interface oai%d\n",
-                         Mod_id, Mod_id);
-                  oip_ifup = nas_config (Mod_id,        // interface index
-                                         Mod_id + 1,    // thrid octet
-                                         Mod_id + 1);   // fourth octet
+        case UL_DCCH_MessageType__c1_PR_csfbParametersRequestCDMA2000:
+          break;
 
-                  if (oip_ifup == 0)
-                    {           // interface is up --> send a config the DRB
-#ifdef OAI_EMU
-                      oai_emulation.info.oai_ifup[Mod_id] = 1;
-                      dest_ip_offset = NB_eNB_INST;
-#else
-                      dest_ip_offset = 8;
-#endif
-                      LOG_I (OIP,
-                             "[eNB %d] Config the oai%d to send/receive pkt on DRB %d to/from the protocol stack\n",
-                             Mod_id, Mod_id,
-                             (UE_index * NB_RB_MAX) +
-                             *DRB_configList->list.array[i]->
-                             logicalChannelIdentity);
-                      rb_conf_ipv4 (0,  //add
-                                    UE_index,   //cx
-                                    Mod_id,     //inst
-                                    (UE_index * NB_RB_MAX) + *DRB_configList->list.array[i]->logicalChannelIdentity, 0, //dscp
-                                    ipv4_address (Mod_id + 1, Mod_id + 1),      //saddr
-                                    ipv4_address (Mod_id + 1, dest_ip_offset + UE_index + 1));  //daddr
+        case UL_DCCH_MessageType__c1_PR_measurementReport:
+          LOG_D (RRC,
+                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND "
+                 "%d bytes (measurementReport) --->][RRC_eNB][MOD %02d][]\n",
+                 frame, Mod_id, DCCH, sdu_size, Mod_id);
+          rrc_eNB_process_MeasurementReport (Mod_id, frame, UE_index,
+                                             &ul_dcch_msg->message.choice.c1.
+                                             choice.measurementReport.
+                                             criticalExtensions.choice.c1.
+                                             choice.measurementReport_r8.
+                                             measResults);
+          break;
 
-                      LOG_D (RRC, "[eNB %d] State = Attached (UE %d)\n",
-                             Mod_id, UE_index);
-                    }
-#else
-#ifdef OAI_EMU
-                  oai_emulation.info.oai_ifup[Mod_id] = 1;
-#endif
-#endif
-#endif
+        case UL_DCCH_MessageType__c1_PR_rrcConnectionReconfigurationComplete:
+          LOG_D (RRC,
+                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
+                 "(RRCConnectionReconfigurationComplete) --->][RRC_eNB][MOD %02d][]\n",
+                 frame, Mod_id, DCCH, sdu_size, Mod_id);
+          if (ul_dcch_msg->message.choice.c1.choice.
+              rrcConnectionReconfigurationComplete.criticalExtensions.
+              present ==
+              RRCConnectionReconfigurationComplete__criticalExtensions_PR_rrcConnectionReconfigurationComplete_r8)
+            {
+              rrc_eNB_process_RRCConnectionReconfigurationComplete (Mod_id,
+                                                                    frame,
+                                                                    UE_index,
+                                                                    &ul_dcch_msg->
+                                                                    message.
+                                                                    choice.c1.
+                                                                    choice.
+                                                                    rrcConnectionReconfigurationComplete.
+                                                                    criticalExtensions.
+                                                                    choice.
+                                                                    rrcConnectionReconfigurationComplete_r8);
+              eNB_rrc_inst[Mod_id].Info.UE[UE_index].Status = RRC_RECONFIGURED;
+              LOG_I (RRC, "[eNB %d] UE %d State = RRC_RECONFIGURED \n",
+                     Mod_id, UE_index);
 
-                  LOG_D (RRC,
-                         "[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- MAC_CONFIG_REQ  (DRB UE %d) --->][MAC_eNB][MOD %02d][]\n",
-                         frame, Mod_id, UE_index, Mod_id);
-                  if (DRB_configList->list.array[i]->logicalChannelIdentity)
-                    DRB2LCHAN[i] =
-                      (u8) *
-                      DRB_configList->list.array[i]->logicalChannelIdentity;
-                  rrc_mac_config_req (Mod_id, 1, UE_index, 0,
-                                      (RadioResourceConfigCommonSIB_t *) NULL,
-                                      eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index],
-                                      (MeasObjectToAddMod_t **) NULL,
-                                      eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index], 
-				      DRB2LCHAN[i],
-                                      DRB_configList->list.array[i]->logicalChannelConfig,
-                                      eNB_rrc_inst[Mod_id].measGapConfig[UE_index],
-                                      (TDD_Config_t *) NULL, 
-				      NULL,
-				      (u8 *) NULL,
-                                      (u16 *) NULL, NULL, NULL, NULL,
-                                      (MBSFN_SubframeConfigList_t *) NULL
-#ifdef Rel10
-                                      ,
-                                      0,
-                                      (MBSFN_AreaInfoList_r9_t *) NULL,
-                                      (PMCH_InfoList_r9_t *) NULL
-#endif
-#ifdef CBA
-                                      ,
-                                      eNB_rrc_inst[Mod_id].
-                                      num_active_cba_groups,
-                                      eNB_rrc_inst[Mod_id].cba_rnti[0]
+#if defined(ENABLE_USE_MME)
+            if (EPC_MODE_ENABLED == 1)
+            {
+# if defined(ENABLE_ITTI)
+              eNB_rrc_inst[Mod_id].Info.UE[UE_index].e_rab[eNB_rrc_inst[Mod_id].Info.UE[UE_index].index_of_e_rabs - 1].status = E_RAB_STATUS_DONE;
+            }
+# endif
 #endif
-				      );
+          }
+
+#if defined(ENABLE_USE_MME)
+          if (EPC_MODE_ENABLED == 1)
+          {
+# if defined(ENABLE_ITTI)
+            eNB_RRC_UE_INFO *UE_info = &eNB_rrc_inst[Mod_id].Info.UE[UE_index];
 
+            /* Process e RAB parameters received from S1AP one by one (the previous one is completed, eventually process the next one) */
+            if  (UE_info->nb_of_e_rabs > 0)
+            {
+                /* Process e RAB configuration from S1AP initial_context_setup_req */
+                rrc_eNB_generate_defaultRRCConnectionReconfiguration (Mod_id, frame,
+                                                                      UE_index,
+                                                                      UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer,
+                                                                      UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.length,
+                                                                      eNB_rrc_inst[Mod_id].HO_flag);
+                /* Free the NAS PDU buffer and invalidate it */
+                if (UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer != NULL)
+                {
+                  free (UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer);
                 }
-              else
-                {               // remove LCHAN from MAC/PHY
+                UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer = NULL;
+                UE_info->nb_of_e_rabs --;
+                UE_info->index_of_e_rabs ++;
+            }
+            else
+            {
+              rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP (Mod_id, UE_index);
+            }
+# endif
+          }
+#endif
+          break;
 
-                  if (eNB_rrc_inst[Mod_id].DRB_active[UE_index][i] == 1)
-                    {
-                      // DRB has just been removed so remove RLC + PDCP for DRB
-                      /*      rrc_pdcp_config_req (Mod_id, frame, 1, ACTION_REMOVE,
-                         (UE_index * NB_RB_MAX) + DRB2LCHAN[i],UNDEF_SECURITY_MODE);
-                       */
-                      rrc_rlc_config_req (Mod_id, frame, 1, ACTION_REMOVE,
-                                          (UE_index * NB_RB_MAX) +
-                                          DRB2LCHAN[i], RADIO_ACCESS_BEARER,
-                                          Rlc_info_um);
-                    }
-                  eNB_rrc_inst[Mod_id].DRB_active[UE_index][i] = 0;
+        case UL_DCCH_MessageType__c1_PR_rrcConnectionReestablishmentComplete:
+          LOG_D (RRC,
+                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
+                 "(rrcConnectionReestablishmentComplete) --->][RRC_eNB][MOD %02d][]\n",
+                 frame, Mod_id, DCCH, sdu_size, Mod_id);
+          break;
+
+        case UL_DCCH_MessageType__c1_PR_rrcConnectionSetupComplete:
+          LOG_D (RRC,
+                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
+                 "(RRCConnectionSetupComplete) --->][RRC_eNB][MOD %02d][]\n",
+                 frame, Mod_id, DCCH, sdu_size, Mod_id);
+
+          if (ul_dcch_msg->message.choice.c1.choice.
+              rrcConnectionSetupComplete.criticalExtensions.present ==
+              RRCConnectionSetupComplete__criticalExtensions_PR_c1)
+            {
+              if (ul_dcch_msg->message.choice.c1.choice.
+                  rrcConnectionSetupComplete.criticalExtensions.choice.c1.
+                  present ==
+                  RRCConnectionSetupComplete__criticalExtensions__c1_PR_rrcConnectionSetupComplete_r8)
+                {
+                  rrc_eNB_process_RRCConnectionSetupComplete (Mod_id, frame,
+                                                              UE_index,
+                                                              &ul_dcch_msg->
+                                                              message.choice.
+                                                              c1.choice.
+                                                              rrcConnectionSetupComplete.
+                                                              criticalExtensions.
+                                                              choice.c1.
+                                                              choice.
+                                                              rrcConnectionSetupComplete_r8);
+                  eNB_rrc_inst[Mod_id].Info.UE[UE_index].Status = RRC_CONNECTED;
+                  LOG_I (RRC, "[eNB %d] UE %d State = RRC_CONNECTED \n",
+                         Mod_id, UE_index);
                   LOG_D (RRC,
-                         "[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- MAC_CONFIG_REQ  (DRB UE %d) --->][MAC_eNB][MOD %02d][]\n",
+                         "[MSC_NBOX][FRAME %05d][RRC_eNB][MOD %02d][][Rx RRCConnectionSetupComplete\n"
+                         "Now CONNECTED with UE %d][RRC_eNB][MOD %02d][]\n",
                          frame, Mod_id, UE_index, Mod_id);
-
-                  rrc_mac_config_req (Mod_id, 1, UE_index, 0,
-                                      (RadioResourceConfigCommonSIB_t *) NULL,
-                                      eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index],
-                                      (MeasObjectToAddMod_t **) NULL,
-                                      eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index], 
-				      DRB2LCHAN[i],
-                                      (LogicalChannelConfig_t *) NULL,
-                                      (MeasGapConfig_t *) NULL,
-                                      (TDD_Config_t *) NULL, 
-				      NULL,
-				      (u8 *) NULL,
-                                      (u16 *) NULL, NULL, NULL, NULL, NULL
-#ifdef Rel10
-                                      ,0,
-                                      (MBSFN_AreaInfoList_r9_t *) NULL,
-                                      (PMCH_InfoList_r9_t *) NULL
-#endif
-#ifdef CBA
-                                      ,0, 
-				      0
-#endif
-                    );
                 }
             }
-        }
-    }
-}
+          break;
 
-void rrc_eNB_generate_RRCConnectionSetup (u8 Mod_id, u32 frame, u16 UE_index) {
+        case UL_DCCH_MessageType__c1_PR_securityModeComplete:
+          LOG_I (RRC,
+                 "[eNB %d] Frame %d received securityModeComplete on UL-DCCH %d from UE %d\n",
+                 Mod_id, frame, DCCH, UE_index);
+          LOG_D (RRC,
+                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
+                 "(securityModeComplete) --->][RRC_eNB][MOD %02d][]\n", frame,
+                 Mod_id, DCCH, sdu_size, Mod_id);
+#ifdef XER_PRINT
+          xer_fprint (stdout, &asn_DEF_UL_DCCH_Message, (void *) ul_dcch_msg);
+#endif
+          // confirm with PDCP about the security mode for DCCH
+          //rrc_pdcp_config_req (Mod_id, frame, 1,ACTION_SET_SECURITY_MODE, (UE_index * NB_RB_MAX) + DCCH, 0x77);
+          // continue the procedure
+          rrc_eNB_generate_UECapabilityEnquiry (Mod_id, frame, UE_index);
+          break;
 
-  LogicalChannelConfig_t *SRB1_logicalChannelConfig;    //,*SRB2_logicalChannelConfig;
-  SRB_ToAddModList_t **SRB_configList = &eNB_rrc_inst[Mod_id].SRB_configList[UE_index];
-  SRB_ToAddMod_t *SRB1_config;
-  int cnt;
+        case UL_DCCH_MessageType__c1_PR_securityModeFailure:
+          LOG_D (RRC,
+                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
+                 "(securityModeFailure) --->][RRC_eNB][MOD %02d][]\n", frame,
+                 Mod_id, DCCH, sdu_size, Mod_id);
+#ifdef XER_PRINT
+          xer_fprint (stdout, &asn_DEF_UL_DCCH_Message, (void *) ul_dcch_msg);
+#endif
+          // cancel the security mode in PDCP
 
-  eNB_rrc_inst[Mod_id].Srb0.Tx_buffer.payload_size =
-    do_RRCConnectionSetup ((u8 *) eNB_rrc_inst[Mod_id].Srb0.Tx_buffer.Payload,
-                           mac_xface->get_transmission_mode (Mod_id,
-                                                             find_UE_RNTI
-                                                             (Mod_id,
-                                                              UE_index)),
-                           UE_index, 0, mac_xface->lte_frame_parms,
-                           SRB_configList,
-                           &eNB_rrc_inst[Mod_id].
-                           physicalConfigDedicated[UE_index]);
+          // followup with the remaining procedure
+          rrc_eNB_generate_UECapabilityEnquiry (Mod_id, frame, UE_index);
+          break;
 
-  // configure SRB1/SRB2, PhysicalConfigDedicated, MAC_MainConfig for UE
+        case UL_DCCH_MessageType__c1_PR_ueCapabilityInformation:
+          LOG_I (RRC,
+                 "[eNB %d] Frame %d received ueCapabilityInformation on UL-DCCH %d from UE %d\n",
+                 Mod_id, frame, DCCH, UE_index);
+          LOG_D (RRC,
+                 "[MSC_MSG][FRAME %05d][RLC][MOD %02d][RB %02d][--- RLC_DATA_IND %d bytes "
+                 "(UECapabilityInformation) --->][RRC_eNB][MOD %02d][]\n",
+                 frame, Mod_id, DCCH, sdu_size, Mod_id);
+#ifdef XER_PRINT
+          xer_fprint (stdout, &asn_DEF_UL_DCCH_Message, (void *) ul_dcch_msg);
+#endif
+          dec_rval = uper_decode (NULL,
+                                  &asn_DEF_UE_EUTRA_Capability,
+                                  (void **) &UE_EUTRA_Capability,
+                                  ul_dcch_msg->message.choice.c1.choice.
+                                  ueCapabilityInformation.criticalExtensions.
+                                  choice.c1.choice.ueCapabilityInformation_r8.
+                                  ue_CapabilityRAT_ContainerList.list.
+                                  array[0]->ueCapabilityRAT_Container.buf,
+                                  ul_dcch_msg->message.choice.c1.choice.
+                                  ueCapabilityInformation.criticalExtensions.
+                                  choice.c1.choice.ueCapabilityInformation_r8.
+                                  ue_CapabilityRAT_ContainerList.list.
+                                  array[0]->ueCapabilityRAT_Container.size, 0,
+                                  0);
+#ifdef XER_PRINT
+          xer_fprint (stdout, &asn_DEF_UE_EUTRA_Capability,
+                      (void *) UE_EUTRA_Capability);
+#endif
 
-  if (*SRB_configList != NULL)
-    {
-      for (cnt = 0; cnt < (*SRB_configList)->list.count; cnt++)
-        {
-          if ((*SRB_configList)->list.array[cnt]->srb_Identity == 1)
+#if defined(ENABLE_USE_MME)
+          if (EPC_MODE_ENABLED == 1)
           {
-              SRB1_config = (*SRB_configList)->list.array[cnt];
-              if (SRB1_config->logicalChannelConfig)
-                {
-                  if (SRB1_config->logicalChannelConfig->present == SRB_ToAddMod__logicalChannelConfig_PR_explicitValue)
-                    {
-                      SRB1_logicalChannelConfig = &SRB1_config->logicalChannelConfig->choice.explicitValue;
-                    }
-                  else
-                    {
-                      SRB1_logicalChannelConfig = &SRB1_logicalChannelConfig_defaultValue;
-                    }
-                }
-              else
+              eNB_RRC_UE_INFO *UE_info = &eNB_rrc_inst[Mod_id].Info.UE[UE_index];
+
+# if defined(ENABLE_ITTI)
+            /* Process e RAB parameters received from S1AP one by one (assuming that only one will be received from real network this should be OK) */
+            if  (UE_info->nb_of_e_rabs > 0)
+            {
+                /* Process the first e RAB configuration from S1AP initial_context_setup_req */
+                rrc_eNB_generate_defaultRRCConnectionReconfiguration (Mod_id, frame,
+                                                                      UE_index,
+                                                                      UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer,
+                                                                      UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.length,
+                                                                      eNB_rrc_inst[Mod_id].HO_flag);
+                /* Free the NAS PDU buffer and invalidate it */
+                if (UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer != NULL)
                 {
-                  SRB1_logicalChannelConfig =  &SRB1_logicalChannelConfig_defaultValue;
+                  free (UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer);
                 }
-
-              LOG_D (RRC,
-                     "[MSC_MSG][FRAME %05d][RRC_eNB][MOD %02d][][--- MAC_CONFIG_REQ  (SRB1 UE %d) --->][MAC_eNB][MOD %02d][]\n",
-                     frame, Mod_id, UE_index, Mod_id);
-              rrc_mac_config_req (Mod_id, 1, UE_index, 0,
-                                  (RadioResourceConfigCommonSIB_t *) NULL,
-                                  eNB_rrc_inst[Mod_id].physicalConfigDedicated[UE_index],
-                                  (MeasObjectToAddMod_t **) NULL,
-                                  eNB_rrc_inst[Mod_id].mac_MainConfig[UE_index], 
-				  1,
-                                  SRB1_logicalChannelConfig,
-                                  eNB_rrc_inst[Mod_id].measGapConfig[UE_index],
-                                  (TDD_Config_t *) NULL, 
-				  NULL,
-				  (u8 *) NULL,
-                                  (u16 *) NULL, NULL, NULL, NULL,
-                                  (MBSFN_SubframeConfigList_t *) NULL
-#ifdef Rel10
-                                  ,0,
-                                  (MBSFN_AreaInfoList_r9_t *) NULL,
-                                  (PMCH_InfoList_r9_t *) NULL
-#endif
-#ifdef CBA
-                                  ,0, 
-				  0
-#endif
-                );
-              break;
+                UE_info->e_rab[UE_info->index_of_e_rabs].param.nas_pdu.buffer = NULL;
+                UE_info->nb_of_e_rabs --;
+                UE_info->index_of_e_rabs ++;
             }
-        }
-    }
-  LOG_I (RRC,
-         "[eNB %d][RAPROC] Frame %d : Logical Channel DL-CCCH, Generating RRCConnectionSetup (bytes %d, UE %d)\n",
-         Mod_id, frame, eNB_rrc_inst[Mod_id].Srb0.Tx_buffer.payload_size,
-         UE_index);
+# endif
+          }
+          else
+#endif
+          {
+            rrc_eNB_generate_defaultRRCConnectionReconfiguration (Mod_id, frame,
+                                                                  UE_index,
+                                                                  NULL, 0, eNB_rrc_inst[Mod_id].HO_flag);
+          }
+          break;
 
-}
+        case UL_DCCH_MessageType__c1_PR_ulHandoverPreparationTransfer:
+          break;
 
-/*
-  void ue_rrc_process_rrcConnectionReconfiguration(u8 Mod_id,u32 frame,
-  RRCConnectionReconfiguration_t *rrcConnectionReconfiguration,
-  u8 CH_index) {
+        case UL_DCCH_MessageType__c1_PR_ulInformationTransfer:
+#if defined(ENABLE_USE_MME)
+          if (EPC_MODE_ENABLED == 1)
+          {
+            rrc_eNB_send_S1AP_UPLINK_NAS(Mod_id, UE_index, ul_dcch_msg);
+          }
+#endif
+          break;
 
-  if (rrcConnectionReconfiguration->criticalExtensions.present == RRCConnectionReconfiguration__criticalExtensions_PR_c1)
-  if (rrcConnectionReconfiguration->criticalExtensions.choice.c1.present == RRCConnectionReconfiguration__criticalExtensions__c1_PR_rrcConnectionReconfiguration_r8) {
+        case UL_DCCH_MessageType__c1_PR_counterCheckResponse:
+          break;
 
-  if (rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.radioResourceConfigDedicated) {
-  rrc_ue_process_radioResourceConfigDedicated(Mod_id,frame,CH_index,
-  rrcConnectionReconfiguration->criticalExtensions.choice.c1.choice.rrcConnectionReconfiguration_r8.radioResourceConfigDedicated);
+#ifdef Rel10
+        case UL_DCCH_MessageType__c1_PR_ueInformationResponse_r9:
+          break;
 
+        case UL_DCCH_MessageType__c1_PR_proximityIndication_r9:
+          break;
 
-  }
+        case UL_DCCH_MessageType__c1_PR_rnReconfigurationComplete_r10:
+          break;
 
-  // check other fields for
-  }
-  }
-*/
-#ifndef USER_MODE
-EXPORT_SYMBOL (Rlc_info_am_config);
+        case UL_DCCH_MessageType__c1_PR_mbmsCountingResponse_r10:
+          break;
+
+        case UL_DCCH_MessageType__c1_PR_interFreqRSTDMeasurementIndication_r10:
+          break;
 #endif
 
+        default:
+          LOG_E (RRC, "[UE %d] Frame %d : Unknown message\n", Mod_id, frame);
+          return -1;
+        }
+      return 0;
+    }
+  else
+    {
+      LOG_E (RRC, "[UE %d] Frame %d : Unknown error\n", Mod_id, frame);
+      return -1;
+    }
+
+}
+
 #if defined(ENABLE_ITTI)
+/*------------------------------------------------------------------------------*/
 void *rrc_enb_task(void *args_p) {
   MessageDef *msg_p;
   const char *msg_name;
@@ -3072,3 +3079,7 @@ void *rrc_enb_task(void *args_p) {
   }
 }
 #endif
+
+#ifndef USER_MODE
+EXPORT_SYMBOL (Rlc_info_am_config);
+#endif
-- 
GitLab