From 9fa4ec6671b3909cc59dcebf1f27070b9d05cd90 Mon Sep 17 00:00:00 2001 From: winckel Date: Wed, 15 Jan 2014 08:56:02 +0000 Subject: [PATCH] Changed ITTI RRC log message names. git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4878 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair2/COMMON/rrc_messages_def.h | 12 +-- openair2/RRC/LITE/MESSAGES/asn1_msg.c | 102 +++++++++++++------------- openair2/RRC/LITE/rrc_UE.c | 30 ++++---- openair2/RRC/LITE/rrc_eNB.c | 14 ++-- 4 files changed, 79 insertions(+), 79 deletions(-) diff --git a/openair2/COMMON/rrc_messages_def.h b/openair2/COMMON/rrc_messages_def.h index b3c0a0330f..852736c4f8 100644 --- a/openair2/COMMON/rrc_messages_def.h +++ b/openair2/COMMON/rrc_messages_def.h @@ -17,15 +17,15 @@ MESSAGE_DEF(RRC_UE_EUTRA_CAPABILITY, MESSAGE_PRIORITY_MED_PLUS, RrcUeEutraCa MESSAGE_DEF(RRC_UL_CCCH_MESSAGE, MESSAGE_PRIORITY_MED_PLUS, RrcUlCcchMessage, rrc_ul_ccch_message) MESSAGE_DEF(RRC_UL_DCCH_MESSAGE, MESSAGE_PRIORITY_MED_PLUS, RrcUlDcchMessage, rrc_ul_dcch_message) #else -MESSAGE_DEF(RRC_DL_BCCH_MESSAGE, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_dl_bcch_message) -MESSAGE_DEF(RRC_DL_CCCH_MESSAGE, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_dl_ccch_message) -MESSAGE_DEF(RRC_DL_DCCH_MESSAGE, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_dl_dcch_message) -MESSAGE_DEF(RRC_DL_MCCH_MESSAGE, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_dl_mcch_message) +MESSAGE_DEF(RRC_DL_BCCH, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_dl_bcch) +MESSAGE_DEF(RRC_DL_CCCH, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_dl_ccch) +MESSAGE_DEF(RRC_DL_DCCH, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_dl_dcch) +MESSAGE_DEF(RRC_DL_MCCH, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_dl_mcch) MESSAGE_DEF(RRC_UE_EUTRA_CAPABILITY, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_ue_eutra_capability) -MESSAGE_DEF(RRC_UL_CCCH_MESSAGE, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_ul_ccch_message) -MESSAGE_DEF(RRC_UL_DCCH_MESSAGE, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_ul_dcch_message) +MESSAGE_DEF(RRC_UL_CCCH, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_ul_ccch) +MESSAGE_DEF(RRC_UL_DCCH, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rrc_ul_dcch) #endif MESSAGE_DEF(RRC_STATE_IND, MESSAGE_PRIORITY_MED, RrcStateInd, rrc_state_ind) diff --git a/openair2/RRC/LITE/MESSAGES/asn1_msg.c b/openair2/RRC/LITE/MESSAGES/asn1_msg.c index 0453d004f0..8edf04e06a 100644 --- a/openair2/RRC/LITE/MESSAGES/asn1_msg.c +++ b/openair2/RRC/LITE/MESSAGES/asn1_msg.c @@ -364,9 +364,9 @@ uint8_t do_MIB(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint32_t frame, { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_bcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_bcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_bcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_bcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -539,9 +539,9 @@ uint8_t do_SIB1(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint8_t *buffer { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_bcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_bcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_bcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_bcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -728,9 +728,9 @@ uint8_t do_SIB2_AT4(uint8_t Mod_id, { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_bcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_bcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_bcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_bcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -1115,9 +1115,9 @@ uint8_t do_SIB23(uint8_t Mod_id, { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_bcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_bcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_bcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_bcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -1203,9 +1203,9 @@ uint8_t do_RRCConnectionRequest(uint8_t Mod_id, uint8_t *buffer,uint8_t *rv) { { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_CCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_ul_ccch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_ul_ccch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_CCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_ul_ccch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_ul_ccch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p); } @@ -1279,9 +1279,9 @@ uint8_t do_RRCConnectionSetupComplete(uint8_t Mod_id, uint8_t *buffer, const uin { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_ul_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_ul_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_ul_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_ul_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p); } @@ -1331,9 +1331,9 @@ uint8_t do_RRCConnectionReconfigurationComplete(uint8_t Mod_id, uint8_t *buffer, { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_ul_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_ul_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_ul_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_ul_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p); } @@ -1619,9 +1619,9 @@ uint8_t do_RRCConnectionSetup(uint8_t Mod_id, { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_CCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_ccch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_ccch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_CCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_ccch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_ccch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -1684,9 +1684,9 @@ uint8_t do_SecurityModeCommand(uint8_t Mod_id, { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -1748,9 +1748,9 @@ uint8_t do_UECapabilityEnquiry(uint8_t Mod_id, { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_CCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_ccch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_ccch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_CCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_ccch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_ccch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -1890,9 +1890,9 @@ uint8_t do_RRCConnectionReconfiguration(uint8_t Mod_id { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -2035,9 +2035,9 @@ uint8_t do_MBSFNAreaConfig(uint8_t Mod_id, { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_MCCH_MESSAGE, message_string_size); - msg_p->ittiMsg.rrc_dl_mcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_mcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_MCCH, message_string_size); + msg_p->ittiMsg.rrc_dl_mcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_mcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -2153,9 +2153,9 @@ uint8_t do_MeasurementReport(uint8_t Mod_id, uint8_t *buffer,int measid,int phy_ { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p); } @@ -2199,9 +2199,9 @@ uint8_t do_DLInformationTransfer(uint8_t Mod_id, uint8_t **buffer, uint8_t trans { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -2335,9 +2335,9 @@ OAI_UECapability_t *fill_ue_capability() { xer_fprint(stdout,&asn_DEF_UE_EUTRA_Capability,(void *)UE_EUTRA_Capability); #endif enc_rval = uper_encode_to_buffer(&asn_DEF_UE_EUTRA_Capability, - (void*)UE_EUTRA_Capability, - &UECapability.sdu[0], - MAX_UE_CAPABILITY_SIZE); + (void*)UE_EUTRA_Capability, + &UECapability.sdu[0], + MAX_UE_CAPABILITY_SIZE); #if defined(ENABLE_ITTI) # if defined(DISABLE_XER_SPRINT) @@ -2574,9 +2574,9 @@ uint8_t do_SIB2_cell(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint8_t *b { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_bcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_bcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_bcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_bcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -3034,9 +3034,9 @@ uint8_t do_RRCConnReconf_defaultCELL(uint8_t Mod_id, { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c index ca77585c1f..380d397b34 100644 --- a/openair2/RRC/LITE/rrc_UE.c +++ b/openair2/RRC/LITE/rrc_UE.c @@ -437,9 +437,9 @@ int rrc_ue_decode_ccch(u8 Mod_id, u32 frame, SRB_INFO *Srb_info, u8 eNB_index){ { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_CCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_ccch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_ccch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_CCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_ccch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_ccch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id + NB_eNB_INST, msg_p); } @@ -1195,9 +1195,9 @@ void rrc_ue_process_securityModeCommand(uint8_t Mod_id,uint32_t frame,SecurityMo { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_ul_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_ul_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_ul_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_ul_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p); } @@ -1277,9 +1277,9 @@ void rrc_ue_process_ueCapabilityEnquiry(uint8_t Mod_id,uint32_t frame,UECapabili { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_ul_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_ul_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_ul_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_ul_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p); } @@ -1561,9 +1561,9 @@ void rrc_ue_decode_dcch(u8 Mod_id,u32 frame,u8 Srb_id, u8 *Buffer,u8 eNB_index) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *)dl_dcch_msg)) > 0) { - msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id + NB_eNB_INST, msg_p); } @@ -1851,9 +1851,9 @@ int decode_BCCH_DLSCH_Message(u8 Mod_id,u32 frame,u8 eNB_index,u8 *Sdu,u8 Sdu_le { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_dl_bcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_dl_bcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_BCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_dl_bcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_dl_bcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id + NB_eNB_INST, msg_p); } diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c index 4292b2163d..2dd369bf4b 100644 --- a/openair2/RRC/LITE/rrc_eNB.c +++ b/openair2/RRC/LITE/rrc_eNB.c @@ -726,8 +726,8 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 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) 3; // LW Forced to 3 // (UE_index+1); //allowed values 1..32 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; @@ -2585,9 +2585,9 @@ int rrc_eNB_decode_ccch (u8 Mod_id, u32 frame, SRB_INFO * Srb_info) { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_UL_CCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_ul_ccch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_ul_ccch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_UL_CCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_ul_ccch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_ul_ccch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); } @@ -2795,9 +2795,9 @@ int rrc_eNB_decode_dcch (u8 Mod_id, u32 frame, u8 Srb_id, u8 UE_index, { MessageDef *msg_p; - msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_UL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText)); - msg_p->ittiMsg.rrc_ul_dcch_message.size = message_string_size; - memcpy(&msg_p->ittiMsg.rrc_ul_dcch_message.text, message_string, message_string_size); + msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_UL_DCCH, message_string_size + sizeof (IttiMsgText)); + msg_p->ittiMsg.rrc_ul_dcch.size = message_string_size; + memcpy(&msg_p->ittiMsg.rrc_ul_dcch.text, message_string, message_string_size); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p); }