X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FTCPPacket.cc;h=1737b72baa31d1dd18a90349c9dc9ed180107e50;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=60b4beb0d1591dbb9b50b81518fc8818448662fc;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Packets/DefaultBundle/TCPPacket.cc b/senf/Packets/DefaultBundle/TCPPacket.cc
index 60b4beb..1737b72 100644
--- a/senf/Packets/DefaultBundle/TCPPacket.cc
+++ b/senf/Packets/DefaultBundle/TCPPacket.cc
@@ -3,7 +3,7 @@
 // Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
-//	   Dennis Goslar <dennis.goslar@inf.hochschule-bonn-rhein-sieg.de>
+//     Dennis Goslar <dennis.goslar@inf.hochschule-bonn-rhein-sieg.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -29,20 +29,17 @@
 // Custom includes
 #include <iomanip>
 #include <boost/io/ios_state.hpp>
-#include <senf/Packets/Packets.hh>
 #include <senf/Utils/IpChecksum.hh>
-#include "IPv4Packet.hh"
 #include "IPv6Packet.hh"
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
-    senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::TCPPacket>
-        registerTCPPacket (6);
+    SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 6, senf::TCPPacket);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::TCPPacketParser
 
 prefix_ boost::uint16_t senf::TCPPacketParser::calcChecksum()
@@ -107,28 +104,28 @@ prefix_ boost::uint16_t senf::TCPPacketParser::calcChecksum()
 
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::TCPPacketType
 
 prefix_ void senf::TCPPacketType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
     os << "TCP:\n"
-       <<     "  source port             : " << p->source() << "\n"
-       <<     "  destination port        : " << p->destination() << "\n"
-       <<     "  sequence number         : " << p->sequencenumber() << "\n"
-       <<     "  acknowledgment number   : " << p->acknowledgmentnumber() << "\n"
-       <<     "  data offset             : " << p->dataoffset() << "\n"
-       <<     "  urgent flag             : " << p->urgf() << "\n"
-       <<     "  ack flag                : " << p->ackf() << "\n"
-       <<     "  push flag               : " << p->pshf() << "\n"
-       <<     "  reset flag              : " << p->rstf() << "\n"
-       <<     "  syn flag                : " << p->synf() << "\n"
-       <<     "  fin flag                : " << p->finf() << "\n"
-       <<     "  window size             : " << p->window() << "\n"
-       <<     "  checksum                : "
-       << std::hex << std::setw(4) << std::setfill('0') << p->checksum() << "\n"
-       <<     "  urgent pointer          : " << p->urgentpointer() << "\n";
+       << senf::fieldName("source port")               << p->source() << "\n"
+       << senf::fieldName("destination port")          << p->destination() << "\n"
+       << senf::fieldName("sequence number")           << p->sequencenumber() << "\n"
+       << senf::fieldName("acknowledgment number")     << p->acknowledgmentnumber() << "\n"
+       << senf::fieldName("data offset")               << p->dataoffset() << "\n"
+       << senf::fieldName("urgent flag")               << p->urgf() << "\n"
+       << senf::fieldName("ack flag")                  << p->ackf() << "\n"
+       << senf::fieldName("push flag")                 << p->pshf() << "\n"
+       << senf::fieldName("reset flag")                << p->rstf() << "\n"
+       << senf::fieldName("syn flag")                  << p->synf() << "\n"
+       << senf::fieldName("fin flag")                  << p->finf() << "\n"
+       << senf::fieldName("window size")               << p->window() << "\n"
+       << senf::fieldName("checksum")
+       << "0x" << std::hex << std::setw(4) << std::setfill('0') << std::right << p->checksum() << "\n"
+       << senf::fieldName("urgent pointer")            << p->urgentpointer() << "\n";
 }
 
 prefix_ void senf::TCPPacketType::finalize(packet p)
@@ -137,7 +134,7 @@ prefix_ void senf::TCPPacketType::finalize(packet p)
     p->checksum() << p->calcChecksum();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_