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
5d63b493b6
commit
365cb2dfe2
|
@ -160,15 +160,15 @@ template <class T>
|
||||||
void rrc::log_rrc_message(const std::string& source, const direction_t dir, const srslte::byte_buffer_t* pdu,
|
void rrc::log_rrc_message(const std::string& source, const direction_t dir, const srslte::byte_buffer_t* pdu,
|
||||||
const T& msg)
|
const T& msg)
|
||||||
{
|
{
|
||||||
|
const char* msg_type = msg.msg.c1().type().to_string().c_str();
|
||||||
if (rrc_log->get_level() == srslte::LOG_LEVEL_INFO) {
|
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",
|
rrc_log->info("%s - %s %s (%d B)\n", source.c_str(), dir == Tx ? "Tx" : "Rx", msg_type, pdu->N_bytes);
|
||||||
msg.msg.c1().type().to_string().c_str(), pdu->N_bytes);
|
|
||||||
} else if (rrc_log->get_level() >= srslte::LOG_LEVEL_DEBUG) {
|
} else if (rrc_log->get_level() >= srslte::LOG_LEVEL_DEBUG) {
|
||||||
asn1::json_writer json_writer;
|
asn1::json_writer json_writer;
|
||||||
msg.to_json(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",
|
rrc_log->debug_hex(
|
||||||
msg.msg.c1().type().to_string().c_str(), pdu->N_bytes);
|
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("Content:\n%s\n", json_writer.to_string().c_str());
|
rrc_log->debug_long("Content:\n%s\n", json_writer.to_string().c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -78,14 +78,19 @@ void rrc::srslte_rrc_log(const char* str)
|
||||||
template <class T>
|
template <class T>
|
||||||
void rrc::log_rrc_message(const std::string source, const direction_t dir, const byte_buffer_t* pdu, const T& msg)
|
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) {
|
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",
|
rrc_log->info("%s - %s %s (%d B)\n", source.c_str(), (dir == Rx) ? "Rx" : "Tx", msg_type, pdu->N_bytes);
|
||||||
msg.msg.c1().type().to_string().c_str(), pdu->N_bytes);
|
|
||||||
} else if (rrc_log->get_level() >= srslte::LOG_LEVEL_DEBUG) {
|
} else if (rrc_log->get_level() >= srslte::LOG_LEVEL_DEBUG) {
|
||||||
asn1::json_writer json_writer;
|
asn1::json_writer json_writer;
|
||||||
msg.to_json(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",
|
rrc_log->debug_hex(pdu->msg,
|
||||||
msg.msg.c1().type().to_string().c_str(), pdu->N_bytes);
|
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());
|
rrc_log->debug_long("Content:\n%s\n", json_writer.to_string().c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue