t/gr-foo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wireshark: alloc memory dynamically

Browse Source
This commit is contained in:
Bastian Bloessl
2013-06-21 12:31:17 +02:00
parent 0bf0803d42
commit 2d53800583
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/wireshark_connector_impl.cc
+14 -2
View File
@@ -37,7 +37,10 @@ wireshark_connector_impl::wireshark_connector_impl(LinkType type, bool debug) :
message_port_register_in(pmt::mp("in")); message_port_register_in(pmt::mp("in"));
pcap_file_hdr *hdr = (pcap_file_hdr*)d_msg; d_msg_len = sizeof(pcap_file_hdr);
d_msg = reinterpret_cast<char*>(std::malloc(d_msg_len));
pcap_file_hdr *hdr = reinterpret_cast<pcap_file_hdr*>(d_msg);
hdr->magic_number = 0xa1b2c3d4; hdr->magic_number = 0xa1b2c3d4;
hdr->version_major = 2; hdr->version_major = 2;
hdr->version_minor = 4; hdr->version_minor = 4;
@@ -45,10 +48,12 @@ wireshark_connector_impl::wireshark_connector_impl(LinkType type, bool debug) :
hdr->sigfigs = 0; hdr->sigfigs = 0;
hdr->snaplen = 65535; hdr->snaplen = 65535;
hdr->network = d_link; hdr->network = d_link;
d_msg_len = sizeof(pcap_file_hdr);
} }
wireshark_connector_impl::~wireshark_connector_impl() { wireshark_connector_impl::~wireshark_connector_impl() {
if(d_msg_len) {
std::free(d_msg);
}
} }
void void
@@ -62,6 +67,9 @@ wireshark_connector_impl::copy_message(const char *buf, int len) {
switch(d_link) { switch(d_link) {
case WIFI: { case WIFI: {
// pcap header // pcap header
d_msg = reinterpret_cast<char*>(std::malloc(
len + sizeof(radiotap_hdr) + sizeof(pcap_hdr)));
pcap_hdr *hdr = reinterpret_cast<pcap_hdr*>(d_msg); pcap_hdr *hdr = reinterpret_cast<pcap_hdr*>(d_msg);
hdr->ts_sec = t.tv_sec; hdr->ts_sec = t.tv_sec;
hdr->ts_usec = t.tv_usec; hdr->ts_usec = t.tv_usec;
@@ -86,6 +94,9 @@ wireshark_connector_impl::copy_message(const char *buf, int len) {
case ZIGBEE: { case ZIGBEE: {
d_msg = reinterpret_cast<char*>(std::malloc(
len + sizeof(pcap_hdr)));
pcap_hdr *hdr = reinterpret_cast<pcap_hdr*>(d_msg); pcap_hdr *hdr = reinterpret_cast<pcap_hdr*>(d_msg);
hdr->ts_sec = t.tv_sec; hdr->ts_sec = t.tv_sec;
hdr->ts_usec = t.tv_usec; hdr->ts_usec = t.tv_usec;
@@ -140,6 +151,7 @@ wireshark_connector_impl::general_work(int noutput, gr_vector_int& ninput_items,
if(d_msg_offset == d_msg_len) { if(d_msg_offset == d_msg_len) {
d_msg_offset = 0; d_msg_offset = 0;
d_msg_len = 0; d_msg_len = 0;
std::free(d_msg);
} }
dout << "WIRESHARK: output size: " << noutput << dout << "WIRESHARK: output size: " << noutput <<
lib/wireshark_connector_impl.h
+1 -1
View File
@@ -28,7 +28,7 @@ namespace foo {
bool d_debug; bool d_debug;
int d_msg_offset; int d_msg_offset;
int d_msg_len; int d_msg_len;
char d_msg[256]; char* d_msg;
LinkType d_link; LinkType d_link;
public: public:
wireshark_connector_impl(LinkType type, bool debug); wireshark_connector_impl(LinkType type, bool debug);