Apply senf::fieldName() to all packet dump methods

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

diff --git a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc
index 282e8e8..e75612e 100644 (file)
--- a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc
+++ b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc
@@ -48,81 +48,83 @@ namespace {
         registerMLDv2ListenerReport (143);
 }
 
-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() ) 
-        <<"\n  Reserved(16Bit)             : " << unsigned(p->reserved() )
-        <<"\n  Multicast Address           : " << p->mcAddress()
-        <<"\n  Reserver(4Bit)              : " << unsigned(p->resv() )
-        <<"\n  Suppress Router-Side Processing: " << unsigned(p->sFlag() )
-        <<"\n  Querier's Robustness Variable: " << unsigned(p->qrv() )
-        <<"\n  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";    
+       << 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() ) 
-        <<"\n  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() )
-            <<"\n    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 (; 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 << "    Auxiliary Data        :\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
+#undef prefix_