Fix documentation build under maverick (doxygen 1.7.1)

[senf.git] / senf / Packets / DefaultBundle / IPv6Extensions.cc

diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.cc b/senf/Packets/DefaultBundle/IPv6Extensions.cc
index d9b1dc9..a777f6f 100644 (file)
--- a/senf/Packets/DefaultBundle/IPv6Extensions.cc
+++ b/senf/Packets/DefaultBundle/IPv6Extensions.cc
@@ -32,7 +32,7 @@
 
 //#include "IPv6Extensions.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 44,  senf::IPv6FragmentPacket           );
@@ -91,7 +91,7 @@ prefix_ void senf::IPv6HopByHopOptionsPacketType::dump(packet p, std::ostream &
 {
     os << "Internet protocol Version 6 Hop-By-Hop extension:\n"
        << senf::fieldName("next header")               << unsigned(p->nextHeader()) << "\n"
-       << senf::fieldName("header length")             << unsigned(p->headerLength()) << "\n";
+       << senf::fieldName("header length")             << unsigned(p->headerLength()) <<" ("<< unsigned((1+p->headerLength())*8)<< ")\n";
     os << "  OptionTypes:\n";
     typedef IPv6HopByHopOptionsPacket::Parser::options_t::container optContainer_t;
     optContainer_t options (p->options());
@@ -114,9 +114,25 @@ prefix_ void senf::IPv6DestinationOptionsPacketType::dump(packet p, std::ostream
     os << "Internet protocol Version 6 Destination Options extension:\n"
        << senf::fieldName("next header")               << unsigned (p->nextHeader()) << "\n"
        << senf::fieldName("header length")             << unsigned (p->headerLength()) << "\n";
+    os << "  OptionTypes:\n";
+    typedef IPv6DestinationOptionsPacket::Parser::options_t::container optContainer_t;
+    optContainer_t options (p->options());
+    for (optContainer_t::const_iterator i = options.begin(); i != options.end(); ++i)
+        i->dump( os);
+}
+
+prefix_ void senf::IPv6DestinationOptionsPacketType::finalize(packet p)
+{
+    try {
+        p->nextHeader() << key(p.next());
+    }
+    catch (InvalidPacketChainException & ex) {
+        p->nextHeader() << 59; // No next header
+    }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "IPv6Extensions.mpp"