diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-12 16:09:45 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-12 16:09:45 -0500 |
| commit | 521a39ade2350f7a0078c5af34df716d15befbc3 (patch) | |
| tree | 23ded220a199d65f5c55155e1a8bdf692c565a37 | |
| parent | c3fc76c6cbc69fbf9505611b03c579f8032ea6e7 (diff) | |
| parent | 6e1b2888b3001c1c80fd78a714f5e5b98b1fe81d (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_socket_pdu.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_stream_pdu_base.h | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_tuntap_pdu.cc | 15 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_tuntap_pdu.h | 2 |
4 files changed, 14 insertions, 8 deletions
diff --git a/gnuradio-core/src/lib/io/gr_socket_pdu.h b/gnuradio-core/src/lib/io/gr_socket_pdu.h index 3a96a3f97f..f554febdc1 100644 --- a/gnuradio-core/src/lib/io/gr_socket_pdu.h +++ b/gnuradio-core/src/lib/io/gr_socket_pdu.h @@ -30,8 +30,6 @@ #include <gr_stream_pdu_base.h> #include <boost/asio.hpp> -#include <linux/if_tun.h> - class gr_socket_pdu; typedef boost::shared_ptr<gr_socket_pdu> gr_socket_pdu_sptr; diff --git a/gnuradio-core/src/lib/io/gr_stream_pdu_base.h b/gnuradio-core/src/lib/io/gr_stream_pdu_base.h index dc5dc5c2e9..35bacf523f 100644 --- a/gnuradio-core/src/lib/io/gr_stream_pdu_base.h +++ b/gnuradio-core/src/lib/io/gr_stream_pdu_base.h @@ -28,9 +28,6 @@ #include <gr_message.h> #include <gr_msg_queue.h> -#include <linux/if_tun.h> - - /*! * \brief Gather received items into messages and insert into msgq * \ingroup sink_blk diff --git a/gnuradio-core/src/lib/io/gr_tuntap_pdu.cc b/gnuradio-core/src/lib/io/gr_tuntap_pdu.cc index 44de1a5f7d..d369310a64 100644 --- a/gnuradio-core/src/lib/io/gr_tuntap_pdu.cc +++ b/gnuradio-core/src/lib/io/gr_tuntap_pdu.cc @@ -134,8 +134,19 @@ int gr_tuntap_pdu::tun_alloc(char *dev, int flags) { #else //if not linux -boost::shared_ptr<gr_block> gr_make_tuntap_pdu (std::string dev, int MTU){ - boost::shared_ptr<gr_block> rv; +// Just a stub class and factory function for swig. +class gr_tuntap_pdu +{ +private: + gr_tuntap_pdu() {}; +public: + ~gr_tuntap_pdu() {}; +}; + +gr_block_sptr +gr_make_tuntap_pdu(std::string dev, int MTU) +{ + gr_block_sptr rv; throw std::runtime_error("tuntap only implemented on linux"); return rv; } diff --git a/gnuradio-core/src/lib/io/gr_tuntap_pdu.h b/gnuradio-core/src/lib/io/gr_tuntap_pdu.h index 0e8071c30d..384d577033 100644 --- a/gnuradio-core/src/lib/io/gr_tuntap_pdu.h +++ b/gnuradio-core/src/lib/io/gr_tuntap_pdu.h @@ -59,7 +59,7 @@ class GR_CORE_API gr_tuntap_pdu : public gr_stream_pdu_base #else // if not linux -GR_CORE_API boost::shared_ptr<gr_block> gr_make_tuntap_pdu (std::string dev, int MTU=0); +GR_CORE_API gr_block_sptr gr_make_tuntap_pdu (std::string dev, int MTU=0); #endif |