X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FUDPPacket.cc;h=d1ff6c24b32e7f056983633bcb281b9ee0b57e65;hb=9762e8c5d2f6c1264ba97acd3e589f6fa8f522c6;hp=a985f24b4ec47ba9a9b3370d1eafcbdbf9f7bfaf;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Packets/DefaultBundle/UDPPacket.cc b/senf/Packets/DefaultBundle/UDPPacket.cc index a985f24..d1ff6c2 100644 --- a/senf/Packets/DefaultBundle/UDPPacket.cc +++ b/senf/Packets/DefaultBundle/UDPPacket.cc @@ -29,8 +29,8 @@ // Custom includes #include #include -#include "../../Packets/Packets.hh" -#include "../../Utils/IpChecksum.hh" +#include +#include #include "IPv4Packet.hh" #include "IPv6Packet.hh" @@ -38,8 +38,7 @@ ///////////////////////////////cc.p//////////////////////////////////////// namespace { - senf::PacketRegistry::RegistrationProxy - 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)