X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FICMPv6TypePacket.cc;h=c7f18c01bbcf858d7aac0040fa2a2208fd505aaf;hb=9762e8c5d2f6c1264ba97acd3e589f6fa8f522c6;hp=e75612ee6f270b1e8c08aa17b1af9e235d68fd32;hpb=82e794070d4f3ae8aacb1827b21a93b9d48ce57f;p=senf.git

diff --git a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc
index e75612e..c7f18c0 100644
--- a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc
+++ b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc
@@ -28,38 +28,31 @@
 #include "ICMPv6TypePacket.hh"
 
 #define prefix_
+///////////////////////////////cc.p////////////////////////////////////////
+
 namespace {
-//Implementing the ICMPv6 Type registry
-    senf::PacketRegistry<senf::ICMPTypes>::RegistrationProxy<senf::ICMPv6ErrDestUnreachable>
-        registerICMPv6ErrDestUnreachable (1);
-    senf::PacketRegistry<senf::ICMPTypes>::RegistrationProxy<senf::ICMPv6ErrTooBig>
-        registerICMPv6ErrTooBig (2);
-    senf::PacketRegistry<senf::ICMPTypes>::RegistrationProxy<senf::ICMPv6ErrTimeExceeded>
-        registerICMPv6ErrTimeExceeded (3);
-    senf::PacketRegistry<senf::ICMPTypes>::RegistrationProxy<senf::ICMPv6ErrParamProblem>
-        registerICMPv6ErrParamProblem (4);
-    senf::PacketRegistry<senf::ICMPTypes>::RegistrationProxy<senf::ICMPv6EchoRequest>
-        registerICMPv6EchoRequest (128);
-    senf::PacketRegistry<senf::ICMPTypes>::RegistrationProxy<senf::ICMPv6EchoReply>
-        registerICMPv6EchoReply (129);
-    senf::PacketRegistry<senf::ICMPTypes>::RegistrationProxy<senf::MLDv2ListenerQuery>
-        registerMLDv2ListenerQuery (130);
-    senf::PacketRegistry<senf::ICMPTypes>::RegistrationProxy<senf::MLDv2ListenerReport>
-        registerMLDv2ListenerReport (143);
+    SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 1,   senf::ICMPv6ErrDestUnreachable );
+    SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 2,   senf::ICMPv6ErrTooBig          );
+    SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 3,   senf::ICMPv6ErrTimeExceeded    );
+    SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 4,   senf::ICMPv6ErrParamProblem    );
+    SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 128, senf::ICMPv6EchoRequest        );
+    SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 129, senf::ICMPv6EchoReply          );
+    SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 130, senf::MLDv2ListenerQuery       );
+    SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 143, senf::MLDv2ListenerReport      );
 }
 
 prefix_ void senf::ICMPv6EchoRequestType::dump(packet p, std::ostream & os)
 {
     os << "ICMPv6 Echo Request:\n"
-       << senf::fieldName("Identifier") 	       << unsigned(p->identifier()) << "\n"
-       << senf::fieldName("SequenceNumber") 	       << unsigned(p->seqNr() ) << "\n";
+       << senf::fieldName("Identifier")         << unsigned(p->identifier()) << "\n"
+       << senf::fieldName("SequenceNumber")     << unsigned(p->seqNr() ) << "\n";
 }
 
 prefix_ void senf::ICMPv6EchoReplyType::dump(packet p, std::ostream & os)
 {
     os << "ICMPv6 Echo Reply:\n"
-       << senf::fieldName("Identifier") 	       << unsigned(p->identifier()) << "\n"
-       << senf::fieldName("SequenceNumber") 	       << unsigned(p->seqNr()) << "\n";
+       << senf::fieldName("Identifier")         << unsigned(p->identifier()) << "\n"
+       << senf::fieldName("SequenceNumber")     << unsigned(p->seqNr()) << "\n";
 }
 
 prefix_ void senf::ICMPv6ErrDestUnreachableType::dump(packet p, std::ostream & os)
@@ -70,28 +63,28 @@ prefix_ void senf::ICMPv6ErrDestUnreachableType::dump(packet p, std::ostream & o
 prefix_ void senf::ICMPv6ErrTooBigType::dump(packet p, std::ostream & os)
 {
     os << "ICMPv6 Error Packet Too Big:\n"
-       << senf::fieldName("MTU") 		       << unsigned(p->mtu() ) << "\n";    
+       << senf::fieldName("MTU")            << unsigned(p->mtu() ) << "\n";    
 }
 
 prefix_ void senf::ICMPv6ErrTimeExceededType::dump(packet p, std::ostream & os)
 {
     os << "ICMPv6 Error Time Exceeded:\n"
-       << senf::fieldName("Unused(32Bit)") 	       << unsigned(p->unused() ) << "\n";    
+       << senf::fieldName("Unused(32Bit)")  << unsigned(p->unused() ) << "\n";    
 }
 
 prefix_ void senf::ICMPv6ErrParamProblemType::dump(packet p, std::ostream & os)
 {
     os << "ICMPv6 Error Parameter Problem:\n"
-       << senf::fieldName("Pointer") 		       << unsigned(p->pointer() ) << "\n";    
+       << senf::fieldName("Pointer")        << unsigned(p->pointer() ) << "\n";    
 }
 
 prefix_ void senf::MLDv2ListenerQueryType::dump(packet p, std::ostream & os)
 {
     os << "ICMPv6 Multicast Listener Query:\n"
-       << senf::fieldName("Max. ResponseCode") 	       << unsigned(p->maxResponseCode()) << "\n"
-       << senf::fieldName("Reserved(16Bit)") 	       << unsigned(p->reserved()) << "\n"
-       << senf::fieldName("Multicast Address") 	       << p->mcAddress() << "\n"
-       << senf::fieldName("Reserver(4Bit)") 	       << unsigned(p->resv()) << "\n"
+       << senf::fieldName("Max. ResponseCode")         << unsigned(p->maxResponseCode()) << "\n"
+       << senf::fieldName("Reserved(16Bit)")           << unsigned(p->reserved()) << "\n"
+       << senf::fieldName("Multicast Address")         << p->mcAddress() << "\n"
+       << senf::fieldName("Reserver(4Bit)")            << unsigned(p->resv()) << "\n"
        << senf::fieldName("Suppress Router-Side Processing") << unsigned(p->sFlag()) << "\n"
        << senf::fieldName("Querier's Robustness Variable") << unsigned(p->qrv()) << "\n"
        << senf::fieldName("Querier's Query Interval Code") << unsigned(p->qqic()) << "\n"
@@ -99,22 +92,22 @@ prefix_ void senf::MLDv2ListenerQueryType::dump(packet p, std::ostream & os)
     senf::MLDv2ListenerQuery::Parser::srcAddresses_t::container c (p->srcAddresses());
     senf::MLDv2ListenerQuery::Parser::srcAddresses_t::container::iterator i (c.begin());
     for (unsigned int nr =1; i != c.end(); ++i, ++nr)
-	os << "    " << nr << ".) " << *i << "\n";    
+        os << "    " << nr << ".) " << *i << "\n";    
     os << "\n";    
 }
 
 prefix_ void senf::MLDv2ListenerReportType::dump(packet p, std::ostream & os)
 {
     os << "ICMPv6 Multicast Listener Report Message:\n"
-       << senf::fieldName("Reserved") 		       << unsigned(p->reserved() ) 
+       << senf::fieldName("Reserved")              << unsigned(p->reserved() ) 
        <<"\n  Multicast Address Records:\n";
     
     senf::MLDv2ListenerReport::Parser::mcastAddrRecords_t::container cAddrR (p->mcastAddrRecords() );
     senf::MLDv2ListenerReport::Parser::mcastAddrRecords_t::container::iterator iAddrR (cAddrR.begin() );
     for (; iAddrR != cAddrR.end(); ++iAddrR) {
-        os << senf::fieldName("  Record Type") 	       << unsigned(iAddrR->recordType()) << "\n"
-	   << senf::fieldName("  Multicast Address")   << iAddrR->mcAddress() << "\n"
-	   << "    Source Addresses\n:";
+        os << senf::fieldName("  Record Type")         << unsigned(iAddrR->recordType()) << "\n"
+           << senf::fieldName("  Multicast Address")   << iAddrR->mcAddress() << "\n"
+           << "    Source Addresses\n:";
         senf::MLDv2AddressRecordParser::srcAddresses_t::container cSrcAddr (iAddrR->srcAddresses());
         senf::MLDv2AddressRecordParser::srcAddresses_t::container::iterator iSrcAddr (cSrcAddr.begin());
         for (;iSrcAddr != cSrcAddr.end();++iSrcAddr)
@@ -127,4 +120,5 @@ prefix_ void senf::MLDv2ListenerReportType::dump(packet p, std::ostream & os)
     }
 }
 
+///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_