X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FTCPPacket.cc;h=2755469d09c9fd2fca8fa0219d14b8ab21fb602e;hb=HEAD;hp=fb10044f9de6960f55a7b2b3c0fe8f7fe7b9e85f;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Packets/DefaultBundle/TCPPacket.cc b/senf/Packets/DefaultBundle/TCPPacket.cc index fb10044..2755469 100644 --- a/senf/Packets/DefaultBundle/TCPPacket.cc +++ b/senf/Packets/DefaultBundle/TCPPacket.cc @@ -2,23 +2,27 @@ // // Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Dennis Goslar // -// 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 -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): /** \file \brief TCPPacket non-inline non-template implementation */ @@ -29,20 +33,17 @@ // Custom includes #include #include -#include "../../Packets/Packets.hh" -#include "../../Utils/IpChecksum.hh" -#include "IPv4Packet.hh" +#include #include "IPv6Packet.hh" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { - senf::PacketRegistry::RegistrationProxy - registerTCPPacket (6); + SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 6, senf::TCPPacket); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::TCPPacketParser prefix_ boost::uint16_t senf::TCPPacketParser::calcChecksum() @@ -107,28 +108,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 +138,7 @@ prefix_ void senf::TCPPacketType::finalize(packet p) p->checksum() << p->calcChecksum(); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_