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

wireshark: outsource class definition

Browse Source
This commit is contained in:
Bastian Bloessl
2013-06-05 14:40:14 +02:00
parent 3eb2eff868
commit 0256fe7e77
2 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/wireshark_connector_impl.cc
+6 -14
View File
@@ -25,12 +25,9 @@
using namespace gr::foo; using namespace gr::foo;
class wireshark_connector_impl : public wireshark_connector {
public:
#define dout d_debug && std::cout #define dout d_debug && std::cout
wireshark_connector_impl(bool debug) : wireshark_connector_impl::wireshark_connector_impl(bool debug) :
block ("wireshark_connector", block ("wireshark_connector",
gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0),
gr::io_signature::make(1, 1, sizeof(uint8_t))), gr::io_signature::make(1, 1, sizeof(uint8_t))),
@@ -50,10 +47,11 @@ wireshark_connector_impl(bool debug) :
d_msg_len = sizeof(pcap_global); d_msg_len = sizeof(pcap_global);
} }
~wireshark_connector_impl(void) { wireshark_connector_impl::~wireshark_connector_impl() {
} }
void copy_message(const char *buf, int len) { void
wireshark_connector_impl::copy_message(const char *buf, int len) {
struct timeval t; struct timeval t;
gettimeofday(&t, NULL); gettimeofday(&t, NULL);
@@ -69,7 +67,8 @@ void copy_message(const char *buf, int len) {
d_msg_len = sizeof(pcap_pkt) + len; d_msg_len = sizeof(pcap_pkt) + len;
} }
int general_work(int noutput, gr_vector_int& ninput_items, int
wireshark_connector_impl::general_work(int noutput, gr_vector_int& ninput_items,
gr_vector_const_void_star& input_items, gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items ) { gr_vector_void_star& output_items ) {
@@ -115,13 +114,6 @@ int general_work(int noutput, gr_vector_int& ninput_items,
return to_copy; return to_copy;
} }
private:
bool d_debug;
int d_msg_offset;
int d_msg_len;
char d_msg[256];
};
wireshark_connector::sptr wireshark_connector::sptr
wireshark_connector::make(bool debug) { wireshark_connector::make(bool debug) {
return gnuradio::get_initial_sptr(new wireshark_connector_impl(debug)); return gnuradio::get_initial_sptr(new wireshark_connector_impl(debug));
lib/wireshark_connector_impl.h
+34 -18
View File
@@ -17,31 +17,47 @@
#ifndef INCLUDED_FOO_WIRESHARK_CONNECTOR_IMPL_H #ifndef INCLUDED_FOO_WIRESHARK_CONNECTOR_IMPL_H
#define INCLUDED_FOO_WIRESHARK_CONNECTOR_IMPL_H #define INCLUDED_FOO_WIRESHARK_CONNECTOR_IMPL_H
#include <foo/wireshark_connector.h>
#include <boost/cstdint.hpp> #include <boost/cstdint.hpp>
namespace gr { namespace gr {
namespace foo { namespace foo {
enum LINK_LAYER_PROTOCOL { class wireshark_connector_impl : public wireshark_connector {
ZIGBEE = 195 private:
}; bool d_debug;
int d_msg_offset;
int d_msg_len;
char d_msg[256];
public:
wireshark_connector_impl(bool debug);
virtual ~wireshark_connector_impl();
int general_work(int noutput, gr_vector_int& ninput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items );
void copy_message(const char *buf, int len);
};
struct pcap_global { enum LINK_LAYER_PROTOCOL {
uint32_t magic_number; /* magic number */ ZIGBEE = 195
uint16_t version_major; /* major version number */ };
uint16_t version_minor; /* minor version number */
int32_t thiszone; /* GMT to local correction */
uint32_t sigfigs; /* accuracy of timestamps */
uint32_t snaplen; /* max length of captured packets, in octets */
uint32_t network; /* data link type */
}__attribute__((packed));
struct pcap_pkt { struct pcap_global {
uint32_t ts_sec; /* timestamp seconds */ uint32_t magic_number; /* magic number */
uint32_t ts_usec; /* timestamp microseconds */ uint16_t version_major; /* major version number */
uint32_t incl_len; /* number of octets of packet saved in file */ uint16_t version_minor; /* minor version number */
uint32_t orig_len; /* actual length of packet */ int32_t thiszone; /* GMT to local correction */
}__attribute__((packed)); uint32_t sigfigs; /* accuracy of timestamps */
uint32_t snaplen; /* max length of captured packets, in octets */
uint32_t network; /* data link type */
}__attribute__((packed));
struct pcap_pkt {
uint32_t ts_sec; /* timestamp seconds */
uint32_t ts_usec; /* timestamp microseconds */
uint32_t incl_len; /* number of octets of packet saved in file */
uint32_t orig_len; /* actual length of packet */
}__attribute__((packed));
} // namespace foo } // namespace foo
} // namespace gr } // namespace gr