X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketParser.hh;h=fb41642b07f9a27f0a476f06dfd5a588cb52834a;hb=3bc817b121719fcb77f7d5adbd680a1190328ed6;hp=2e8547cbd05c6d2df776db688e114068d670c80f;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/Packets/PacketParser.hh b/senf/Packets/PacketParser.hh
index 2e8547c..fb41642 100644
--- a/senf/Packets/PacketParser.hh
+++ b/senf/Packets/PacketParser.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.be>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.be>
 
 /** \file
     \brief PacketParser public header */
@@ -164,7 +169,7 @@
 #include "SafeIterator.hh"
 
 //#include "PacketParser.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -213,7 +218,7 @@ namespace senf {
               // created data object. The default implementation just does nothing.
               void init() const;
 
-              // ////////////////////////////////////////////////////////////////////////
+              //-////////////////////////////////////////////////////////////////////////
 
               // Add here members returning (sub-)parsers for the fields. The 'parse' member is
               // used to construct the sub-parsers. This member either takes an iterator to the
@@ -238,7 +243,7 @@ namespace senf {
     class PacketParserBase
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
         typedef detail::packet::iterator data_iterator; ///< Raw data iterator type
@@ -248,17 +253,17 @@ namespace senf {
         typedef PacketData * state_type; ///< Type of the 'state' parameter
         typedef PacketParserBase parser_base_type; ///< Base type of the next parser
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         // no default constructor
         // default copy
         // default destructor
         // no conversion constructors
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         data_iterator i() const;        ///< Return beginning of data to parse
                                         /**< The parser is expected to interpret the data beginning
@@ -296,7 +301,7 @@ namespace senf {
             senf::safe_data_iterator safe_i_;
             mutable PacketParserBase const * parser_;
 
-            ParserProtector( PacketParserBase const * parser);
+            ParserProtector(PacketParserBase const * parser);
             ParserProtector(ParserProtector const & other_);
             ~ParserProtector();
         };
@@ -401,7 +406,7 @@ namespace senf {
         \ingroup packetparser
      */
     template <class Parser>
-    PacketParserBase::size_type bytes(Parser p);
+    PacketParserBase::size_type bytes(Parser const & p);
 
     namespace detail { template <class Parser> class ParserInitBytes; }
     namespace detail { template <class Parser> class ParserIsFixed; }
@@ -518,9 +523,25 @@ namespace senf {
         SENF_PARSER_FINALIZE(VoidPacketParser);
     };
 
+
+    template <class Parser, typename ValueType, PacketParserBase::size_type FixedBytes>
+    struct ValueParserBase : public PacketParserBase
+    {
+        typedef ValueParserBase<Parser, ValueType, FixedBytes> Base;
+
+        static size_type const fixed_bytes = FixedBytes;
+        typedef ValueType value_type;
+
+        ValueParserBase(data_iterator i, state_type s);
+
+        operator value_type () const;
+        byte & operator[](size_type index);
+        Parser const & operator= (value_type const & other);
+    };
+
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 #if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketParser_i_)
 #define HH_SENF_Packets_PacketParser_i_