X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FStringParser.hh;h=e44560e876d3408ee9e630c4be836ba34a96f5f0;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=bc0ffb27a62eab094a116309cecc4c0c3d77676e;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/StringParser.hh b/senf/Packets/StringParser.hh
index bc0ffb2..e44560e 100644
--- a/senf/Packets/StringParser.hh
+++ b/senf/Packets/StringParser.hh
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -31,41 +31,47 @@
 #endif
 
 // Custom includes
+#include "IntParser.hh"
 
 //#include "StringParser.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
-    
-    struct StringParser
+
+    template <class LengthParser=senf::UInt16Parser>
+    class StringParser
         : public PacketParserBase
     {
-
+    public:
         StringParser(data_iterator i, state_type s);
 
         ///////////////////////////////////////////////////////////////////////////
 
+#       include SENF_PARSER()
+        SENF_PARSER_PRIVATE_FIELD ( length, LengthParser );
+
         typedef std::string value_type;
-        static const size_type init_bytes = 2;
+        static const size_type init_bytes = senf::init_bytes<LengthParser>::value;
         size_type bytes() const;
-        
+
         value_type value() const;
         void value(value_type v);
         operator value_type() const;
         StringParser const & operator=(value_type other);
     };
 
-    std::ostream & operator<<(std::ostream & os, StringParser const & value);
-    
+    template <class LengthParser>
+    std::ostream & operator<<(std::ostream & os, StringParser<LengthParser> const & value);
+
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
 #if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_StringParser_i_)
 #define HH_SENF_Packets_StringParser_i_
-#include "StringParser.cci"
+//#include "StringParser.cci"
 //#include "StringParser.ct"
-//#include "StringParser.cti"
+#include "StringParser.cti"
 #endif