X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FNDPOptions.cc;h=bd565348ec43f6c2a45edd703e280cd13308a7cc;hb=5cb66935d4b2973ea0fe7487b862b9ddc31648f4;hp=88a0a360a8fb7d860ab2f58c6d31e0b3d62a89e4;hpb=209950ee5f6898978cd68614ef339ae3531c5c53;p=senf.git

diff --git a/senf/Packets/DefaultBundle/NDPOptions.cc b/senf/Packets/DefaultBundle/NDPOptions.cc
index 88a0a36..bd56534 100644
--- a/senf/Packets/DefaultBundle/NDPOptions.cc
+++ b/senf/Packets/DefaultBundle/NDPOptions.cc
@@ -1,6 +1,6 @@
-// $Id: ICMPv6TypePacket.cc 1450 2009-09-28 09:39:01Z tho $
+// $Id$
 //
-// Copyright (C) 2008
+// Copyright (C) 2010
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Sauer <ssauer@berlios.de>
@@ -23,53 +23,47 @@
 // Definition of non-inline non-template functions
 
 // Custom includes
-#include <senf/Packets/Packets.hh>
-#include "ICMPv6Packet.hh"
-#include "ICMPv6TypePacket.hh"
 #include "NDPOptions.hh"
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
-
-namespace {
-    SENF_PACKET_TLV_REGISTRY_REGISTER( senf::NDPSourceLLAddressTLVParser );
-    SENF_PACKET_TLV_REGISTRY_REGISTER( senf::NDPTargetLLAddressTLVParser );
-    SENF_PACKET_TLV_REGISTRY_REGISTER( senf::NDPPrefixInformationTLVParser );
-    SENF_PACKET_TLV_REGISTRY_REGISTER( senf::NDPMTUTLVParser );
-}
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+SENF_PACKET_TLV_REGISTRY_REGISTER( senf::NDPSourceLLAddressTLVParser );
+SENF_PACKET_TLV_REGISTRY_REGISTER( senf::NDPTargetLLAddressTLVParser );
+SENF_PACKET_TLV_REGISTRY_REGISTER( senf::NDPPrefixInformationTLVParser );
+SENF_PACKET_TLV_REGISTRY_REGISTER( senf::NDPMTUTLVParser );
 
 prefix_ void senf::NDPSourceLLAddressTLVParser::dump(std::ostream & os) const
 {
-    os << senf::fieldName("    Source Link-layer Address") << "\n";
-    os << senf::fieldName("      Link-layer Address")      << source() << "\n";
+    os << "Source Link-layer Address Option:" << "\n";
+    os << senf::fieldName("Link-layer Address") << source() << "\n";
 }
 
 prefix_ void senf::NDPTargetLLAddressTLVParser::dump(std::ostream & os) const
 {
-    os << senf::fieldName("    Target Link-layer Address") << "\n";
-    os << senf::fieldName("      Link-layer Address")      << target() << "\n";
+    os << "Target Link-layer Address Option:" << "\n";
+    os << senf::fieldName("Link-layer Address") << target() << "\n";
 }
 
 prefix_ void senf::NDPPrefixInformationTLVParser::dump(std::ostream & os) const
 {
-    os << senf::fieldName("    Prefix Information") << "\n";
-    os << senf::fieldName("      Prefix Length")                         << unsigned(prefixLength()) << "\n";
-    os << senf::fieldName("      On-link Flag")                          << unsigned(l()) << "\n";
-    os << senf::fieldName("      Autonomous Address-configuration Flag") << unsigned(a()) << "\n";
-    os << senf::fieldName("      Reserved(6Bit)")                        << unsigned(reserved1()) << "\n";
-    os << senf::fieldName("      Valid Lifetime")                        << unsigned(validLifetime()) << "\n";
-    os << senf::fieldName("      Preferred Lifetime")                    << unsigned(preferredLifetime()) << "\n";
-    os << senf::fieldName("      Reserved(32Bit)")                       << unsigned(reserved2()) << "\n";
-    os << senf::fieldName("      Prefix")                                << prefix() << "\n";
+    os << "Prefix Information Option:" << "\n";
+    os << senf::fieldName("Prefix Length")                         << unsigned(prefixLength()) << "\n";
+    os << senf::fieldName("On-link Flag")                          << unsigned(l()) << "\n";
+    os << senf::fieldName("Autonomous Address-configuration Flag") << unsigned(a()) << "\n";
+    os << senf::fieldName("Reserved(6Bit)")                        << unsigned(reserved1()) << "\n";
+    os << senf::fieldName("Valid Lifetime")                        << unsigned(validLifetime()) << "\n";
+    os << senf::fieldName("Preferred Lifetime")                    << unsigned(preferredLifetime()) << "\n";
+    os << senf::fieldName("Reserved(32Bit)")                       << unsigned(reserved2()) << "\n";
+    os << senf::fieldName("Prefix")                                << prefix() << "\n";
 
 }
 
 prefix_ void senf::NDPMTUTLVParser::dump(std::ostream & os) const
 {
-    os << senf::fieldName("    MTU Information") << "\n";
-    os << senf::fieldName("      MTU")      << unsigned(mtu()) << "\n";
+    os << "MTU Information Option:" << "\n";
+    os << senf::fieldName("MTU") << unsigned(mtu()) << "\n";
 }
 
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_