X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FseqWindow.h;h=fa6adaaaaf028f94de067f65185baaa3590aeb88;hb=bd02a5f6be4815d46524d613f727199ca756c971;hp=e16e3351208d3c3c3513d45b3c1cc01c0efe8825;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git diff --git a/src/seqWindow.h b/src/seqWindow.h index e16e335..fa6adaa 100644 --- a/src/seqWindow.h +++ b/src/seqWindow.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 _SEQ_WINDOW_H_ -#define _SEQ_WINDOW_H_ +#ifndef ANYTUN_seqWindow_h_INCLUDED +#define ANYTUN_seqWindow_h_INCLUDED #include #include @@ -41,7 +42,8 @@ class SeqWindow; -class SeqWindowElement { +class SeqWindowElement +{ public: SeqWindowElement(); ~SeqWindowElement(); @@ -50,7 +52,7 @@ public: seq_nr_t max_; window_size_t pos_; - u_int8_t* window_; + uint8_t* window_; }; class SeqWindow @@ -70,21 +72,20 @@ private: Mutex mutex_; SenderMap sender_; - SeqWindow(const SeqWindow &s); - void operator=(const SeqWindow &s); + SeqWindow(const SeqWindow& s); + void operator=(const SeqWindow& s); - friend class boost::serialization::access; - template - void serialize(Archive & ar, const unsigned int version) - { - Lock lock(mutex_); - //unsigned int serial = (unsigned int) window_size_; - //window_size_t serial = (window_size_t) window_size_; - ar & window_size_; - //TODO: Do not sync complete Sender Map! - // ar & sender_; + friend class boost::serialization::access; + template + void serialize(Archive& ar, const unsigned int version) { + Lock lock(mutex_); + //unsigned int serial = (unsigned int) window_size_; + //window_size_t serial = (window_size_t) window_size_; + ar& window_size_; + //TODO: Do not sync complete Sender Map! + // ar & sender_; } - + };