X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FUDPPacket.cc;h=21b671cf5bf7c8281543b40aa4a4f14894a02277;hb=HEAD;hp=4e30c47a76145cc0f1db62ce4960e9050a273090;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/Packets/DefaultBundle/UDPPacket.cc b/senf/Packets/DefaultBundle/UDPPacket.cc
index 4e30c47..21b671c 100644
--- a/senf/Packets/DefaultBundle/UDPPacket.cc
+++ b/senf/Packets/DefaultBundle/UDPPacket.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.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):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief UDPPacket non-inline non-template implementation */
@@ -29,19 +34,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, 17, senf::UDPPacket);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::UDPPacketParser
 
 prefix_ boost::uint16_t senf::UDPPacketParser::calcChecksum()
@@ -92,7 +95,7 @@ prefix_ boost::uint16_t senf::UDPPacketParser::calcChecksum()
     return rv ? rv : 0xffffu;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::UDPPacketType
 
 prefix_ void senf::UDPPacketType::dump(packet p, std::ostream & os)
@@ -103,7 +106,7 @@ prefix_ void senf::UDPPacketType::dump(packet p, std::ostream & os)
        << 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";
+       << "0x" << std::hex << std::setw(4) << std::setfill('0') << std::right << p->checksum() << "\n";
 }
 
 prefix_ void senf::UDPPacketType::finalize(packet p)
@@ -112,7 +115,7 @@ prefix_ void senf::UDPPacketType::finalize(packet p)
     p->checksum() << p->calcChecksum();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_