From 0feda7fdfe3a7f2807281a9e0b81c59af5893bec Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Wed, 25 May 2016 17:38:44 +0200
Subject: [PATCH] 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
---
common/utils/T/T_messages.txt | 48 +++++++++++++++++++++++++++++++++++
common/utils/T/tracer/enb.c | 28 ++++++++++++++++++--
openair2/RRC/LITE/rrc_eNB.c | 42 ++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+), 2 deletions(-)
diff --git a/common/utils/T/T_messages.txt b/common/utils/T/T_messages.txt
index ed3609a062..0271cb82b5 100644
--- a/common/utils/T/T_messages.txt
+++ b/common/utils/T/T_messages.txt
@@ -45,6 +45,54 @@ ID = ENB_RRC_CONNECTION_SETUP_COMPLETE
DESC = RRC connection setup complete
GROUP = ALL:RRC:ENB
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
ID = LEGACY_MAC_INFO
diff --git a/common/utils/T/tracer/enb.c b/common/utils/T/tracer/enb.c
index a675c2eae7..a0431b7175 100644
--- a/common/utils/T/tracer/enb.c
+++ b/common/utils/T/tracer/enb.c
@@ -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_NACK", is_on, 1);
- view_add_log(eg.rrcview, "ENB_RRC_CONNECTION_SETUP_COMPLETE", h, database,
- is_on);
+ view_add_log(eg.rrcview, "ENB_RRC_CONNECTION_SETUP_COMPLETE",
+ 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++)
on_off(database, on_off_name[i], is_on, on_off_action[i]);
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index dbc9e09f16..11c27c1aa2 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -882,6 +882,9 @@ rrc_eNB_generate_SecurityModeCommand(
uint8_t buffer[100];
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(
ctxt_pP,
buffer,
@@ -946,6 +949,9 @@ rrc_eNB_generate_UECapabilityEnquiry(
uint8_t buffer[100];
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(
ctxt_pP,
buffer,
@@ -998,6 +1004,9 @@ rrc_eNB_generate_RRCConnectionReject(
int cnt;
#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 =
do_RRCConnectionReject(ctxt_pP->module_id,
(uint8_t*) eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.Payload);
@@ -1041,6 +1050,9 @@ rrc_eNB_generate_RRCConnectionReestablishmentReject(
int cnt;
#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 =
do_RRCConnectionReestablishmentReject(ctxt_pP->module_id,
(uint8_t*) eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.Payload);
@@ -1083,6 +1095,9 @@ rrc_eNB_generate_RRCConnectionRelease(
uint8_t buffer[RRC_BUF_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);
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(
cba_RNTI->size = 2;
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
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;
@@ -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",
ctxt_pP->module_id, ctxt_pP->frame, ctxt_pP->rnti, (int)measResults2->measId);
@@ -1898,6 +1919,9 @@ rrc_eNB_generate_HandoverPreparationInformation(
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.sourceDl_CarrierFreq = 36090; //Verify!
@@ -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,
"[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(
)
//-----------------------------------------------------------------------------
{
+ 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];
uint16_t size;
@@ -3015,6 +3045,9 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
DRB_ToAddModList_t* DRB_configList = ue_context_pP->ue_context.DRB_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)
/* Derive the keys from kenb */
@@ -3275,6 +3308,9 @@ rrc_eNB_generate_RRCConnectionSetup(
SRB_ToAddMod_t *SRB1_config;
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;
eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.payload_size =
do_RRCConnectionSetup(ctxt_pP,
@@ -3548,6 +3584,9 @@ rrc_eNB_decode_ccch(
struct rrc_eNB_ue_context_s* ue_context_p = NULL;
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));
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(
int i;
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)) {
LOG_E(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Received message on SRB%d, should not have ...\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
--
GitLab