X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsyncBuffer.h;h=b68e9f516dd4d26f3c32759d546317566d446c5a;hb=bd02a5f6be4815d46524d613f727199ca756c971;hp=f5e2ff5236f10f5e56956daecb810dbee7d0c8bc;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git diff --git a/src/syncBuffer.h b/src/syncBuffer.h index f5e2ff5..b68e9f5 100644 --- a/src/syncBuffer.h +++ b/src/syncBuffer.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 * * 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 @@ -29,8 +30,8 @@ * along with anytun. If not, see . */ -#ifndef _SYNCBUFFER_H_ -#define _SYNCBUFFER_H_ +#ifndef ANYTUN_syncBuffer_h_INCLUDED +#define ANYTUN_syncBuffer_h_INCLUDED #include #include @@ -42,23 +43,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 - 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 + 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