X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FICMPv6Packet.cc;h=579220fed8f6589c45b774fa7f344a1b9f76db44;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=42a48bd7377d8c9fbce5498e4f250942b4da463b;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Packets/DefaultBundle/ICMPv6Packet.cc b/senf/Packets/DefaultBundle/ICMPv6Packet.cc index 42a48bd..579220f 100644 --- a/senf/Packets/DefaultBundle/ICMPv6Packet.cc +++ b/senf/Packets/DefaultBundle/ICMPv6Packet.cc @@ -2,23 +2,28 @@ // // Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Philipp Batroff // -// 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): +// Philipp Batroff /** \file \brief ICMPv6Packet non-inline non-template implementation */ @@ -30,56 +35,63 @@ #include #include #include +#include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -namespace { - senf::PacketRegistry::RegistrationProxy - registerICMPv6Packet (58); -} +SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 58, senf::ICMPv6Packet); -prefix_ boost::uint16_t senf::ICMPv6PacketParser::calcChecksum() +prefix_ boost::uint16_t senf::ICMPv6PacketParser::calcChecksum() const { + IPv6Packet ipv6 (packet().rfind(senf::nothrow)); + if (! ipv6) return 0u; - senf::IpChecksum summer; - senf::IPv6Packet ipv6 (packet().rfind(senf::nothrow)); - - if (! ipv6) - return 0u; - - summer.feed( ipv6->source().i(), - ipv6->source().i() + senf::IPv6Packet::Parser::source_t::fixed_bytes ); - // The destination used here must be the *final* destination ... - summer.feed( ipv6->destination().i(), ipv6->destination().i() + senf::IPv6PacketParser::destination_t::fixed_bytes ); + IpChecksum summer; - // This is a simplification. The value is really 32bit to support UDP Jumbograms - // (RFC2147). However, skipping an even number of 0 bytes does not change the checksum - summer.feed( i() + ipv6->length(), i() + ipv6->length() + 2 ); - // --> http://www.iana.org/assignments/protocol-numbers - // need to insert the correct protocol number here, NOT static 17!! + //-///////////////////////////////////////////////////////////////////////////////////////////// + // IPv6 pseudo header + summer.feed( ipv6->source().i(), + ipv6->source().i() + IPv6Packet::Parser::source_t::fixed_bytes ); + // need support for HopByHop routing header -> the destination used here must be the *final* + // destination ... + summer.feed( ipv6->destination().i(), + ipv6->destination().i() + IPv6PacketParser::destination_t::fixed_bytes ); + // packet length + boost::uint32_t size (data().size()); + summer.feed((size>>24)&0xff); + summer.feed((size>>16)&0xff); + summer.feed((size>> 8)&0xff); + summer.feed((size )&0xff); + // protocol number + // summer.feed( 0u ); + // summer.feed( 0u ); summer.feed( 0u ); summer.feed( 58u ); - // since header are 16 / even 32bit aligned we don't have to care for padding. since IpChecksum - // cares for padding at the final summing we don't have to care is the payload is 16nbit-aligned, too. + + //-///////////////////////////////////////////////////////////////////////////////////////////// + // ICMP Packet summer.feed( i(), i()+checksum_offset ); + // checksum + // summer.feed(0); summer.feed(0); summer.feed( i()+checksum_offset+2, data().end() ); boost::uint16_t rv (summer.sum()); return rv ? rv : 0xffffu; } -prefix_ void senf::ICMPv6PacketType::dump(packet p, std::ostream &os) +prefix_ void senf::ICMPv6PacketType::dump(packet p, std::ostream & os) { boost::io::ios_all_saver ias(os); os << "ICMPv6 protocol:\n" - << " type : " << p->type() <<"\n" - << " code : " << p->code() <<"\n" - << " checksum : " << p->checksum() << "\n"; + << senf::fieldName("type") << unsigned(p->type()) << "\n" + << senf::fieldName("code") << unsigned(p->code()) << "\n" + << senf::fieldName("checksum") + << "0x" << std::hex << std::setw(4) << unsigned(p->checksum()) << "\n"; } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_