X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FTCPPacket.cc;h=2755469d09c9fd2fca8fa0219d14b8ab21fb602e;hb=HEAD;hp=2fc62f1a02bd94e86966db2a9a0327d96f109d76;hpb=82e794070d4f3ae8aacb1827b21a93b9d48ce57f;p=senf.git

diff --git a/senf/Packets/DefaultBundle/TCPPacket.cc b/senf/Packets/DefaultBundle/TCPPacket.cc
index 2fc62f1..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 <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
-// 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,19 +33,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_PACKET_REGISTRY_REGISTER( senf::IpTypes, 6, senf::TCPPacket);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::TCPPacketParser
 
 prefix_ boost::uint16_t senf::TCPPacketParser::calcChecksum()
@@ -106,7 +108,7 @@ prefix_ boost::uint16_t senf::TCPPacketParser::calcChecksum()
 
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::TCPPacketType
 
 prefix_ void senf::TCPPacketType::dump(packet p, std::ostream & os)
@@ -126,7 +128,7 @@ prefix_ void senf::TCPPacketType::dump(packet p, std::ostream & os)
        << 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') << p->checksum() << "\n"
+       << "0x" << std::hex << std::setw(4) << std::setfill('0') << std::right << p->checksum() << "\n"
        << senf::fieldName("urgent pointer")            << p->urgentpointer() << "\n";
 }
 
@@ -136,7 +138,7 @@ prefix_ void senf::TCPPacketType::finalize(packet p)
     p->checksum() << p->calcChecksum();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_