PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Port mac_pcap to srslog.

This commit is contained in:
faluco 2021-02-01 16:29:11 +01:00 committed by faluco
parent 79eca0980d
commit e9ed6f31ba
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/include/srslte/common/mac_pcap.h
View File

@ -28,7 +28,7 @@ class mac_pcap : srslte::thread
public: public:
mac_pcap(); mac_pcap();
~mac_pcap(); ~mac_pcap();
void enable(bool en); void enable(bool en);
uint32_t open(const char* filename, uint32_t ue_id = 0); uint32_t open(const char* filename, uint32_t ue_id = 0);
uint32_t close(); uint32_t close();
@ -52,7 +52,7 @@ public:
private: private:
srslte::byte_buffer_pool* pool = nullptr; srslte::byte_buffer_pool* pool = nullptr;
srslte::log_ref log; srslog::basic_logger& logger;
bool running = false; bool running = false;
FILE* pcap_file = nullptr; FILE* pcap_file = nullptr;
uint32_t ue_id = 0; uint32_t ue_id = 0;

10
lib/src/common/mac_pcap.cc
View File

@ -18,7 +18,7 @@
namespace srslte { namespace srslte {
mac_pcap::mac_pcap() : mac_pcap::mac_pcap() :
pool(srslte::byte_buffer_pool::get_instance()), log(srslte::logmap::get("MAC")), thread("PCAP_WRITER") pool(srslte::byte_buffer_pool::get_instance()), logger(srslog::fetch_basic_logger("MAC")), thread("PCAP_WRITER")
{} {}
mac_pcap::~mac_pcap() mac_pcap::~mac_pcap()
@ -36,13 +36,13 @@ uint32_t mac_pcap::open(const char* filename, uint32_t ue_id_)
{ {
std::lock_guard<std::mutex> lock(mutex); std::lock_guard<std::mutex> lock(mutex);
if (pcap_file != nullptr) { if (pcap_file != nullptr) {
log->error("PCAP writer already running. Close first.\n"); logger.error("PCAP writer already running. Close first.");
return SRSLTE_ERROR; return SRSLTE_ERROR;
} }
pcap_file = LTE_PCAP_Open(MAC_LTE_DLT, filename); pcap_file = LTE_PCAP_Open(MAC_LTE_DLT, filename);
if (pcap_file == nullptr) { if (pcap_file == nullptr) {
log->error("Couldn't open file to write PCAP\n"); logger.error("Couldn't open file to write PCAP");
return SRSLTE_ERROR; return SRSLTE_ERROR;
} }
@ -146,7 +146,7 @@ void mac_pcap::pack_and_queue(uint8_t* payload,
pdu.pdu->N_bytes = payload_len; pdu.pdu->N_bytes = payload_len;
queue.push(std::move(pdu)); queue.push(std::move(pdu));
} else { } else {
log->info("Dropping PDU in PCAP. No buffer available or not enough space (pdu_len=%d).\n", payload_len); logger.info("Dropping PDU in PCAP. No buffer available or not enough space (pdu_len=%d).", payload_len);
} }
} }
} }
@ -213,7 +213,7 @@ void mac_pcap::write_ul_rrc_pdu(const uint8_t* input, const int32_t input_len)
// Size is limited by PDU buffer and MAC subheader (format 1 < 128 B) // Size is limited by PDU buffer and MAC subheader (format 1 < 128 B)
if (input_len > 128 - 7) { if (input_len > 128 - 7) {
log->error("PDU too large.\n"); logger.error("PDU too large.");
return; return;
} }