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
Expand all 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
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_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
MESSAGE_DEF(RRC_STATE_IND, MESSAGE_PRIORITY_MED, RrcStateInd, rrc_state_ind)
......
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @ 456f91ba
This diff is collapsed.
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){
{
MessageDef *msg_p;
msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size);
memcpy(&msg_p->ittiMsg.generic_log, message_string, message_string_size);
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);
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
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);
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size);
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);
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
......@@ -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)
{
MessageDef *message_p;
MessageDef *msg_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);
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);
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
......@@ -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)
{
msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size);
memcpy(&msg_p->ittiMsg.generic_log, message_string, message_string_size);
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);
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
{
MessageDef *msg_p;
msg_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size);
memcpy(&msg_p->ittiMsg.generic_log, message_string, message_string_size);
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);
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)
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);
memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size);
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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
}
}
# endif
......@@ -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)
{
MessageDef *message_p;
MessageDef *msg_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);
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);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p);
itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, msg_p);
}
}
# 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