X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsyncBuffer.h;h=52dafcacc52513dcc67df3cfb024377a1f1e826e;hb=326bc57905738d0bd416ce3d0d7cc79b14ef7a4a;hp=f5e2ff5236f10f5e56956daecb810dbee7d0c8bc;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/syncBuffer.h b/src/syncBuffer.h
index f5e2ff5..52dafca 100644
--- a/src/syncBuffer.h
+++ b/src/syncBuffer.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 _SYNCBUFFER_H_
-#define _SYNCBUFFER_H_
+#ifndef ANYTUN_syncBuffer_h_INCLUDED
+#define ANYTUN_syncBuffer_h_INCLUDED
 
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/text_iarchive.hpp>
@@ -42,23 +56,23 @@
 class SyncBuffer : public Buffer
 {
 public:
-		SyncBuffer() : Buffer(){};
-		SyncBuffer(u_int32_t length) : Buffer(length){};
-		SyncBuffer(Buffer b): Buffer(b) {};
-		SyncBuffer(u_int8_t* data, u_int32_t length): Buffer(data,length) {};
-		SyncBuffer(const SyncBuffer & src) : Buffer(src) {};
+  SyncBuffer() : Buffer() {};
+  SyncBuffer(uint32_t length) : Buffer(length) {};
+  SyncBuffer(Buffer b): Buffer(b) {};
+  SyncBuffer(uint8_t* data, uint32_t length): Buffer(data,length) {};
+  SyncBuffer(const SyncBuffer& src) : Buffer(src) {};
 private:
-//TODO check if this is ok
-//  Mutex mutex_;
-	friend class boost::serialization::access;
-	template<class Archive>
-	void serialize(Archive & ar, const unsigned int version)
-	{
-//		Lock lock(mutex_);
-    ar & length_;
-		for(u_int32_t i = 0; i < length_; i++)
-			ar & (*this)[i];
-	}
+  //TODO check if this is ok
+  //  Mutex mutex_;
+  friend class boost::serialization::access;
+  template<class Archive>
+  void serialize(Archive& ar, const unsigned int version) {
+    //		Lock lock(mutex_);
+    ar& length_;
+    for(uint32_t i = 0; i < length_; i++) {
+      ar & (*this)[i];
+    }
+  }
 };
 
 #endif