X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6ExtOptionType.hh;h=db7468a8b127087cb29794e2e645c961e739a85e;hb=f723d7852a8195072eee387ea9ca77156b58438b;hp=9a88acbb841d64e23a3cc75ceaf358617baf7c02;hpb=51eaceeb2936c1e6a8fe8cc3c2dfdf28013b68f9;p=senf.git

diff --git a/senf/Packets/DefaultBundle/IPv6ExtOptionType.hh b/senf/Packets/DefaultBundle/IPv6ExtOptionType.hh
index 9a88acb..db7468a 100644
--- a/senf/Packets/DefaultBundle/IPv6ExtOptionType.hh
+++ b/senf/Packets/DefaultBundle/IPv6ExtOptionType.hh
@@ -37,47 +37,27 @@ namespace senf {
     {
     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 (IPv6OptionTLVParser);
+        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 IPv6GenericOptionTLVParser : public IPv6OptionTLVParser
-    {
-#       include SENF_PARSER()
-        SENF_PARSER_INHERIT ( IPv6OptionTLVParser );
-        SENF_PARSER_SKIP ( optionLength(), 0 );
-        SENF_PARSER_FINALIZE ( IPv6GenericOptionTLVParser );
-
-        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
 
+
 // Local Variables:
 // mode: c++
 // fill-column: 100