Packets/80221Bundle: more GenericTLVBase integration; removed GenericTLVPacket; some...

[senf.git] / senf / Packets / DefaultBundle / IPv6ExtOptionType.hh

diff --git a/senf/Packets/DefaultBundle/IPv6ExtOptionType.hh b/senf/Packets/DefaultBundle/IPv6ExtOptionType.hh
index 0811d11..db7468a 100644 (file)
--- a/senf/Packets/DefaultBundle/IPv6ExtOptionType.hh
+++ b/senf/Packets/DefaultBundle/IPv6ExtOptionType.hh
@@ -33,51 +33,31 @@
 ///////////////////////////////hh.p////////////////////////////////////////
 namespace senf {
 
-    class OptTypeTLVParser : public PacketParserBase
+    class IPv6OptionTLVParser : public PacketParserBase
     {
     public:
 #       include SENF_PARSER()
-        SENF_PARSER_BITFIELD (altAction,  2, unsigned);
-        SENF_PARSER_BITFIELD (changeFlag, 1, unsigned);
-        SENF_PARSER_BITFIELD (optionType, 5, unsigned);
-        SENF_PARSER_FIELD (optionLength, UInt8Parser);
-        SENF_PARSER_FINALIZE (OptTypeTLVParser);
+        SENF_PARSER_FIELD ( type, UInt8Parser );
+        SENF_PARSER_GOTO ( type );
+        SENF_PARSER_BITFIELD ( altAction,  2, unsigned );
+        SENF_PARSER_BITFIELD ( changeFlag, 1, unsigned );
+        SENF_PARSER_BITFIELD ( optionType, 5, unsigned );
+        SENF_PARSER_FIELD (length, UInt8Parser );
+        SENF_PARSER_FINALIZE (IPv6OptionTLVParser );
     };
 
-    struct GenericOptTypeTLVParser : public OptTypeTLVParser
-    {
-#       include SENF_PARSER()
-        SENF_PARSER_INHERIT ( OptTypeTLVParser );
-        SENF_PARSER_SKIP ( optionLength(), 0 );
-        SENF_PARSER_FINALIZE ( GenericOptTypeTLVParser );
-
-        senf::PacketInterpreterBase::range value() const;
-
-        template <class Parser>
-        Parser& init();
-
-    //     template <class Parser>
-    //     Parser& get();
-
-        static const unsigned int typeCode = 7u;
-
-        template<class ForwardReadableRange>
-        void value(ForwardReadableRange const &range);
-
-        template<class ForwardReadableRange>
-        void setPayload(ForwardReadableRange const &range);
-
-    };
+    typedef GenericTLVParserBase<IPv6OptionTLVParser> IPv6GenericOptionTLVParser;
 
 }
 
 
 ///////////////////////////////hh.e////////////////////////////////////////
 //#include "IPv6ExtOptionType.cci"
-#include "IPv6ExtOptionType.ct"
+//#include "IPv6ExtOptionType.ct"
 //#include "IPv6ExtOptionType.cti"
 #endif
 
+\f
 // Local Variables:
 // mode: c++
 // fill-column: 100