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

diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.cc b/senf/Packets/DefaultBundle/IPv6Extensions.cc
index ca4b9d7..8a162b5 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
@@ -25,7 +26,7 @@
 
 #include "IPv6Extensions.hh"
 //#include "IPv6Extensions.ih"
-
+#include <senf/Utils/hexdump.hh>
 // Custom includes
 
 //#include "IPv6Extensions.mpp"
@@ -33,17 +34,13 @@
 ///////////////////////////////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"
@@ -52,35 +49,40 @@ prefix_ void senf::IPv6ExtensionType_Fragment::dump(packet p, std::ostream & os)
        <<     "  id                      : " << 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";
-        }
+       <<     "  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";
-       os << "OptionTypes:\n";
-       IPv6Extension_HopByHop::Parser::options_t::container options (p->options());
-       IPv6Extension_HopByHop::Parser::options_t::container::iterator optIter(options.begin());
-       for(;optIter != options.end(); ++ optIter)
-           os << "Option Type:\t" << (unsigned) optIter->optionType()
-             << "\nOptionLength:\t" << (unsigned)  optIter->optionLength() <<"\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 );
+    }
 }
 
-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"