X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6Extensions.cc;h=d579277416c4a32204e9524f2f534986593c6270;hb=2571369f6d1701b241a56a78c6a3d6d7569799c7;hp=0e39c654b66f665693866039534ae4a35c3c445c;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.cc b/senf/Packets/DefaultBundle/IPv6Extensions.cc
index 0e39c65..d579277 100644
--- a/senf/Packets/DefaultBundle/IPv6Extensions.cc
+++ b/senf/Packets/DefaultBundle/IPv6Extensions.cc
@@ -5,6 +5,7 @@
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //     Philipp Batroff <philipp.batroff@fokus.fraunhofer.de>
+//
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
@@ -27,58 +28,68 @@
 //#include "IPv6Extensions.ih"
 
 // Custom includes
+#include <senf/Utils/hexdump.hh>
 
 //#include "IPv6Extensions.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
 namespace {
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6Extension_Fragment>
-        registerIPv6ExtensionType_Fragment (44);
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6Extension_Routing>
-        registerIPv6ExtensionType_Routing (43);
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6Extension_HopByHop>
-        registerIPv6ExtensionType_HopByHop (0u);
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6Extension_Destination>
-        registerIPv6ExtensionType_Destination (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::IPv6ExtensionType_Fragment::dump(packet p, std::ostream & os)
+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::IPv6ExtensionType_Routing::dump(packet p, std::ostream & os)
+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";
-    IPv6Extension_Routing::Parser::hopAddresses_t::container hopAddresses (p->hopAddresses());
-    os <<     "  further Hop Addresses   : \n";
-        if ( p->segmentsLeft() != 0 ){
-            for (IPv6Extension_Routing::Parser::hopAddresses_t::container::iterator i (hopAddresses.begin()); i != hopAddresses.end(); ++i)
-                os << *i << "\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";
 }
 
-prefix_ void senf::IPv6ExtensionType_HopByHop::dump(packet p, std::ostream & os)
+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";
+       << 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 << senf::fieldName("  AltAction")           << unsigned(optIter->altAction()) << "\n"
+           << senf::fieldName("  ChangeFlag")          << unsigned(optIter->changeFlag()) << "\n"
+           << senf::fieldName("  Option Type")         << unsigned(optIter->optionType()) << "\n"
+           << senf::fieldName("  length")              << unsigned(optIter->length()) <<"\n";
+        senf::hexdump(boost::begin(optIter->value()) , boost::end(optIter->value()), os );
+    }
 }
 
-prefix_ void senf::IPv6ExtensionType_Destination::dump(packet p, std::ostream & 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////////////////////////////////////////