X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FconnectionParam.h;h=563391ca2ba015b7d508d6d2e36ca181d11e5106;hb=bd02a5f6be4815d46524d613f727199ca756c971;hp=f929211329344f7cbef48b5865ea3d83b8202a90;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/connectionParam.h b/src/connectionParam.h
index f929211..563391c 100644
--- a/src/connectionParam.h
+++ b/src/connectionParam.h
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 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
@@ -28,9 +29,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#ifndef _CONNECTIONPARAM_H_
-#define _CONNECTIONPARAM_H_
+#ifndef ANYTUN_connectionParam_h_INCLUDED
+#define ANYTUN_connectionParam_h_INCLUDED
 
 #include "keyDerivation.h"
 #include "seqWindow.h"
@@ -44,36 +44,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