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

diff --git a/senf/Packets/DefaultBundle/NDPOptions.cc b/senf/Packets/DefaultBundle/NDPOptions.cc
index cc46aca..bd56534 100644
--- a/senf/Packets/DefaultBundle/NDPOptions.cc
+++ b/senf/Packets/DefaultBundle/NDPOptions.cc
@@ -26,47 +26,44 @@
 #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_