X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FICMPv6Packet.cc;h=7f38e570099ce1441397f948923c40ec82aeab68;hb=5cb66935d4b2973ea0fe7487b862b9ddc31648f4;hp=8023f3e5ae9851bcd0591e7582416d98f4c399b4;hpb=d70c73b66dbc60224d373f7a97cada419fe57c05;p=senf.git diff --git a/senf/Packets/DefaultBundle/ICMPv6Packet.cc b/senf/Packets/DefaultBundle/ICMPv6Packet.cc index 8023f3e..7f38e57 100644 --- a/senf/Packets/DefaultBundle/ICMPv6Packet.cc +++ b/senf/Packets/DefaultBundle/ICMPv6Packet.cc @@ -33,25 +33,25 @@ #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 58, senf::ICMPv6Packet); -prefix_ boost::uint16_t senf::ICMPv6PacketParser::calcChecksum() +prefix_ boost::uint16_t senf::ICMPv6PacketParser::calcChecksum() const { senf::IPv6Packet ipv6 (packet().rfind(senf::nothrow)); if (! ipv6) return 0u; - + senf::IpChecksum summer; - //////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////////// // IPv6 pseudo header - summer.feed( ipv6->source().i(), + summer.feed( ipv6->source().i(), ipv6->source().i() + senf::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(), + summer.feed( ipv6->destination().i(), ipv6->destination().i() + senf::IPv6PacketParser::destination_t::fixed_bytes ); // packet length boost::uint32_t size (data().size()); @@ -65,7 +65,7 @@ prefix_ boost::uint16_t senf::ICMPv6PacketParser::calcChecksum() summer.feed( 0u ); summer.feed( 58u ); - //////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////////// // ICMP Packet summer.feed( i(), i()+checksum_offset ); // checksum @@ -80,13 +80,13 @@ prefix_ void senf::ICMPv6PacketType::dump(packet p, std::ostream &os) { boost::io::ios_all_saver ias(os); os << "ICMPv6 protocol:\n" - << " type : " << unsigned(p->type()) <<"\n" - << " code : " << unsigned(p->code()) <<"\n" - << " checksum : 0x" - << std::hex << std::setw(4) << unsigned(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_