From 0256fe7e7793b976c9c0a0b64062b8244968af4e Mon Sep 17 00:00:00 2001
From: Bastian Bloessl <bastian.bloessl@uibk.ac.at>
Date: Wed, 5 Jun 2013 14:40:14 +0200
Subject: [PATCH] wireshark: outsource class definition

---
 lib/wireshark_connector_impl.cc | 20 ++++---------
 lib/wireshark_connector_impl.h  | 52 +++++++++++++++++++++------------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/lib/wireshark_connector_impl.cc b/lib/wireshark_connector_impl.cc
index adf397a..c0a7cb0 100644
--- a/lib/wireshark_connector_impl.cc
+++ b/lib/wireshark_connector_impl.cc
@@ -25,12 +25,9 @@
 using namespace gr::foo;
 
 
-class wireshark_connector_impl : public wireshark_connector {
-public:
-
 #define dout d_debug && std::cout
 
-wireshark_connector_impl(bool debug) :
+wireshark_connector_impl::wireshark_connector_impl(bool debug) :
 	block ("wireshark_connector",
 			gr::io_signature::make(0, 0, 0),
 			gr::io_signature::make(1, 1, sizeof(uint8_t))),
@@ -50,10 +47,11 @@ wireshark_connector_impl(bool debug) :
 	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;
 	gettimeofday(&t, NULL);
@@ -69,7 +67,8 @@ void copy_message(const char *buf, int 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_void_star& output_items ) {
 
@@ -115,13 +114,6 @@ int general_work(int noutput, gr_vector_int& ninput_items,
 	return to_copy;
 }
 
-private:
-	bool        d_debug;
-	int         d_msg_offset;
-	int         d_msg_len;
-	char        d_msg[256];
-};
-
 wireshark_connector::sptr
 wireshark_connector::make(bool debug) {
 	return gnuradio::get_initial_sptr(new wireshark_connector_impl(debug));
diff --git a/lib/wireshark_connector_impl.h b/lib/wireshark_connector_impl.h
index 1842648..348dbf0 100644
--- a/lib/wireshark_connector_impl.h
+++ b/lib/wireshark_connector_impl.h
@@ -17,31 +17,47 @@
 #ifndef INCLUDED_FOO_WIRESHARK_CONNECTOR_IMPL_H
 #define INCLUDED_FOO_WIRESHARK_CONNECTOR_IMPL_H
 
+#include <foo/wireshark_connector.h>
 #include <boost/cstdint.hpp>
 
 namespace gr {
 namespace foo {
 
-enum LINK_LAYER_PROTOCOL {
-	ZIGBEE = 195
-};
+	class wireshark_connector_impl : public wireshark_connector {
+		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 {
-        uint32_t magic_number;   /* magic number */
-        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));
+	enum LINK_LAYER_PROTOCOL {
+		ZIGBEE = 195
+	};
 
-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));
+	struct pcap_global {
+		uint32_t magic_number;   /* magic number */
+		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 {
+		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 gr