added a go style channel implementation. this might still need some performance tweaks (use less semaphores, maybee not use ringbuffer)

2 files changed, 95 insertions, 1 deletions

diff --git a/src/anytun.cpp b/src/anytun.cpp
index 3f14a5e..9e97e5a 100644
--- a/src/anytun.cpp
+++ b/src/anytun.cpp
@@ -91,6 +91,7 @@
 #endif
 
 #include "cryptinit.hpp"
+#include "channel.hpp"
 #include "sysExec.h"
 
 bool disableRouting = false;
@@ -339,7 +340,12 @@ void receiver(TunDevice* dev, PacketSource* src)
 void startSendRecvThreads(TunDevice* dev, PacketSource* src)
 {
   src->waitUntilReady();
-
+  //channel<int> a(1);
+  //a.push(23);
+  //a.push(23);
+  //int i=0;
+  //a.pop(i);
+  //std::cout << i << std::endl;
   boost::thread(boost::bind(sender, dev, src));
   boost::thread(boost::bind(receiver, dev, src));
 }
diff --git a/src/channel.hpp b/src/channel.hpp
new file mode 100644
index 0000000..8c69f19
--- /dev/null
+++ b/src/channel.hpp
@@ -0,0 +1,88 @@
+/*
+ *  anytun
+ *
+ *  The secure anycast tunneling protocol (satp) defines a protocol used
+ *  for communication between any combination of unicast and anycast
+ *  tunnel endpoints.  It has less protocol overhead than IPSec in Tunnel
+ *  mode and allows tunneling of every ETHER TYPE protocol (e.g.
+ *  ethernet, ip, arp ...). satp directly includes cryptography and
+ *  message authentication based on the methods used by SRTP.  It is
+ *  intended to deliver a generic, scaleable and secure solution for
+ *  tunneling and relaying of packets of any protocol.
+ *
+ *
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
+ *                          Christian Pointner <satp@wirdorange.org>
+ *
+ *  This file is part of Anytun.
+ *
+ *  Anytun is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  Anytun is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL.  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so.  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version.  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#ifndef ANYTUN_channel_hpp_INCLUDED
+#define ANYTUN_channel_hpp_INCLUDED
+
+#include <boost/thread/thread.hpp>
+#include <boost/circular_buffer.hpp>
+
+template<typename T>
+class channel
+{
+private:
+  boost::mutex mtx_;
+  boost::circular_buffer<T> cb_;
+  Semaphore sem_read_, sem_write_;
+
+  void push_cb(T const & t ) {
+    boost::lock_guard<boost::mutex> guard(mtx_);
+    cb_.push_back(t);
+  }
+  void pop_cb(T & ret) {
+    boost::lock_guard<boost::mutex> guard(mtx_);
+    ret = cb_[0];
+    cb_.pop_front();
+  }
+  
+public:
+  channel(channel const &) = delete;
+//  channel(channel &&) = delete;
+  channel& operator=(const channel &) = delete;
+  channel(unsigned int num_elements=10)
+    :cb_(num_elements),sem_read_(0),sem_write_(num_elements) {};
+  void push(T const & t ) {
+    sem_write_.down();
+    this->push_cb(t);
+    sem_read_.up();
+  }
+  void pop(T & ret) {
+    sem_read_.down();
+    this->pop_cb(ret);
+    sem_write_.up();
+  }
+};
+
+#endif