Packets/GenericTLV: fix for dynamic size length fields (doh)

[senf.git] / senf / Packets / GenericTLV.cti

diff --git a/senf/Packets/GenericTLV.cti b/senf/Packets/GenericTLV.cti
index 913ef63..de01ab2 100644 (file)
--- a/senf/Packets/GenericTLV.cti
+++ b/senf/Packets/GenericTLV.cti
@@ -33,7 +33,7 @@
 template <class Base>
 prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserBase<Base>::bytes()
 {
-    return senf::init_bytes<Base>::value + this->length();
+    return senf::bytes(self()) + this->length();
 }
 
 template <class Base>
@@ -57,6 +57,19 @@ prefix_ bool senf::GenericTLVParserBase<Base>::is()
     return this->type().value() == Parser::TYPEID;
 }
 
+template <class Base>
+prefix_ Base & senf::GenericTLVParserBase<Base>::self()
+{
+    return *static_cast<Base *>(this);
+}
+
+template <class Base>
+prefix_ Base const & senf::GenericTLVParserBase<Base>::self()
+    const
+{
+    return *static_cast<Base const *>(this);
+}
+
 #ifndef DOXYGEN
 
 template <class Base>