mirror of https://github.com/PentHertz/srsLTE.git
assign msg-type to temp variable before logging ASN1 message in RRC
This commit is contained in:
parent
4e4a3eeb6c
commit
60d07f1656
|
@ -177,22 +177,14 @@ void rrc::log_rrc_message(const std::string& source,
|
|||
const srslte::byte_buffer_t* pdu,
|
||||
const T& msg)
|
||||
{
|
||||
const char* msg_type = msg.msg.c1().type().to_string().c_str();
|
||||
if (rrc_log->get_level() == srslte::LOG_LEVEL_INFO) {
|
||||
rrc_log->info("%s - %s %s (%d B)\n",
|
||||
source.c_str(),
|
||||
dir == Tx ? "Tx" : "Rx",
|
||||
msg.msg.c1().type().to_string().c_str(),
|
||||
pdu->N_bytes);
|
||||
rrc_log->info("%s - %s %s (%d B)\n", source.c_str(), dir == Tx ? "Tx" : "Rx", msg_type, pdu->N_bytes);
|
||||
} else if (rrc_log->get_level() >= srslte::LOG_LEVEL_DEBUG) {
|
||||
asn1::json_writer json_writer;
|
||||
msg.to_json(json_writer);
|
||||
rrc_log->debug_hex(pdu->msg,
|
||||
pdu->N_bytes,
|
||||
"%s - %s %s (%d B)\n",
|
||||
source.c_str(),
|
||||
dir == Tx ? "Tx" : "Rx",
|
||||
msg.msg.c1().type().to_string().c_str(),
|
||||
pdu->N_bytes);
|
||||
rrc_log->debug_hex(
|
||||
pdu->msg, pdu->N_bytes, "%s - %s %s (%d B)\n", source.c_str(), dir == Tx ? "Tx" : "Rx", msg_type, pdu->N_bytes);
|
||||
rrc_log->debug_long("Content:\n%s\n", json_writer.to_string().c_str());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -72,14 +72,19 @@ rrc::~rrc() = default;
|
|||
template <class T>
|
||||
void rrc::log_rrc_message(const std::string source, const direction_t dir, const byte_buffer_t* pdu, const T& msg)
|
||||
{
|
||||
const char* msg_type = msg.msg.c1().type().to_string().c_str();
|
||||
if (rrc_log->get_level() == srslte::LOG_LEVEL_INFO) {
|
||||
rrc_log->info("%s - %s %s (%d B)\n", source.c_str(), (dir == Rx) ? "Rx" : "Tx",
|
||||
msg.msg.c1().type().to_string().c_str(), pdu->N_bytes);
|
||||
rrc_log->info("%s - %s %s (%d B)\n", source.c_str(), (dir == Rx) ? "Rx" : "Tx", msg_type, pdu->N_bytes);
|
||||
} else if (rrc_log->get_level() >= srslte::LOG_LEVEL_DEBUG) {
|
||||
asn1::json_writer json_writer;
|
||||
msg.to_json(json_writer);
|
||||
rrc_log->debug_hex(pdu->msg, pdu->N_bytes, "%s - %s %s (%d B)\n", source.c_str(), (dir == Rx) ? "Rx" : "Tx",
|
||||
msg.msg.c1().type().to_string().c_str(), pdu->N_bytes);
|
||||
rrc_log->debug_hex(pdu->msg,
|
||||
pdu->N_bytes,
|
||||
"%s - %s %s (%d B)\n",
|
||||
source.c_str(),
|
||||
(dir == Rx) ? "Rx" : "Tx",
|
||||
msg_type,
|
||||
pdu->N_bytes);
|
||||
rrc_log->debug_long("Content:\n%s\n", json_writer.to_string().c_str());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue