X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketData.hh;h=05e5aa892b9d021110905d419ae9a836c6c50b8f;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=6530bfc9f06199ee28c6e9317c15736b3420f013;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git diff --git a/Packets/PacketData.hh b/Packets/PacketData.hh index 6530bfc..05e5aa8 100644 --- a/Packets/PacketData.hh +++ b/Packets/PacketData.hh @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -23,14 +23,14 @@ /** \file \brief PacketData public header */ -#ifndef HH_PacketData_ -#define HH_PacketData_ 1 +#ifndef HH_SENF_Packets_PacketData_ +#define HH_SENF_Packets_PacketData_ 1 // Custom includes #include #include -#include #include "../Utils/safe_bool.hh" +#include "../Utils/Exception.hh" #include "PacketTypes.hh" //#include "PacketData.mpp" @@ -97,18 +97,19 @@ namespace senf { ///\name Sequence interface to raw data ///@{ - iterator begin() const; /**< Returns an random access iterator referring - to the first byte of the packet data. */ - iterator end() const; /**< Returns an random access iterator referring to the - element past the end of the packet data. */ + iterator begin() const; ///< Return iterator to beginning + /**< Returns an random access iterator referring to the + first byte of the packet data. */ + iterator end() const; ///< Return iterator to end + /**< Returns an random access iterator referring to the + byte past the end of the packet data. */ size_type size() const; ///< Returns the number of bytes in the packet data. bool empty() const; ///< Test whether the packet data is empty. - /**< Returns whether the packet data is empty, i.e. - whether its size is 0. This function does not modify - the content of the packet data in any way. To clear - the content use clear() */ - byte operator[](size_type n) const; - byte & operator[](size_type n); + /**< Returns whether the packet data is empty, i.e. whether its size + is 0. This function does not modify the content of the packet + data in any way. To clear the content use clear() */ + byte operator[](size_type n) const; ///< Access byte in the packet data + byte & operator[](size_type n); ///< Access byte in the packet data // Modifying the raw packet data @@ -128,11 +129,13 @@ namespace senf { void erase(iterator pos); void erase(iterator first, iterator last); - void clear(); /**< All bytes of the packet data dropped, - leaving the container with a size of 0. */ + void clear(); ///< All bytes of the packet data dropped, leaving the container with a size of 0. */ void resize(size_type n, byte v=0); + void reserve(size_type n); + size_type capacity() const; + ///@} protected: @@ -159,76 +162,15 @@ namespace senf { This exception is signaled whenever an operation tries to access an out-of-bounds data byte. If the packet has been implemented correctly, this signals a malformed packet. */ - struct TruncatedPacketException : public std::exception - { virtual char const * what() const throw() { return "truncated packet"; } }; - - /** \brief Re-validating data iterator - - This class is a wrapper around a PacketData::iterator instance. It will revalidate the - iterator on every access. This keeps the iterator valid even when the data container is - resized and thereby possibly relocated. The iterator will always point to the byte at the - same offset from the packets beginning. If data is inserted before this iterators position, - the data pointed to will of course change. - - For this to work, the safe_data_iterator must be initialized with the container to which the - iterator belongs. After this initialization it can be used like any other iterator. - */ - class safe_data_iterator - : public boost::iterator_facade< safe_data_iterator, - PacketData::value_type, - boost::random_access_traversal_tag >, - public comparable_safe_bool - { - public: - typedef PacketData::size_type size_type; - - safe_data_iterator(); ///< Make uninitialized iterator - explicit safe_data_iterator(PacketData & data); - ///< Construct iterator only setting the data container - safe_data_iterator(PacketData & data, PacketData::iterator i); - ///< Initialize iterator to given position - explicit safe_data_iterator(PacketParserBase const & parser); - ///< Initialize iterator from parser - /**< The iterator will point to the parsers start - position. */ - - safe_data_iterator & operator=(PacketData::iterator i); ///< Assign iterator - /**< The iteator \a i must be from the container wo which \c - this iterator has been initialized. */ - safe_data_iterator & operator=(PacketParserBase const & parser); - ///< Assign iterator from parser - /**< The iterator will point to the parser start - position. */ + struct TruncatedPacketException : public senf::Exception + { TruncatedPacketException() : senf::Exception("truncated packet"){} }; - operator PacketData::iterator() const; ///< Convert to iterator - - bool boolean_test() const; ///< Check, if iterator is initialized - - PacketData & data() const; ///< Access data container - - private: - friend class boost::iterator_core_access; - - // iterator_facade interface - - value_type & dereference() const; - bool equal(safe_data_iterator const & other) const; - difference_type distance_to(safe_data_iterator const & other) const; - void increment(); - void decrement(); - void advance(difference_type n); - - PacketData::iterator i() const; - - PacketData * data_; - size_type i_; - }; } ///////////////////////////////hh.e//////////////////////////////////////// #endif -#if !defined(HH_Packets__decls_) && !defined(HH_PacketData_i_) -#define HH_PacketData_i_ +#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketData_i_) +#define HH_SENF_Packets_PacketData_i_ #include "PacketData.cci" //#include "PacketData.ct" #include "PacketData.cti"