X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv4Packet.cc;h=b6254c6f3ea6935520e4ff82cc5669e4409790ca;hb=HEAD;hp=1cdab2e13f256391b11f2a759388a547e7d0be8e;hpb=ccff925ac3c102822a38617d00aef1bcf5217706;p=senf.git diff --git a/senf/Packets/DefaultBundle/IPv4Packet.cc b/senf/Packets/DefaultBundle/IPv4Packet.cc index 1cdab2e..b6254c6 100644 --- a/senf/Packets/DefaultBundle/IPv4Packet.cc +++ b/senf/Packets/DefaultBundle/IPv4Packet.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 // -// 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 /** \file \brief IPv4Packet non-inline non-template implementation */ @@ -28,22 +33,19 @@ // Custom includes #include -#include -#include -#include #include #include #include "EthernetPacket.hh" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x0800, senf::IPv4Packet); SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 4, senf::IPv4Packet); // IP-in-IP encapsulation } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::IPv4PacketParser prefix_ boost::uint16_t senf::IPv4PacketParser::calcChecksum() @@ -56,27 +58,27 @@ prefix_ boost::uint16_t senf::IPv4PacketParser::calcChecksum() return summer.sum(); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::IPv4PacketType prefix_ void senf::IPv4PacketType::dump(packet p, std::ostream & os) { boost::io::ios_all_saver ias(os); - os << "Internet protocol Version 4:\n" - << " version : " << p->version() << "\n" - << " ip header length : " << p->ihl() << "\n" - << " tos : " << unsigned(p->tos()) << "\n" - << " length : " << p->length() << "\n" - << " identifier : " << p->identifier() << "\n" - << " dont fragment : " << p->df() << "\n" - << " more fragments : " << p->mf() << "\n" - << " fragment : " << p->frag() << "\n" - << " ttl : " << unsigned(p->ttl()) << "\n" - << " protocol : " << unsigned(p->protocol()) << "\n" - << " checksum : 0x" - << std::hex << std::setw(4) << std::setfill('0') << p->checksum() << std::dec << "\n" - << " source : " << p->source() << "\n" - << " destination : " << p->destination() << "\n"; + os << "Internet protocol Version 4:\n" + << senf::fieldName("version") << p->version() << "\n" + << senf::fieldName("ip header length") << p->ihl() << "\n" + << senf::fieldName("tos") << unsigned(p->tos()) << "\n" + << senf::fieldName("length") << p->length() << "\n" + << senf::fieldName("identifier") << p->identifier() << "\n" + << senf::fieldName("dont fragment") << p->df() << "\n" + << senf::fieldName("more fragments") << p->mf() << "\n" + << senf::fieldName("fragment") << p->frag() << "\n" + << senf::fieldName("ttl") << unsigned(p->ttl()) << "\n" + << senf::fieldName("protocol") << unsigned(p->protocol()) << "\n" + << senf::fieldName("checksum") + << "0x" << std::hex << std::setw(4) << std::setfill('0') << std::right << p->checksum() << std::dec << "\n" + << senf::fieldName("source") << p->source() << "\n" + << senf::fieldName("destination") << p->destination() << "\n"; } prefix_ void senf::IPv4PacketType::finalize(packet p) @@ -86,7 +88,7 @@ prefix_ void senf::IPv4PacketType::finalize(packet p) p->checksum() << p->calcChecksum(); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_