X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6Extensions.cc;h=d9b1dc9f70130e947a2382633537cb00d9693ff2;hb=b490ccf2b17ccb29681e60b3e35aa5a949df3a10;hp=8a162b567e83f966af8c65ab461a17de422cfda3;hpb=ccff925ac3c102822a38617d00aef1bcf5217706;p=senf.git

diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.cc b/senf/Packets/DefaultBundle/IPv6Extensions.cc
index 8a162b5..d9b1dc9 100644
--- a/senf/Packets/DefaultBundle/IPv6Extensions.cc
+++ b/senf/Packets/DefaultBundle/IPv6Extensions.cc
@@ -26,8 +26,9 @@
 
 #include "IPv6Extensions.hh"
 //#include "IPv6Extensions.ih"
-#include <senf/Utils/hexdump.hh>
+
 // Custom includes
+#include <senf/Utils/hexdump.hh>
 
 //#include "IPv6Extensions.mpp"
 #define prefix_
@@ -43,50 +44,76 @@ namespace {
 prefix_ void senf::IPv6FragmentPacketType::dump(packet p, std::ostream & os)
 {
     os << "Internet protocol Version 6 fragment extension:\n"
-       <<     "  next header             : " << unsigned(p->nextHeader()) << "\n"
-       <<     "  fragment offset         : " << std::hex << unsigned(p->fragmentOffset()) << "\n"
-       <<     "  more fragments          : " << (p->moreFragments()?"yes":"no") << "\n"
-       <<     "  id                      : " << std::hex << unsigned(p->id()) << "\n";
+       << senf::fieldName("next header")               << unsigned(p->nextHeader()) << "\n"
+       << senf::fieldName("fragment offset")
+       << "0x" << std::hex << unsigned(p->fragmentOffset()) << "\n"
+       << senf::fieldName("more fragments")            << (p->moreFragments()?"yes":"no") << "\n"
+       << senf::fieldName("id")
+       << "0x" << std::hex << unsigned(p->id()) << "\n";
+}
+
+prefix_ void senf::IPv6FragmentPacketType::finalize(packet p)
+{
+    try {
+        p->nextHeader() << key(p.next());
+    }
+    catch (InvalidPacketChainException & ex) {
+        p->nextHeader() << 59; // No next header
+    }
 }
 
 prefix_ void senf::IPv6RoutingPacketType::dump(packet p, std::ostream & os)
 {
     os << "Internet protocol Version 6 routing extension:\n"
-       <<     "  next header             : " << unsigned (p->nextHeader()) << "\n"
-       <<     "  header length           : " << unsigned (p->headerLength()) << "\n"
-       <<     "  routing type            : " << unsigned (p->routingType()) << "\n"
-       <<     "  segments left           : " << unsigned (p->segmentsLeft()) << "\n"
-       <<     "  further Hop Addresses   : \n";
+       << senf::fieldName("next header")               << unsigned(p->nextHeader()) << "\n"
+       << senf::fieldName("header length")             << unsigned(p->headerLength()) << "\n"
+       << senf::fieldName("routing type")              << unsigned(p->routingType()) << "\n"
+       << senf::fieldName("segments left")             << unsigned(p->segmentsLeft()) << "\n"
+       << "  further Hop Addresses:\n";
     typedef IPv6RoutingPacket::Parser::hopAddresses_t::container addrContainer_t;
     addrContainer_t hopAddresses (p->hopAddresses());
     if ( p->segmentsLeft() != 0 )
         for (addrContainer_t::iterator i (hopAddresses.begin()); i != hopAddresses.end(); ++i)
-            os << *i << "\n";
+            os << "    " << *i << "\n";
+}
+
+prefix_ void senf::IPv6RoutingPacketType::finalize(packet p)
+{
+    try {
+        p->nextHeader() << key(p.next());
+    }
+    catch (InvalidPacketChainException & ex) {
+        p->nextHeader() << 59; // No next header
+    }
 }
 
 prefix_ void senf::IPv6HopByHopOptionsPacketType::dump(packet p, std::ostream & os)
 {
     os << "Internet protocol Version 6 Hop-By-Hop extension:\n"
-       <<     "  next header             : " << unsigned (p->nextHeader()) << "\n"
-       <<     "  header length           : " << unsigned (p->headerLength()) << "\n";
-    os <<     "  OptionTypes:\n";
+       << senf::fieldName("next header")               << unsigned(p->nextHeader()) << "\n"
+       << senf::fieldName("header length")             << unsigned(p->headerLength()) << "\n";
+    os << "  OptionTypes:\n";
     typedef IPv6HopByHopOptionsPacket::Parser::options_t::container optContainer_t;
     optContainer_t options (p->options());
-    optContainer_t::iterator optIter(options.begin());
-    for(; optIter != options.end(); ++optIter) {
-        os << "    AltAction             : " << (unsigned) optIter->altAction()
-           << "\n    ChangeFlag            : " << (unsigned) optIter->changeFlag()
-           << "\n    Option Type           : " << (unsigned) optIter->optionType()
-           << "\n    OptionLength          : " << (unsigned)  optIter->optionLength() <<"\n";
-        senf::hexdump(boost::begin(optIter->value()) , boost::end(optIter->value()), os );
+    for (optContainer_t::const_iterator i = options.begin(); i != options.end(); ++i)
+        i->dump( os);
+}
+
+prefix_ void senf::IPv6HopByHopOptionsPacketType::finalize(packet p)
+{
+    try {
+        p->nextHeader() << key(p.next());
+    }
+    catch (InvalidPacketChainException & ex) {
+        p->nextHeader() << 59; // No next header
     }
 }
 
 prefix_ void senf::IPv6DestinationOptionsPacketType::dump(packet p, std::ostream & os)
 {
     os << "Internet protocol Version 6 Destination Options extension:\n"
-       <<     "  next header             : " << unsigned (p->nextHeader()) << "\n"
-       <<     "  header length           : " << unsigned (p->headerLength()) << "\n";
+       << senf::fieldName("next header")               << unsigned (p->nextHeader()) << "\n"
+       << senf::fieldName("header length")             << unsigned (p->headerLength()) << "\n";
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////