Added "eps_BearerIdentity" field set to 5 in...

Added "eps_BearerIdentity" field set to 5 in "rrc_eNB_generate_defaultRRCConnectionReconfiguration()" (was set to this on PFT traces).
Added ITTI log on some ASN1 messages.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4854 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair2/RRC/LITE/MESSAGES/asn1_msg.h

@@ -113,17 +113,17 @@ routine only generates an mo-data establishment cause.
 @param rv 5 byte random string or S-TMSI
 @returns Size of encoded bit stream in bytes*/
 
-uint8_t do_RRCConnectionRequest(uint8_t *buffer,u8 *rv);
+uint8_t do_RRCConnectionRequest(uint8_t Mod_id, uint8_t *buffer,u8 *rv);
 
 /** \brief Generate an RRCConnectionSetupComplete UL-DCCH-Message (UE)
 @param buffer Pointer to PER-encoded ASN.1 description of UL-DCCH-Message PDU
 @returns Size of encoded bit stream in bytes*/
-uint8_t do_RRCConnectionSetupComplete(uint8_t *buffer, const uint8_t Transaction_id, const int dedicatedInfoNASLength, const char *dedicatedInfoNAS);
+uint8_t do_RRCConnectionSetupComplete(uint8_t Mod_id, uint8_t *buffer, const uint8_t Transaction_id, const int dedicatedInfoNASLength, const char *dedicatedInfoNAS);
 
 /** \brief Generate an RRCConnectionReconfigurationComplete UL-DCCH-Message (UE)
 @param buffer Pointer to PER-encoded ASN.1 description of UL-DCCH-Message PDU
 @returns Size of encoded bit stream in bytes*/
-uint8_t do_RRCConnectionReconfigurationComplete(uint8_t *buffer, const uint8_t Transaction_id);
+uint8_t do_RRCConnectionReconfigurationComplete(uint8_t Mod_id, uint8_t *buffer, const uint8_t Transaction_id);
 
 /** 
 \brief Generate an RRCConnectionSetup DL-CCCH-Message (eNB).  This routine configures SRB_ToAddMod (SRB1/SRB2) and 
@@ -135,7 +135,8 @@ PhysicalConfigDedicated IEs.  The latter does not enable periodic CQI reporting
 @param SRB_configList Pointer (returned) to SRB1_config/SRB2_config(later) IEs for this UE
 @param physicalConfigDedicated Pointer (returned) to PhysicalConfigDedicated IE for this UE
 @returns Size of encoded bit stream in bytes*/
-uint8_t do_RRCConnectionSetup(uint8_t *buffer,
+uint8_t do_RRCConnectionSetup(uint8_t Mod_id,
+                              uint8_t *buffer,
                               uint8_t transmission_mode,
                               uint8_t UE_id,
                               uint8_t Transaction_id,
@@ -199,14 +200,15 @@ uint8_t do_MCCHMessage(uint8_t *buffer);
  * @param buffer Pointer to PER-encoded ASN.1 description of MCCH-Message PDU
  * @returns Size of encoded bit stream in bytes
 */
-uint8_t do_MBSFNAreaConfig(LTE_DL_FRAME_PARMS *frame_parms,
+uint8_t do_MBSFNAreaConfig(uint8_t Mod_id,
+                           LTE_DL_FRAME_PARMS *frame_parms,
                            uint8_t sync_area,
                            uint8_t *buffer,
                            MCCH_Message_t *mcch_message,
                            MBSFNAreaConfiguration_r9_t **mbsfnAreaConfiguration);
 #endif 
 
-uint8_t do_MeasurementReport(uint8_t *buffer,int measid,int phy_id,int rsrp_s,int rsrq_s,long rsrp_t,long rsrq_t);
+uint8_t do_MeasurementReport(uint8_t Mod_id, uint8_t *buffer,int measid,int phy_id,int rsrp_s,int rsrq_s,long rsrp_t,long rsrq_t);
 
 uint8_t do_DLInformationTransfer(uint8_t Mod_id, uint8_t **buffer, uint8_t transaction_id, uint32_t pdu_length, uint8_t *pdu_buffer);
 

openair2/RRC/LITE/rrc_UE.c

@@ -297,7 +297,7 @@ void rrc_ue_generate_RRCConnectionRequest(u8 Mod_id, u32 frame, u8 eNB_index){
       LOG_T(RRC,"%x.",rv[i]);
     }
     LOG_T(RRC,"\n");
-    UE_rrc_inst[Mod_id].Srb0[eNB_index].Tx_buffer.payload_size = do_RRCConnectionRequest((u8 *)UE_rrc_inst[Mod_id].Srb0[eNB_index].Tx_buffer.Payload,rv);
+    UE_rrc_inst[Mod_id].Srb0[eNB_index].Tx_buffer.payload_size = do_RRCConnectionRequest(Mod_id, (u8 *)UE_rrc_inst[Mod_id].Srb0[eNB_index].Tx_buffer.Payload,rv);
 
     LOG_I(RRC,"[UE %d] : Frame %d, Logical Channel UL-CCCH (SRB0), Generating RRCConnectionRequest (bytes %d, eNB %d)\n",
       Mod_id, frame, UE_rrc_inst[Mod_id].Srb0[eNB_index].Tx_buffer.payload_size, eNB_index);
@@ -365,7 +365,7 @@ void rrc_ue_generate_RRCConnectionSetupComplete(u8 Mod_id, u32 frame, u8 eNB_ind
   nas_msg_length  = sizeof(nas_attach_req_imsi);
 #endif
 
-  size = do_RRCConnectionSetupComplete(buffer, Transaction_id, nas_msg_length, nas_msg);
+  size = do_RRCConnectionSetupComplete(Mod_id, buffer, Transaction_id, nas_msg_length, nas_msg);
 
   LOG_I(RRC,"[UE %d][RAPROC] Frame %d : Logical Channel UL-DCCH (SRB1), Generating RRCConnectionSetupComplete (bytes%d, eNB %d)\n",
     Mod_id,frame, size, eNB_index);
@@ -381,7 +381,7 @@ void rrc_ue_generate_RRCConnectionReconfigurationComplete(u8 Mod_id, u32 frame,
 
   u8 buffer[32], size;
 
-  size = do_RRCConnectionReconfigurationComplete(buffer, Transaction_id);
+  size = do_RRCConnectionReconfigurationComplete(Mod_id, buffer, Transaction_id);
 
   LOG_I(RRC,"[UE %d] Frame %d : Logical Channel UL-DCCH (SRB1), Generating RRCConnectionReconfigurationComplete (bytes %d, eNB_index %d)\n",
     Mod_id,frame, size, eNB_index);
@@ -1184,6 +1184,25 @@ void rrc_ue_process_securityModeCommand(uint8_t Mod_id,uint32_t frame,SecurityMo
       xer_fprint(stdout, &asn_DEF_UL_DCCH_Message, (void*)&ul_dcch_msg);
 #endif	  
 
+#if defined(ENABLE_ITTI)
+# if !defined(DISABLE_XER_SPRINT)
+      {
+        char        message_string[20000];
+        size_t      message_string_size;
+
+        if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0)
+        {
+          MessageDef *message_p;
+
+          message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size);
+          memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size);
+
+          itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, message_p);
+        }
+      }
+# endif
+#endif
+
 #ifdef USER_MODE
       LOG_D(RRC, "securityModeComplete Encoded %d bits (%d bytes)\n", enc_rval.encoded, (enc_rval.encoded+7)/8);
 #endif
@@ -1246,6 +1265,25 @@ void rrc_ue_process_ueCapabilityEnquiry(uint8_t Mod_id,uint32_t frame,UECapabili
           xer_fprint(stdout, &asn_DEF_UL_DCCH_Message, (void*)&ul_dcch_msg);
 #endif
 
+#if defined(ENABLE_ITTI)
+# if !defined(DISABLE_XER_SPRINT)
+          {
+            char        message_string[20000];
+            size_t      message_string_size;
+
+            if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0)
+            {
+              MessageDef *message_p;
+
+              message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size);
+              memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size);
+
+              itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, message_p);
+            }
+          }
+# endif
+#endif
+
 #ifdef USER_MODE
           LOG_D(RRC,"UECapabilityInformation Encoded %d bits (%d bytes)\n",enc_rval.encoded,(enc_rval.encoded+7)/8);
 #endif
@@ -2397,7 +2435,7 @@ void rrc_ue_generate_MeasurementReport(u8 eNB_id, u8 UE_id, u32 frame) {
 
       if (pframe!=frame){
         pframe=frame;
-        size = do_MeasurementReport(buffer,measId,targetCellId,rsrp_s,rsrq_s,rsrp_t,rsrq_t);
+        size = do_MeasurementReport(UE_id, buffer,measId,targetCellId,rsrp_s,rsrq_s,rsrp_t,rsrq_t);
         LOG_D(RRC, "[UE %d] Frame %d: Sending MeasReport: servingCell(%d) targetCell(%d) rsrp_s(%d) rsrq_s(%d) rsrp_t(%d) rsrq_t(%d) \n",
               UE_id, frame, cellId,targetCellId,rsrp_s,rsrq_s,rsrp_t,rsrq_t);
         LOG_I(RRC, "[UE %d] Frame %d : Generating Measurement Report for eNB %d\n", UE_id, frame, eNB_id);

openair2/RRC/LITE/rrc_eNB.c

@@ -127,10 +127,10 @@ static void init_SI (u8 Mod_id
      int N_RB_DL,phich_resource;
 
 
-     do_MIB(mac_xface->lte_frame_parms,0x321,&mib);
+     do_MIB(Mod_id, mac_xface->lte_frame_parms,0x321,&mib);
 
      for (i=0;i<1024;i+=4)
-     do_MIB(mac_xface->lte_frame_parms,i,&mib);
+     do_MIB(Mod_id, mac_xface->lte_frame_parms,i,&mib);
 
      N_RB_DL=6;
      while (N_RB_DL != 0) {
@@ -140,7 +140,7 @@ static void init_SI (u8 Mod_id
      mac_xface->lte_frame_parms->N_RB_DL = N_RB_DL;
      mac_xface->lte_frame_parms->phich_config_common.phich_duration=i;
      mac_xface->lte_frame_parms->phich_config_common.phich_resource = phich_resource;
-     do_MIB(mac_xface->lte_frame_parms,0,&mib);
+     do_MIB(Mod_id, mac_xface->lte_frame_parms,0,&mib);
      }
      if (phich_resource == 1)
      phich_resource = 3;
@@ -722,6 +722,8 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32
   /// DRB
   DRB_config = CALLOC (1, sizeof (*DRB_config));
 
+  DRB_config->eps_BearerIdentity = CALLOC(1, sizeof(long));
+  *(DRB_config->eps_BearerIdentity) = 5L; // LW set to first value, allowed value 5..15
   //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
@@ -729,6 +731,7 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32
   *(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;
@@ -1065,12 +1068,11 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32
 
   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,
+                                          NULL, // *sps_Config,
                                           physicalConfigDedicated[UE_index], MeasObj_list, ReportConfig_list, 
                                           quantityConfig,
                                           MeasId_list, mac_MainConfig, NULL,NULL,Sparams,rsrp,
                                           cba_RNTI, dedicatedInfoNASList);
-
 #if defined(ENABLE_ITTI)
   /* Free all NAS PDUs */
   for (i = 0; i < UE_info->nb_of_e_rabs; i++)
@@ -1249,7 +1251,7 @@ void check_handovers(u8 Mod_id, u32 frame) {
         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, i, frame, 1,
+        result = pdcp_data_req(Mod_id, i, frame, 1,
                                (i* NB_RB_MAX)+DCCH,
                                rrc_eNB_mui++,0,
                                eNB_rrc_inst[Mod_id].handover_info[i]->size,
@@ -2332,7 +2334,8 @@ void rrc_eNB_generate_RRCConnectionSetup (u8 Mod_id, u32 frame, u16 UE_index) {
   SRB_configList = &eNB_rrc_inst[Mod_id].SRB_configList[UE_index];
 
   eNB_rrc_inst[Mod_id].Srb0.Tx_buffer.payload_size =
-    do_RRCConnectionSetup ((u8 *) eNB_rrc_inst[Mod_id].Srb0.Tx_buffer.Payload,
+    do_RRCConnectionSetup (Mod_id,
+                           (u8 *) eNB_rrc_inst[Mod_id].Srb0.Tx_buffer.Payload,
                            mac_xface->get_transmission_mode (Mod_id,
                                                              find_UE_RNTI
                                                              (Mod_id,