switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Packets / StringParser.hh

diff --git a/senf/Packets/StringParser.hh b/senf/Packets/StringParser.hh
index bc0ffb2..c35d7a4 100644 (file)
--- a/senf/Packets/StringParser.hh
+++ b/senf/Packets/StringParser.hh
@@ -1,24 +1,29 @@
 // $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>
 //
-// 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.de>
 
 /** \file
     \brief StringParser public header */
@@ -31,41 +36,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
 
 \f