X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FICMPv6Packet.cc;h=821aa16fd097804adf9f747220236120af4947ae;hb=9ab6056a616342015eb35d6730d61c45412eec46;hp=be0daf5172e3bc5f343261cbea17e929a39e1d2d;hpb=82e794070d4f3ae8aacb1827b21a93b9d48ce57f;p=senf.git diff --git a/senf/Packets/DefaultBundle/ICMPv6Packet.cc b/senf/Packets/DefaultBundle/ICMPv6Packet.cc index be0daf5..821aa16 100644 --- a/senf/Packets/DefaultBundle/ICMPv6Packet.cc +++ b/senf/Packets/DefaultBundle/ICMPv6Packet.cc @@ -33,26 +33,26 @@ #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)); + IPv6Packet ipv6 (packet().rfind(senf::nothrow)); if (! ipv6) return 0u; - - senf::IpChecksum summer; - //////////////////////////////////////// + IpChecksum summer; + + //-///////////////////////////////////////////////////////////////////////////////////////////// // IPv6 pseudo header - summer.feed( ipv6->source().i(), - ipv6->source().i() + senf::IPv6Packet::Parser::source_t::fixed_bytes ); + 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() + senf::IPv6PacketParser::destination_t::fixed_bytes ); + 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); @@ -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 @@ -76,17 +76,17 @@ prefix_ boost::uint16_t senf::ICMPv6PacketParser::calcChecksum() 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" - << senf::fieldName("type") << unsigned(p->type()) <<"\n" - << senf::fieldName("code") << unsigned(p->code()) <<"\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_