X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsyncServer.cpp;h=71052b80bacc5b10c0debc331f60adc2edc74411;hb=bd02a5f6be4815d46524d613f727199ca756c971;hp=b61872c8ab1f3c70021442cf81031f145384e6ea;hpb=f9ad69dfae6bcec427652b0c4230603e465bd544;p=anytun.git

diff --git a/src/syncServer.cpp b/src/syncServer.cpp
index b61872c..71052b8 100644
--- a/src/syncServer.cpp
+++ b/src/syncServer.cpp
@@ -11,7 +11,7 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -33,30 +33,62 @@
 #include "syncServer.h"
 #include "resolver.h"
 #include "log.h"
+#include "anytunError.h"
 
 //using asio::ip::tcp;
 
-SyncServer::SyncServer(std::string localaddr, std::string port, ConnectCallback onConnect) 
-  : acceptor_(io_service_), onConnect_(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));
 }
 
-void SyncServer::onResolve(const SyncTcpConnection::proto::endpoint& e)
+SyncServer::~SyncServer()
 {
-  acceptor_.open(e.protocol());
-  acceptor_.set_option(boost::asio::socket_base::reuse_address(true));
-  acceptor_.bind(e);
-  acceptor_.listen();
+  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_);
+  }
+}
+
+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_) {
+      AnytunError::throwErr() << "memory error";
+    }
+
+    acceptor.acceptor_->open(e.protocol());
+#ifndef _MSC_VER
+    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);
+    acceptor.acceptor_->listen();
+    acceptor.started_ = false;
+
+    acceptors_.push_back(acceptor);
+
+    cLog.msg(Log::PRIO_NOTICE) << "sync server listening on " << e;
+
+    it++;
+  }
+
   start_accept();
   ready_sem_.up();
-  cLog.msg(Log::PRIO_NOTICE) << "sync server listening on " << e;
 }
 
 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()
@@ -68,24 +100,35 @@ 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()
 {
   Lock lock(mutex_);
-  SyncTcpConnection::pointer new_connection = SyncTcpConnection::create(acceptor_.io_service());
-  conns_.push_back(new_connection);
-  acceptor_.async_accept(new_connection->socket(),
-                         boost::bind(&SyncServer::handle_accept, this, new_connection, boost::asio::placeholders::error));
+
+  std::list<AcceptorsElement>::iterator it = acceptors_.begin();
+  for(; it != acceptors_.end(); ++it) {
+    if(!it->started_) {
+      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));
+      it->started_ = true;
+    }
+  }
 }
 
-void SyncServer::handle_accept(SyncTcpConnection::pointer new_connection, const boost::system::error_code& error)
+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_;
     new_connection->start();
+    it->started_ = false;
     start_accept();
   }
 }