X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsyncConnectionCommand.h;h=18870eb55fa2241cdfc968bec9d93477f4aa8ca8;hb=59f70c469910fe88a529c043ab0364ca5f8918b9;hp=5debf1fc36b8514e3b4dfbba41c50391d3273f54;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/syncConnectionCommand.h b/src/syncConnectionCommand.h
index 5debf1f..18870eb 100644
--- a/src/syncConnectionCommand.h
+++ b/src/syncConnectionCommand.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,11 +27,24 @@
  *  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 _SYNCCONNECTIONCOMMAND_H
-#define _SYNCCONNECTIONCOMMAND_H
+#ifndef ANYTUN_syncConnectionCommands_h_INCLUDED
+#define ANYTUN_syncConnectionCommands_h_INCLUDED
 
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/text_iarchive.hpp>
@@ -41,24 +55,23 @@
 class SyncConnectionCommand
 {
 public:
-	SyncConnectionCommand(ConnectionList & cl );
-	SyncConnectionCommand(ConnectionList & cl ,u_int16_t mux);
-	u_int16_t getMux() const;
+  SyncConnectionCommand(ConnectionList& cl);
+  SyncConnectionCommand(ConnectionList& cl ,uint16_t mux);
+  uint16_t getMux() const;
 
 private:
-	SyncConnectionCommand(const SyncConnectionCommand &);
-	ConnectionList & cl_;
-	u_int16_t mux_;
+  SyncConnectionCommand(const SyncConnectionCommand&);
+  ConnectionList& cl_;
+  uint16_t mux_;
   friend class boost::serialization::access;
   template<class Archive>
-  void serialize(Archive & ar, const unsigned int version)
-  {
-		Lock lock(cl_.getMutex());
-    ar & mux_;
-		ConnectionParam & conn = cl_.getOrNewConnectionUnlocked(mux_);
-		ar & conn;
-	}
+  void serialize(Archive& ar, const unsigned int version) {
+    Lock lock(cl_.getMutex());
+    ar& mux_;
+    ConnectionParam& conn = cl_.getOrNewConnectionUnlocked(mux_);
+    ar& conn;
+  }
 };
 
 
-#endif // _SYNCCOMMAND_H
+#endif