Imported Upstream version 0.3.5

[anytun.git] / src / connectionParam.h

diff --git a/src/connectionParam.h b/src/connectionParam.h
index f929211..58984b6 100644 (file)
--- a/src/connectionParam.h
+++ b/src/connectionParam.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 _CONNECTIONPARAM_H_
-#define _CONNECTIONPARAM_H_
+#ifndef ANYTUN_connectionParam_h_INCLUDED
+#define ANYTUN_connectionParam_h_INCLUDED
 
 #include "keyDerivation.h"
 #include "seqWindow.h"
@@ -44,36 +58,36 @@
 class ConnectionParam
 {
 public:
-       ConnectionParam(const ConnectionParam & src);
-       ConnectionParam( KeyDerivation& kd, SeqWindow& seq_window, seq_nr_t seq_nr_, PacketSourceEndpoint remote_end);
+  ConnectionParam(const ConnectionParam& src);
+  ConnectionParam(KeyDerivation& kd, SeqWindow& seq_window, seq_nr_t seq_nr_, PacketSourceEndpoint remote_end);
 
   KeyDerivation& kd_;
   SeqWindow& seq_window_;
-       seq_nr_t seq_nr_;
-       PacketSourceEndpoint remote_end_;
+  seq_nr_t seq_nr_;
+  PacketSourceEndpoint remote_end_;
 
 private:
   //TODO: check if this is ok
-       Mutex mutex_;
+  Mutex mutex_;
   friend class boost::serialization::access;
   template<class Archive>
-  void serialize(Archive & ar, const unsigned int version)
-       {
-               Lock lock(mutex_);
-               std::string remote_host(remote_end_.address().to_string());
-               u_int16_t remote_port = remote_end_.port();
-               ar & kd_;
-    ar & seq_window_;
-    ar & seq_nr_;
-    ar & remote_host;
-    ar & remote_port;
-               PacketSourceEndpoint emptyEndpoint;
-               UDPPacketSource::proto::endpoint endpoint(boost::asio::ip::address::from_string(remote_host), remote_port);
-               //This is a workarround, against race condition in sync process
-               //TODO: find a better solution
-               if (endpoint != emptyEndpoint && remote_host != "::" && remote_host != "[::]" && remote_host != "0.0.0.0")
-                       remote_end_ = endpoint;
-       }
+  void serialize(Archive& ar, const unsigned int version) {
+    Lock lock(mutex_);
+    std::string remote_host(remote_end_.address().to_string());
+    uint16_t remote_port = remote_end_.port();
+    ar& kd_;
+    ar& seq_window_;
+    ar& seq_nr_;
+    ar& remote_host;
+    ar& remote_port;
+    PacketSourceEndpoint emptyEndpoint;
+    UDPPacketSource::proto::endpoint endpoint(boost::asio::ip::address::from_string(remote_host), remote_port);
+    //This is a workarround, against race condition in sync process
+    //TODO: find a better solution
+    if(endpoint != emptyEndpoint && remote_host != "::" && remote_host != "[::]" && remote_host != "0.0.0.0") {
+      remote_end_ = endpoint;
+    }
+  }
 };
 
 #endif