Imported Upstream version 0.3.5

[anytun.git] / src / syncClient.h

diff --git a/src/syncClient.h b/src/syncClient.h
index 08b3015..3f76dd4 100644 (file)
--- a/src/syncClient.h
+++ b/src/syncClient.h
@@ -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,24 +27,38 @@
  *  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.
  */
-#ifndef _SYNCCLIENT_H
-#define _SYNCCLIENT_H
+
+#ifndef ANYTUN_syncClient_h_INCLUDED
+#define ANYTUN_syncClient_h_INCLUDED
 
 #include <string>
 #include "syncTcpConnection.h"
 class SyncClient
 {
 public:
-       SyncClient(std::string hostname,std::string port);
+  SyncClient(std::string hostname,std::string port);
 
-       void run();
+  void run();
 private:
-       void readAndProcess(SyncTcpConnection::proto::socket & socket);
-       void readExactly(SyncTcpConnection::proto::socket & socket,size_t toread, std::iostream &);
-       std::string hostname_;
-       std::string port_;
+  void readAndProcess(SyncTcpConnection::proto::socket& socket);
+  void readExactly(SyncTcpConnection::proto::socket& socket,size_t toread, std::iostream&);
+  std::string hostname_;
+  std::string port_;
 };