Skip to content

O
OpenXG-RAN
Commit 456f91ba authored by winckel's avatar winckel
Browse files
Options

Replace generic ITTI log messages by dedicated messages in RRC. 

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4876 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 53b7b03d
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 94 deletions
openair2/COMMON/rrc_messages_def.h
View file @ 456f91ba
...@@ -16,6 +16,16 @@ MESSAGE_DEF(RRC_UE_EUTRA_CAPABILITY, MESSAGE_PRIORITY_MED_PLUS, RrcUeEutraCa ...@@ -16,6 +16,16 @@ 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_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) 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_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)
#endif #endif
MESSAGE_DEF(RRC_STATE_IND, MESSAGE_PRIORITY_MED, RrcStateInd, rrc_state_ind) MESSAGE_DEF(RRC_STATE_IND, MESSAGE_PRIORITY_MED, RrcStateInd, rrc_state_ind)
......
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @ 456f91ba
...@@ -362,12 +362,13 @@ uint8_t do_MIB(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint32_t frame, ...@@ -362,12 +362,13 @@ uint8_t do_MIB(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint32_t frame,
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_BCCH_BCH_Message, (void *) &mib)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_BCCH_BCH_Message, (void *) &mib)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -536,12 +537,13 @@ uint8_t do_SIB1(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint8_t *buffer ...@@ -536,12 +537,13 @@ uint8_t do_SIB1(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint8_t *buffer
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_BCCH_DL_SCH_Message, (void *)bcch_message)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_BCCH_DL_SCH_Message, (void *)bcch_message)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -724,12 +726,13 @@ uint8_t do_SIB2_AT4(uint8_t Mod_id, ...@@ -724,12 +726,13 @@ uint8_t do_SIB2_AT4(uint8_t Mod_id,
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_BCCH_DL_SCH_Message, (void *)bcch_message)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_BCCH_DL_SCH_Message, (void *)bcch_message)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -1110,12 +1113,13 @@ uint8_t do_SIB23(uint8_t Mod_id, ...@@ -1110,12 +1113,13 @@ uint8_t do_SIB23(uint8_t Mod_id,
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_BCCH_DL_SCH_Message, (void *)bcch_message)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_BCCH_DL_SCH_Message, (void *)bcch_message)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -1197,12 +1201,13 @@ uint8_t do_RRCConnectionRequest(uint8_t Mod_id, uint8_t *buffer,uint8_t *rv) { ...@@ -1197,12 +1201,13 @@ uint8_t do_RRCConnectionRequest(uint8_t Mod_id, uint8_t *buffer,uint8_t *rv) {
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_CCCH_Message, (void *) &ul_ccch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_CCCH_Message, (void *) &ul_ccch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_CCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -1272,12 +1277,13 @@ uint8_t do_RRCConnectionSetupComplete(uint8_t Mod_id, uint8_t *buffer, const uin ...@@ -1272,12 +1277,13 @@ uint8_t do_RRCConnectionSetupComplete(uint8_t Mod_id, uint8_t *buffer, const uin
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -1323,12 +1329,13 @@ uint8_t do_RRCConnectionReconfigurationComplete(uint8_t Mod_id, uint8_t *buffer, ...@@ -1323,12 +1329,13 @@ uint8_t do_RRCConnectionReconfigurationComplete(uint8_t Mod_id, uint8_t *buffer,
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -1610,12 +1617,13 @@ uint8_t do_RRCConnectionSetup(uint8_t Mod_id, ...@@ -1610,12 +1617,13 @@ uint8_t do_RRCConnectionSetup(uint8_t Mod_id,
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_CCCH_Message, (void *) &dl_ccch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_CCCH_Message, (void *) &dl_ccch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_CCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -1674,12 +1682,13 @@ uint8_t do_SecurityModeCommand(uint8_t Mod_id, ...@@ -1674,12 +1682,13 @@ uint8_t do_SecurityModeCommand(uint8_t Mod_id,
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *) &dl_dcch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *) &dl_dcch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -1737,12 +1746,13 @@ uint8_t do_UECapabilityEnquiry(uint8_t Mod_id, ...@@ -1737,12 +1746,13 @@ uint8_t do_UECapabilityEnquiry(uint8_t Mod_id,
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *) &dl_dcch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *) &dl_dcch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_CCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -1878,12 +1888,13 @@ uint8_t do_RRCConnectionReconfiguration(uint8_t Mod_id ...@@ -1878,12 +1888,13 @@ uint8_t do_RRCConnectionReconfiguration(uint8_t Mod_id
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *) &dl_dcch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *) &dl_dcch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -2022,12 +2033,13 @@ uint8_t do_MBSFNAreaConfig(uint8_t Mod_id, ...@@ -2022,12 +2033,13 @@ uint8_t do_MBSFNAreaConfig(uint8_t Mod_id,
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_MCCH_Message, (void *) &mcch_message)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_MCCH_Message, (void *) &mcch_message)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_MCCH_MESSAGE, message_string_size);
memcpy(&message_p->ittiMsg.generic_log, message_string, 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -2139,12 +2151,13 @@ uint8_t do_MeasurementReport(uint8_t Mod_id, uint8_t *buffer,int measid,int phy_ ...@@ -2139,12 +2151,13 @@ uint8_t do_MeasurementReport(uint8_t Mod_id, uint8_t *buffer,int measid,int phy_
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -2184,12 +2197,13 @@ uint8_t do_DLInformationTransfer(uint8_t Mod_id, uint8_t **buffer, uint8_t trans ...@@ -2184,12 +2197,13 @@ uint8_t do_DLInformationTransfer(uint8_t Mod_id, uint8_t **buffer, uint8_t trans
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *)&dl_dcch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *)&dl_dcch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -2328,12 +2342,12 @@ OAI_UECapability_t *fill_ue_capability() { ...@@ -2328,12 +2342,12 @@ OAI_UECapability_t *fill_ue_capability() {
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
# if defined(DISABLE_XER_SPRINT) # if defined(DISABLE_XER_SPRINT)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message (TASK_RRC_UE, RRC_UE_EUTRA_CAPABILITY); msg_p = itti_alloc_new_message (TASK_RRC_UE, RRC_UE_EUTRA_CAPABILITY);
memcpy (&message_p->ittiMsg, (void *) UE_EUTRA_Capability, sizeof(RrcUeEutraCapability)); memcpy (&msg_p->ittiMsg, (void *) UE_EUTRA_Capability, sizeof(RrcUeEutraCapability));
itti_send_msg_to_task (TASK_UNKNOWN, NB_eNB_INST, message_p); itti_send_msg_to_task (TASK_UNKNOWN, NB_eNB_INST, msg_p);
} }
# else # else
{ {
...@@ -2342,12 +2356,13 @@ OAI_UECapability_t *fill_ue_capability() { ...@@ -2342,12 +2356,13 @@ OAI_UECapability_t *fill_ue_capability() {
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UE_EUTRA_Capability, (void *)UE_EUTRA_Capability)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UE_EUTRA_Capability, (void *)UE_EUTRA_Capability)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UE_EUTRA_CAPABILITY, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); msg_p->ittiMsg.rrc_ue_eutra_capability.size = message_string_size;
memcpy(&msg_p->ittiMsg.rrc_ue_eutra_capability.text, message_string, message_string_size);
itti_send_msg_to_task(TASK_UNKNOWN, INSTANCE_DEFAULT, message_p); itti_send_msg_to_task(TASK_UNKNOWN, INSTANCE_DEFAULT, msg_p);
} }
} }
# endif # endif
...@@ -2557,12 +2572,13 @@ uint8_t do_SIB2_cell(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint8_t *b ...@@ -2557,12 +2572,13 @@ uint8_t do_SIB2_cell(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint8_t *b
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_BCCH_DL_SCH_Message, (void *) &bcch_message)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_BCCH_DL_SCH_Message, (void *) &bcch_message)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -3016,12 +3032,13 @@ uint8_t do_RRCConnReconf_defaultCELL(uint8_t Mod_id, ...@@ -3016,12 +3032,13 @@ uint8_t do_RRCConnReconf_defaultCELL(uint8_t Mod_id,
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *) &dl_dcch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_DL_DCCH_Message, (void *) &dl_dcch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
......
openair2/RRC/LITE/rrc_UE.c
View file @ 456f91ba
...@@ -437,8 +437,9 @@ int rrc_ue_decode_ccch(u8 Mod_id, u32 frame, SRB_INFO *Srb_info, u8 eNB_index){ ...@@ -437,8 +437,9 @@ int rrc_ue_decode_ccch(u8 Mod_id, u32 frame, SRB_INFO *Srb_info, u8 eNB_index){
{ {
MessageDef *msg_p; MessageDef *msg_p;
msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_CCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&msg_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id + NB_eNB_INST, msg_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id + NB_eNB_INST, msg_p);
} }
...@@ -1192,12 +1193,13 @@ void rrc_ue_process_securityModeCommand(uint8_t Mod_id,uint32_t frame,SecurityMo ...@@ -1192,12 +1193,13 @@ void rrc_ue_process_securityModeCommand(uint8_t Mod_id,uint32_t frame,SecurityMo
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -1273,12 +1275,13 @@ void rrc_ue_process_ueCapabilityEnquiry(uint8_t Mod_id,uint32_t frame,UECapabili ...@@ -1273,12 +1275,13 @@ void rrc_ue_process_ueCapabilityEnquiry(uint8_t Mod_id,uint32_t frame,UECapabili
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *) &ul_dcch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_UL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -1558,8 +1561,9 @@ void rrc_ue_decode_dcch(u8 Mod_id,u32 frame,u8 Srb_id, u8 *Buffer,u8 eNB_index) ...@@ -1558,8 +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) 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, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&msg_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id + NB_eNB_INST, msg_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id + NB_eNB_INST, msg_p);
} }
...@@ -1847,8 +1851,9 @@ int decode_BCCH_DLSCH_Message(u8 Mod_id,u32 frame,u8 eNB_index,u8 *Sdu,u8 Sdu_le ...@@ -1847,8 +1851,9 @@ int decode_BCCH_DLSCH_Message(u8 Mod_id,u32 frame,u8 eNB_index,u8 *Sdu,u8 Sdu_le
{ {
MessageDef *msg_p; MessageDef *msg_p;
msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, RRC_DL_BCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&msg_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id + NB_eNB_INST, msg_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id + NB_eNB_INST, msg_p);
} }
......
openair2/RRC/LITE/rrc_eNB.c
View file @ 456f91ba
...@@ -2583,12 +2583,13 @@ int rrc_eNB_decode_ccch (u8 Mod_id, u32 frame, SRB_INFO * Srb_info) ...@@ -2583,12 +2583,13 @@ int rrc_eNB_decode_ccch (u8 Mod_id, u32 frame, SRB_INFO * Srb_info)
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_CCCH_Message, (void *)ul_ccch_msg)) > 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_CCCH_Message, (void *)ul_ccch_msg)) > 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_UL_CCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
...@@ -2792,12 +2793,13 @@ int rrc_eNB_decode_dcch (u8 Mod_id, u32 frame, u8 Srb_id, u8 UE_index, ...@@ -2792,12 +2793,13 @@ int rrc_eNB_decode_dcch (u8 Mod_id, u32 frame, u8 Srb_id, u8 UE_index,
if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *)ul_dcch_msg)) >= 0) if ((message_string_size = xer_sprint(message_string, sizeof(message_string), &asn_DEF_UL_DCCH_Message, (void *)ul_dcch_msg)) >= 0)
{ {
MessageDef *message_p; MessageDef *msg_p;
message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size); msg_p = itti_alloc_new_message_sized (TASK_RRC_ENB, RRC_UL_DCCH_MESSAGE, message_string_size + sizeof (IttiMsgText));
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size); 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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p); itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
} }
} }
# endif # endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment