X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6Extensions.cc;h=6e8d71453c956ecc73d07eafd70c6d5addca7e41;hb=4a99bad0289a65567e85cb51bd357a34562b2c04;hp=270a307df33bb4256922cc912f7dba9fea5a719b;hpb=328a72eb2f360d08f2d618ef6aae2ac6b42d76ab;p=senf.git

diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.cc b/senf/Packets/DefaultBundle/IPv6Extensions.cc
index 270a307..6e8d714 100644
--- a/senf/Packets/DefaultBundle/IPv6Extensions.cc
+++ b/senf/Packets/DefaultBundle/IPv6Extensions.cc
@@ -26,71 +26,64 @@
 
 #include "IPv6Extensions.hh"
 //#include "IPv6Extensions.ih"
-#include <senf/Utils/hexdump.hh>
+
 // Custom includes
+#include <senf/Utils/hexdump.hh>
 
 //#include "IPv6Extensions.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
 namespace {
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6FragmentPacket>
-        registerIPv6FragmentPacketType (44);
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6RoutingPacket>
-        registerIPv6RoutingPacketType (43);
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6HopByHopOptionsPacket>
-        registerIPv6HopByHopOptionsPacketType (0u);
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6DestinationOptionsPacket>
-        registerIPv6DestinationOptionsPacketType (60u);
+    SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 44,  senf::IPv6FragmentPacket           );
+    SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 43,  senf::IPv6RoutingPacket            );
+    SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 0u,  senf::IPv6HopByHopOptionsPacket    );
+    SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 60u, senf::IPv6DestinationOptionsPacket );
 }
 
 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::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::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::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////////////////////////////////////////