New upstream version 0.3.6

[anytun.git] / src / syncServer.cpp

diff --git a/src/syncServer.cpp b/src/syncServer.cpp
index e4f6434..1e6e352 100644 (file)
--- a/src/syncServer.cpp
+++ b/src/syncServer.cpp
@@ -6,12 +6,12 @@
  *  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 methodes used by SRTP.  It is
+ *  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-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -27,7 +27,20 @@
  *  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/>.
+ *  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.
  */
 
 #include "syncServer.h"
@@ -37,35 +50,37 @@
 
 //using asio::ip::tcp;
 
-SyncServer::SyncServer(std::string localaddr, std::string port, ConnectCallback onConnect) 
+SyncServer::SyncServer(std::string localaddr, std::string port, ConnectCallback onConnect)
   : onConnect_(onConnect)
 {
   gResolver.resolveTcp(localaddr, port, boost::bind(&SyncServer::onResolve, this, _1), boost::bind(&SyncServer::onResolvError, this, _1));
 }
 
-SyncServer::~SyncServer() 
+SyncServer::~SyncServer()
 {
   std::list<AcceptorsElement>::iterator it = acceptors_.begin();
-  for(;it != acceptors_.end(); ++it) {
-/// this might be a needed by a running thread, TODO cleanup
-//    delete(it->acceptor_);
+  for(; it != acceptors_.end(); ++it) {
+    /// this might be a needed by a running thread, TODO cleanup
+    //    delete(it->acceptor_);
   }
 }
 
-void SyncServer::onResolve(SyncTcpConnection::proto::resolver::iterator& it)
+void SyncServer::onResolve(SyncTcpConnection::proto::resolver::iterator it)
 {
   while(it != SyncTcpConnection::proto::resolver::iterator()) {
     SyncTcpConnection::proto::endpoint e = *it;
-    
+
     AcceptorsElement acceptor;
     acceptor.acceptor_ = new SyncTcpConnection::proto::acceptor(io_service_);
-    if(!acceptor.acceptor_)
+    if(!acceptor.acceptor_) {
       AnytunError::throwErr() << "memory error";
+    }
 
     acceptor.acceptor_->open(e.protocol());
-#ifndef _MSC_VER
-    if(e.protocol() == boost::asio::ip::tcp::v6())
+#if !defined(_MSC_VER) && !defined(MINGW)
+    if(e.protocol() == boost::asio::ip::tcp::v6()) {
       acceptor.acceptor_->set_option(boost::asio::ip::v6_only(true));
+    }
 #endif
     acceptor.acceptor_->set_option(boost::asio::socket_base::reuse_address(true));
     acceptor.acceptor_->bind(e);
@@ -86,7 +101,7 @@ void SyncServer::onResolve(SyncTcpConnection::proto::resolver::iterator& it)
 void SyncServer::onResolvError(const std::runtime_error& e)
 {
   cLog.msg(Log::PRIO_ERROR) << "sync server bind/listen failed: " << e.what();
-      // TODO: stop daemon??
+  // TODO: stop daemon??
 }
 
 void SyncServer::run()
@@ -98,8 +113,9 @@ void SyncServer::run()
 void SyncServer::send(std::string message)
 {
   Lock lock(mutex_);
-  for(std::list<SyncTcpConnection::pointer>::iterator it = conns_.begin() ;it != conns_.end(); ++it)
+  for(std::list<SyncTcpConnection::pointer>::iterator it = conns_.begin() ; it != conns_.end(); ++it) {
     (*it)->Send(message);
+  }
 }
 
 void SyncServer::start_accept()
@@ -107,12 +123,12 @@ void SyncServer::start_accept()
   Lock lock(mutex_);
 
   std::list<AcceptorsElement>::iterator it = acceptors_.begin();
-  for(;it != acceptors_.end(); ++it) {
+  for(; it != acceptors_.end(); ++it) {
     if(!it->started_) {
-      SyncTcpConnection::pointer new_connection = SyncTcpConnection::create(it->acceptor_->io_service());
+      SyncTcpConnection::pointer new_connection = SyncTcpConnection::create(it->acceptor_->get_io_service());
       conns_.push_back(new_connection);
       it->acceptor_->async_accept(new_connection->socket(),
-                             boost::bind(&SyncServer::handle_accept, this, new_connection, boost::asio::placeholders::error, it));
+                                  boost::bind(&SyncServer::handle_accept, this, new_connection, boost::asio::placeholders::error, it));
       it->started_ = true;
     }
   }
@@ -120,7 +136,7 @@ void SyncServer::start_accept()
 
 void SyncServer::handle_accept(SyncTcpConnection::pointer new_connection, const boost::system::error_code& error, std::list<AcceptorsElement>::iterator it)
 {
-  if (!error) {
+  if(!error) {
     cLog.msg(Log::PRIO_INFO) << "new sync client connected from " << new_connection->socket().remote_endpoint();
 
     new_connection->onConnect = onConnect_;