X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsyncTcpConnection.cpp;h=9fe3dba17ea5b3c661f38d113f293abb02c1e5f7;hb=ad05e83616ca7c348db398c0fd6d5c4acce49fae;hp=17d3dddbb919338215af91f4a98c12be9d13d524;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/syncTcpConnection.cpp b/src/syncTcpConnection.cpp
index 17d3ddd..9fe3dba 100644
--- a/src/syncTcpConnection.cpp
+++ b/src/syncTcpConnection.cpp
@@ -6,19 +6,20 @@
  *  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-2008 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.
  *
  *  Anytun is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
+ *  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
@@ -26,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 "syncTcpConnection.h"
@@ -47,17 +61,25 @@ void SyncTcpConnection::start()
 
 void SyncTcpConnection::Send(std::string message)
 {
-    boost::asio::async_write(socket_, boost::asio::buffer(message),
-        boost::bind(&SyncTcpConnection::handle_write, shared_from_this(),
-          boost::asio::placeholders::error,
-          boost::asio::placeholders::bytes_transferred));
+  boost::asio::async_write(socket_, boost::asio::buffer(message),
+                           boost::bind(&SyncTcpConnection::handle_write, shared_from_this(),
+                                       boost::asio::placeholders::error,
+                                       boost::asio::placeholders::bytes_transferred));
+}
+
+#if BOOST_VERSION >= 107000
+SyncTcpConnection::SyncTcpConnection(const boost::asio::executor& executor)
+  : socket_(executor)
+{
 }
+#else
 SyncTcpConnection::SyncTcpConnection(boost::asio::io_service& io_service)
-	: socket_(io_service)
+  : socket_(io_service)
 {
 }
+#endif
 
 void SyncTcpConnection::handle_write(const boost::system::error_code& /*error*/,
-		size_t /*bytes_transferred*/)
+                                     size_t /*bytes_transferred*/)
 {
 }