Commit 0feda7fd authored by Cedric Roux's avatar Cedric Roux
Browse files

add some RRC logs

- adding T macros here and there
- modify the T_messages.txt
- modify enb.c to trace them in the RRC view
parent 2138a47e
...@@ -45,6 +45,54 @@ ID = ENB_RRC_CONNECTION_SETUP_COMPLETE ...@@ -45,6 +45,54 @@ ID = ENB_RRC_CONNECTION_SETUP_COMPLETE
DESC = RRC connection setup complete DESC = RRC connection setup complete
GROUP = ALL:RRC:ENB GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_SECURITY_MODE_COMMAND
DESC = RRC security mode command
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_UE_CAPABILITY_ENQUIRY
DESC = RRC UE capability enquiry
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_CONNECTION_REJECT
DESC = RRC connection reject
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_CONNECTION_REESTABLISHMENT_REJECT
DESC = RRC connection reestablishment reject
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_CONNECTION_RELEASE
DESC = RRC connection release
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_CONNECTION_RECONFIGURATION
DESC = RRC connection reconfiguration
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_MEASUREMENT_REPORT
DESC = RRC measurement report
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_HANDOVER_PREPARATION_INFORMATION
DESC = RRC handover preparation information
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_CONNECTION_RECONFIGURATION_COMPLETE
DESC = RRC connection reconfiguration complete
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_CONNECTION_SETUP
DESC = RRC connection setup
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_UL_CCCH_DATA_IN
DESC = RRC uplink CCCH data in
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
ID = ENB_RRC_UL_DCCH_DATA_IN
DESC = RRC uplink DCCH data in
GROUP = ALL:RRC:ENB
FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti
#legacy logs #legacy logs
ID = LEGACY_MAC_INFO ID = LEGACY_MAC_INFO
......
...@@ -258,8 +258,32 @@ int main(int n, char **v) ...@@ -258,8 +258,32 @@ int main(int n, char **v)
on_off(database, "ENB_DLSCH_UE_ACK", is_on, 1); on_off(database, "ENB_DLSCH_UE_ACK", is_on, 1);
on_off(database, "ENB_DLSCH_UE_NACK", is_on, 1); on_off(database, "ENB_DLSCH_UE_NACK", is_on, 1);
view_add_log(eg.rrcview, "ENB_RRC_CONNECTION_SETUP_COMPLETE", h, database, view_add_log(eg.rrcview, "ENB_RRC_CONNECTION_SETUP_COMPLETE",
is_on); h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_SECURITY_MODE_COMMAND",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_UE_CAPABILITY_ENQUIRY",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_CONNECTION_REJECT",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_CONNECTION_REESTABLISHMENT_REJECT",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_CONNECTION_RELEASE",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_CONNECTION_RECONFIGURATION",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_MEASUREMENT_REPORT",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_HANDOVER_PREPARATION_INFORMATION",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_CONNECTION_RECONFIGURATION_COMPLETE",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_CONNECTION_SETUP",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_UL_CCCH_DATA_IN",
h, database, is_on);
view_add_log(eg.rrcview, "ENB_RRC_UL_DCCH_DATA_IN",
h, database, is_on);
for (i = 0; i < on_off_n; i++) for (i = 0; i < on_off_n; i++)
on_off(database, on_off_name[i], is_on, on_off_action[i]); on_off(database, on_off_name[i], is_on, on_off_action[i]);
......
...@@ -882,6 +882,9 @@ rrc_eNB_generate_SecurityModeCommand( ...@@ -882,6 +882,9 @@ rrc_eNB_generate_SecurityModeCommand(
uint8_t buffer[100]; uint8_t buffer[100];
uint8_t size; uint8_t size;
T(T_ENB_RRC_SECURITY_MODE_COMMAND, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
size = do_SecurityModeCommand( size = do_SecurityModeCommand(
ctxt_pP, ctxt_pP,
buffer, buffer,
...@@ -946,6 +949,9 @@ rrc_eNB_generate_UECapabilityEnquiry( ...@@ -946,6 +949,9 @@ rrc_eNB_generate_UECapabilityEnquiry(
uint8_t buffer[100]; uint8_t buffer[100];
uint8_t size; uint8_t size;
T(T_ENB_RRC_UE_CAPABILITY_ENQUIRY, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
size = do_UECapabilityEnquiry( size = do_UECapabilityEnquiry(
ctxt_pP, ctxt_pP,
buffer, buffer,
...@@ -998,6 +1004,9 @@ rrc_eNB_generate_RRCConnectionReject( ...@@ -998,6 +1004,9 @@ rrc_eNB_generate_RRCConnectionReject(
int cnt; int cnt;
#endif #endif
T(T_ENB_RRC_CONNECTION_REJECT, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.payload_size = eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.payload_size =
do_RRCConnectionReject(ctxt_pP->module_id, do_RRCConnectionReject(ctxt_pP->module_id,
(uint8_t*) eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.Payload); (uint8_t*) eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.Payload);
...@@ -1041,6 +1050,9 @@ rrc_eNB_generate_RRCConnectionReestablishmentReject( ...@@ -1041,6 +1050,9 @@ rrc_eNB_generate_RRCConnectionReestablishmentReject(
int cnt; int cnt;
#endif #endif
T(T_ENB_RRC_CONNECTION_REESTABLISHMENT_REJECT, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.payload_size = eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.payload_size =
do_RRCConnectionReestablishmentReject(ctxt_pP->module_id, do_RRCConnectionReestablishmentReject(ctxt_pP->module_id,
(uint8_t*) eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.Payload); (uint8_t*) eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.Payload);
...@@ -1083,6 +1095,9 @@ rrc_eNB_generate_RRCConnectionRelease( ...@@ -1083,6 +1095,9 @@ rrc_eNB_generate_RRCConnectionRelease(
uint8_t buffer[RRC_BUF_SIZE]; uint8_t buffer[RRC_BUF_SIZE];
uint16_t size; uint16_t size;
T(T_ENB_RRC_CONNECTION_RELEASE, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
memset(buffer, 0, RRC_BUF_SIZE); memset(buffer, 0, RRC_BUF_SIZE);
size = do_RRCConnectionRelease(ctxt_pP->module_id, buffer,rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id)); size = do_RRCConnectionRelease(ctxt_pP->module_id, buffer,rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id));
...@@ -1190,6 +1205,9 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration( ...@@ -1190,6 +1205,9 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration(
cba_RNTI->size = 2; cba_RNTI->size = 2;
cba_RNTI->bits_unused = 0; cba_RNTI->bits_unused = 0;
T(T_ENB_RRC_CONNECTION_RECONFIGURATION, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
// associate UEs to the CBa groups as a function of their UE id // associate UEs to the CBa groups as a function of their UE id
if (rrc_inst->num_active_cba_groups) { if (rrc_inst->num_active_cba_groups) {
cba_RNTI->buf[0] = rrc_inst->cba_rnti[ue_mod_idP % rrc_inst->num_active_cba_groups] & 0xff; cba_RNTI->buf[0] = rrc_inst->cba_rnti[ue_mod_idP % rrc_inst->num_active_cba_groups] & 0xff;
...@@ -1829,6 +1847,9 @@ rrc_eNB_process_MeasurementReport( ...@@ -1829,6 +1847,9 @@ rrc_eNB_process_MeasurementReport(
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
{ {
T(T_ENB_RRC_MEASUREMENT_REPORT, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
LOG_I(RRC, "[eNB %d] Frame %d: Process Measurement Report From UE %x (Measurement Id %d)\n", LOG_I(RRC, "[eNB %d] Frame %d: Process Measurement Report From UE %x (Measurement Id %d)\n",
ctxt_pP->module_id, ctxt_pP->frame, ctxt_pP->rnti, (int)measResults2->measId); ctxt_pP->module_id, ctxt_pP->frame, ctxt_pP->rnti, (int)measResults2->measId);
...@@ -1898,6 +1919,9 @@ rrc_eNB_generate_HandoverPreparationInformation( ...@@ -1898,6 +1919,9 @@ rrc_eNB_generate_HandoverPreparationInformation(
RadioResourceConfigDedicated_t *radioResourceConfigDedicated = CALLOC(1,sizeof(RadioResourceConfigDedicated_t)); RadioResourceConfigDedicated_t *radioResourceConfigDedicated = CALLOC(1,sizeof(RadioResourceConfigDedicated_t));
*/ */
T(T_ENB_RRC_HANDOVER_PREPARATION_INFORMATION, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
handoverInfo->as_config.antennaInfoCommon.antennaPortsCount = 0; //Not used 0- but check value handoverInfo->as_config.antennaInfoCommon.antennaPortsCount = 0; //Not used 0- but check value
handoverInfo->as_config.sourceDl_CarrierFreq = 36090; //Verify! handoverInfo->as_config.sourceDl_CarrierFreq = 36090; //Verify!
...@@ -1988,6 +2012,9 @@ rrc_eNB_process_handoverPreparationInformation( ...@@ -1988,6 +2012,9 @@ rrc_eNB_process_handoverPreparationInformation(
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
{ {
T(T_ENB_RRC_HANDOVER_PREPARATION_INFORMATION, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
LOG_I(RRC, LOG_I(RRC,
"[eNB %d] Frame %d : Logical Channel UL-DCCH, processing RRCHandoverPreparationInformation, sending RRCConnectionReconfiguration to UE %d \n", "[eNB %d] Frame %d : Logical Channel UL-DCCH, processing RRCHandoverPreparationInformation, sending RRCConnectionReconfiguration to UE %d \n",
...@@ -2063,6 +2090,9 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover( ...@@ -2063,6 +2090,9 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover(
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
{ {
T(T_ENB_RRC_CONNECTION_RECONFIGURATION, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
uint8_t buffer[RRC_BUF_SIZE]; uint8_t buffer[RRC_BUF_SIZE];
uint16_t size; uint16_t size;
...@@ -3015,6 +3045,9 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete( ...@@ -3015,6 +3045,9 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
DRB_ToAddModList_t* DRB_configList = ue_context_pP->ue_context.DRB_configList; DRB_ToAddModList_t* DRB_configList = ue_context_pP->ue_context.DRB_configList;
SRB_ToAddModList_t* SRB_configList = ue_context_pP->ue_context.SRB_configList; SRB_ToAddModList_t* SRB_configList = ue_context_pP->ue_context.SRB_configList;
T(T_ENB_RRC_CONNECTION_RECONFIGURATION_COMPLETE, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
#if defined(ENABLE_SECURITY) #if defined(ENABLE_SECURITY)
/* Derive the keys from kenb */ /* Derive the keys from kenb */
...@@ -3275,6 +3308,9 @@ rrc_eNB_generate_RRCConnectionSetup( ...@@ -3275,6 +3308,9 @@ rrc_eNB_generate_RRCConnectionSetup(
SRB_ToAddMod_t *SRB1_config; SRB_ToAddMod_t *SRB1_config;
int cnt; int cnt;
T(T_ENB_RRC_CONNECTION_SETUP, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
SRB_configList = &ue_context_pP->ue_context.SRB_configList; SRB_configList = &ue_context_pP->ue_context.SRB_configList;
eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.payload_size = eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.payload_size =
do_RRCConnectionSetup(ctxt_pP, do_RRCConnectionSetup(ctxt_pP,
...@@ -3548,6 +3584,9 @@ rrc_eNB_decode_ccch( ...@@ -3548,6 +3584,9 @@ rrc_eNB_decode_ccch(
struct rrc_eNB_ue_context_s* ue_context_p = NULL; struct rrc_eNB_ue_context_s* ue_context_p = NULL;
uint64_t random_value = 0; uint64_t random_value = 0;
T(T_ENB_RRC_UL_CCCH_DATA_IN, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
//memset(ul_ccch_msg,0,sizeof(UL_CCCH_Message_t)); //memset(ul_ccch_msg,0,sizeof(UL_CCCH_Message_t));
LOG_D(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Decoding UL CCCH %x.%x.%x.%x.%x.%x (%p)\n", LOG_D(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Decoding UL CCCH %x.%x.%x.%x.%x.%x (%p)\n",
...@@ -3883,6 +3922,9 @@ rrc_eNB_decode_dcch( ...@@ -3883,6 +3922,9 @@ rrc_eNB_decode_dcch(
int i; int i;
struct rrc_eNB_ue_context_s* ue_context_p = NULL; struct rrc_eNB_ue_context_s* ue_context_p = NULL;
T(T_ENB_RRC_UL_DCCH_DATA_IN, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
if ((Srb_id != 1) && (Srb_id != 2)) { if ((Srb_id != 1) && (Srb_id != 2)) {
LOG_E(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Received message on SRB%d, should not have ...\n", LOG_E(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Received message on SRB%d, should not have ...\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP), PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
......
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