fixed right padding issue for several output members

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

diff --git a/senf/Packets/DefaultBundle/EthernetPacket.cc b/senf/Packets/DefaultBundle/EthernetPacket.cc
index b3ba75b..290b7a5 100644 (file)
--- a/senf/Packets/DefaultBundle/EthernetPacket.cc
+++ b/senf/Packets/DefaultBundle/EthernetPacket.cc
@@ -30,16 +30,16 @@
 #include "LlcSnapPacket.hh"
 #include <iomanip>
 #include <boost/io/ios_state.hpp>
+#include <senf/Utils/Format.hh>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
-    senf::PacketRegistry<senf::EtherTypes>::RegistrationProxy<senf::EthVLanPacket>
-        registerEthVLanPacket(0x8100);
+    SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x8100, senf::EthVLanPacket);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::EthernetPacketType
 
 prefix_ void senf::EthernetPacketType::dump(packet p, std::ostream & os)
@@ -52,10 +52,9 @@ prefix_ void senf::EthernetPacketType::dump(packet p, std::ostream & os)
     else
         os << "Ethernet 802.3 (bad ethertype >1500 and <1536)";
     os <<     ": \n"
-       <<     "  destination             : " << p->destination() << "\n"
-       <<     "  source                  : " << p->source() << "\n"
-       <<     "  type/length             : 0x" 
-       <<     std::hex << std::setw(4) << std::setfill('0') << p->type_length() << "\n";
+       << senf::fieldName("destination")               << p->destination() << "\n"
+       << senf::fieldName("source")                    << p->source() << "\n"
+       << senf::fieldName("type/length")               << senf::format::dumpint(p->type_length().value()) << "\n";
 }
 
 prefix_ senf::PacketInterpreterBase::factory_t senf::EthernetPacketType::nextPacketType(packet p)
@@ -81,12 +80,12 @@ prefix_ void senf::EthernetPacketType::finalize(packet p)
 prefix_ void senf::EthVLanPacketType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
-    os <<     "Ethernet 802.1q (VLAN):\n"
-       <<     "  priority                : " << p->priority() << "\n"
-       <<     "  cfi                     : " << p->cfi() << "\n"
-       <<     "  vlan-ID                 : " << p->vlanId() << "\n"
-       <<     "  ethertype               : 0x" 
-       <<     std::hex << std::setw(4) << std::setfill('0') << p->type() << "\n";
+    os << "Ethernet 802.1q (VLAN):\n"
+       << senf::fieldName("priority")                  << p->priority() << "\n"
+       << senf::fieldName("cfi")                       << p->cfi() << "\n"
+       << senf::fieldName("vlan-ID")                   << p->vlanId() << "\n"
+       << senf::fieldName("ethertype")
+       << " 0x" << std::hex << std::setw(4) << std::setfill('0') << std::right << p->type() << "\n";
 }
 
 prefix_ void senf::EthVLanPacketType::finalize(packet p)
@@ -95,7 +94,7 @@ prefix_ void senf::EthVLanPacketType::finalize(packet p)
 }
 
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f