Packets/80221Bundle: integrated GenericTLVRegistry
[senf.git] / senf / Packets / DefaultBundle / ICMPv6TypePacket.cc
index 96fe4ad..c7f18c0 100644 (file)
 #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){
+prefix_ void senf::ICMPv6EchoRequestType::dump(packet p, std::ostream & os)
+{
     os << "ICMPv6 Echo Request:\n"
-        <<"  Identifier              : " << unsigned(p->identifier() )
-        <<"\n  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){
+prefix_ void senf::ICMPv6EchoReplyType::dump(packet p, std::ostream & os)
+{
     os << "ICMPv6 Echo Reply:\n"
-        <<"  Identifier              : " << unsigned(p->identifier() )
-        <<"\n  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){
+prefix_ void senf::ICMPv6ErrDestUnreachableType::dump(packet p, std::ostream & os)
+{
     os << "ICMPv6 Error Destination Unreachable (no further fields available here)\n";    
 }
 
-prefix_ void senf::ICMPv6ErrTooBigType::dump(packet p, std::ostream & os){
+prefix_ void senf::ICMPv6ErrTooBigType::dump(packet p, std::ostream & os)
+{
     os << "ICMPv6 Error Packet Too Big:\n"
-        <<"  MTU                     : " << unsigned(p->mtu() ) << "\n";    
+       << senf::fieldName("MTU")            << unsigned(p->mtu() ) << "\n";    
 }
 
-prefix_ void senf::ICMPv6ErrTimeExceededType::dump(packet p, std::ostream & os){
+prefix_ void senf::ICMPv6ErrTimeExceededType::dump(packet p, std::ostream & os)
+{
     os << "ICMPv6 Error Time Exceeded:\n"
-        <<"  Unused(32Bit)               : " << unsigned(p->unused() ) << "\n";    
+       << senf::fieldName("Unused(32Bit)")  << unsigned(p->unused() ) << "\n";    
 }
 
-prefix_ void senf::ICMPv6ErrParamProblemType::dump(packet p, std::ostream & os){
+prefix_ void senf::ICMPv6ErrParamProblemType::dump(packet p, std::ostream & os)
+{
     os << "ICMPv6 Error Parameter Problem:\n"
-        <<"  Pointer                     : " << unsigned(p->pointer() ) << "\n";    
+       << senf::fieldName("Pointer")        << unsigned(p->pointer() ) << "\n";    
 }
 
-prefix_ void senf::MLDv2ListenerQueryType::dump(packet p, std::ostream & os){
+prefix_ void senf::MLDv2ListenerQueryType::dump(packet p, std::ostream & os)
+{
     os << "ICMPv6 Multicast Listener Query:\n"
-        <<"  Max. ResponseCode            : " << unsigned(p->maxResponseCode() ) 
-        <<"  \nReserved(16Bit)             : " << unsigned(p->reserved() )
-        <<"  \nMulticast Address           : " << p->mcAddress()
-        <<"  \nReserver(4Bit)              : " << unsigned(p->resv() )
-        <<"  \nSuppress Router-Side Processing: " << unsigned(p->sFlag() )
-        <<"  \nQuerier's Robustness Variable: " << unsigned(p->qrv() )
-        <<"  \nQuerier's Query Interval Code: " << unsigned(p->qqic() )    
-        <<"  \nSource Addresses: " << "\n";    
-        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 << "\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"
+       << "  Source Addresses:\n";
+    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 << "\n";    
 }
 
-prefix_ void senf::MLDv2ListenerReportType::dump(packet p, std::ostream & os){
+prefix_ void senf::MLDv2ListenerReportType::dump(packet p, std::ostream & os)
+{
     os << "ICMPv6 Multicast Listener Report Message:\n"
-        <<"  Reserved                    : " << unsigned(p->reserved() ) 
-        <<"  Multicast Address Records:\n";
+       << 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 << "    Record Type           : " << unsigned(iAddrR->recordType() )
-            <<"    \nMulticast Address     : " << iAddrR->mcAddress() 
-            <<"    \nSource Addresses      :\n";
-            
-        senf::MLDv2AddressRecordParser::srcAddresses_t::container cSrcAddr (iAddrR->srcAddresses() );
-        senf::MLDv2AddressRecordParser::srcAddresses_t::container::iterator iSrcAddr ( cSrcAddr.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:";
+        senf::MLDv2AddressRecordParser::srcAddresses_t::container cSrcAddr (iAddrR->srcAddresses());
+        senf::MLDv2AddressRecordParser::srcAddresses_t::container::iterator iSrcAddr (cSrcAddr.begin());
         for (;iSrcAddr != cSrcAddr.end();++iSrcAddr)
-            os <<"      " << *iSrcAddr << "\n";
+            os << "      " << *iSrcAddr << "\n";
         os << "    Auxiliary Data:\n";
         senf::MLDv2AddressRecordParser::auxData_t::container cAuxD ( iAddrR->auxData() );
         senf::MLDv2AddressRecordParser::auxData_t::container::iterator iAuxD (cAuxD.begin() );
         for (;iAuxD != cAuxD.end(); ++iAuxD)
-            os <<"      " << *iAuxD << "\n";
+            os << "      " << *iAuxD << "\n";
     }
 }
 
-
-
-
-
-
-#undef prefix_
\ No newline at end of file
+///////////////////////////////cc.e////////////////////////////////////////
+#undef prefix_