Move include files in debian packge into 'senf' subdirectory

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

diff --git a/Packets/DefaultBundle/IpV6Packet.cc b/Packets/DefaultBundle/IpV6Packet.cc
index 318b84e..2cf67b2 100644 (file)
--- a/Packets/DefaultBundle/IpV6Packet.cc
+++ b/Packets/DefaultBundle/IpV6Packet.cc
@@ -25,8 +25,9 @@
 //#include "IpV6Packet.ih"
 
 // Custom includes
+#include <boost/io/ios_state.hpp>
 #include "EthernetPacket.hh"
-#include "Socket/INetAddressing.hh"
+#include "../../Socket/Protocols/INet/INetAddressing.hh"
 
 //#include "IpV6Packet.mpp"
 #define prefix_
@@ -43,27 +44,18 @@ namespace {
         registerNoNextHeader (59);
 }
 
-prefix_ void senf::IpV6Packet::v_nextInterpreter()
-    const
-{
-    registerInterpreter(nextHeader(),begin()+bytes(),end());
-}
-
-prefix_ void senf::IpV6Packet::v_finalize()
-{}
-
-prefix_ void senf::IpV6Packet::v_dump(std::ostream & os)
-    const
+prefix_ void senf::IpV6PacketType::dump(packet p, std::ostream & os)
 {
+    boost::io::ios_all_saver ias(os);
     os << "Internet protocol Version 6:\n"
-       << "  version       : " << unsigned(version()) << "\n"
-       << "  traffic class : " << std::hex << unsigned(trafficClass()) << "\n"
-       << "  flow label    : " << std::hex << unsigned(flowLabel()) << "\n"
-       << "  length        : " << std::dec << unsigned(length()) << "\n"
-       << "  next header   : " << unsigned(nextHeader()) << "\n"
-       << "  hop limit     : " << unsigned(hopLimit()) << "\n"
-       << "  source        : " << INet6Address(source().range()) << "\n"
-       << "  destination   : " << INet6Address(destination().range()) << "\n";
+       << "  version       : " << unsigned(p->version()) << "\n"
+       << "  traffic class : " << std::hex << unsigned(p->trafficClass()) << "\n"
+       << "  flow label    : " << std::hex << unsigned(p->flowLabel()) << "\n"
+       << "  length        : " << std::dec << unsigned(p->length()) << "\n"
+       << "  next header   : " << unsigned(p->nextHeader()) << "\n"
+       << "  hop limit     : " << unsigned(p->hopLimit()) << "\n"
+       << "  source        : " << p->source() << "\n"
+       << "  destination   : " << p->destination() << "\n";
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////
@@ -78,4 +70,5 @@ prefix_ void senf::IpV6Packet::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End: