Packets/80221Bundle: more GenericTLVBase integration; removed GenericTLVPacket; some...

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

diff --git a/senf/Packets/DefaultBundle/UDPPacket.cc b/senf/Packets/DefaultBundle/UDPPacket.cc
index a985f24..d1ff6c2 100644 (file)
--- a/senf/Packets/DefaultBundle/UDPPacket.cc
+++ b/senf/Packets/DefaultBundle/UDPPacket.cc
@@ -29,8 +29,8 @@
 // Custom includes
 #include <iomanip>
 #include <boost/io/ios_state.hpp>
-#include "../../Packets/Packets.hh"
-#include "../../Utils/IpChecksum.hh"
+#include <senf/Packets/Packets.hh>
+#include <senf/Utils/IpChecksum.hh>
 #include "IPv4Packet.hh"
 #include "IPv6Packet.hh"
 
@@ -38,8 +38,7 @@
 ///////////////////////////////cc.p////////////////////////////////////////
 
 namespace {
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::UDPPacket>
-        registerUDPPacket (17);
+    SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 17, senf::UDPPacket);
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -100,11 +99,11 @@ prefix_ void senf::UDPPacketType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
     os << "UDP:\n"
-       <<     "  source port             : " << p->source() << "\n"
-       <<     "  dest port               : " << p->destination() << "\n"
-       <<     "  length                  : " << p->length() << "\n"
-       <<     "  checksum                : " 
-       << std::hex << std::setw(4) << std::setfill('0') << p->checksum() << "\n";
+       << senf::fieldName("source port")               << p->source() << "\n"
+       << senf::fieldName("dest port")                 << p->destination() << "\n"
+       << senf::fieldName("length")                    << p->length() << "\n"
+       << senf::fieldName("checksum")
+       << "0x" << std::hex << std::setw(4) << std::setfill('0') << p->checksum() << "\n";
 }
 
 prefix_ void senf::UDPPacketType::finalize(packet p)