emergency handler for NAS PCAP to close file

Previously NAS PCAP wasn't closed/fflushed on
unclean exit, resulting in missing or corrupted PCAP.
master
Merlin Chlosta 3 years ago committed by Andre Puschmann
parent 0dff58613f
commit c967b688ff

@ -22,22 +22,17 @@ namespace srsran {
class nas_pcap class nas_pcap
{ {
public: public:
nas_pcap() nas_pcap();
{
enable_write = false;
ue_id = 0;
pcap_file = NULL;
}
void enable(); void enable();
uint32_t open(std::string filename_, uint32_t ue_id = 0, srsran_rat_t rat_type = srsran_rat_t::lte); uint32_t open(std::string filename_, uint32_t ue_id = 0, srsran_rat_t rat_type = srsran_rat_t::lte);
void close(); void close();
void write_nas(uint8_t* pdu, uint32_t pdu_len_bytes); void write_nas(uint8_t* pdu, uint32_t pdu_len_bytes);
private: private:
bool enable_write; bool enable_write = false;
std::string filename; std::string filename;
FILE* pcap_file; FILE* pcap_file = nullptr;
uint32_t ue_id; uint32_t ue_id = 0;
void pack_and_write(uint8_t* pdu, uint32_t pdu_len_bytes); void pack_and_write(uint8_t* pdu, uint32_t pdu_len_bytes);
}; };

@ -13,10 +13,22 @@
#include "srsran/common/nas_pcap.h" #include "srsran/common/nas_pcap.h"
#include "srsran/common/pcap.h" #include "srsran/common/pcap.h"
#include "srsran/srsran.h" #include "srsran/srsran.h"
#include "srsran/support/emergency_handlers.h"
#include <stdint.h> #include <stdint.h>
namespace srsran { namespace srsran {
/// Try to flush the contents of the pcap class before the application is killed.
static void emergency_cleanup_handler(void* data)
{
reinterpret_cast<nas_pcap*>(data)->close();
}
nas_pcap::nas_pcap()
{
add_emergency_cleanup_handler(emergency_cleanup_handler, this);
}
void nas_pcap::enable() void nas_pcap::enable()
{ {
enable_write = true; enable_write = true;
@ -42,6 +54,7 @@ void nas_pcap::close()
{ {
fprintf(stdout, "Saving NAS PCAP file (DLT=%d) to %s \n", NAS_LTE_DLT, filename.c_str()); fprintf(stdout, "Saving NAS PCAP file (DLT=%d) to %s \n", NAS_LTE_DLT, filename.c_str());
DLT_PCAP_Close(pcap_file); DLT_PCAP_Close(pcap_file);
pcap_file = nullptr;
} }
void nas_pcap::write_nas(uint8_t* pdu, uint32_t pdu_len_bytes) void nas_pcap::write_nas(uint8_t* pdu, uint32_t pdu_len_bytes)

Loading…
Cancel
Save