X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FIPv4Packet.cc;h=2a9fa1a4383e4a83e7b776871841f86251f76e6a;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=f534aa1bdbd0e50f96f8d06817d9767b17284336;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git diff --git a/Packets/DefaultBundle/IPv4Packet.cc b/Packets/DefaultBundle/IPv4Packet.cc index f534aa1..2a9fa1a 100644 --- a/Packets/DefaultBundle/IPv4Packet.cc +++ b/Packets/DefaultBundle/IPv4Packet.cc @@ -1,8 +1,8 @@ // $Id$ // // Copyright (C) 2006 -// Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY +// 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 @@ -55,9 +55,6 @@ prefix_ boost::uint16_t senf::IPv4PacketParser::calcChecksum() validate(bytes(*this)); IpChecksum summer; summer.feed( i(), i()+checksum_offset ); - // Not needed since the number of 0-bytes is even - // summer.feed( 0u ); - // summer.feed( 0u ); summer.feed( i()+checksum_offset+2, i()+bytes(*this) ); return summer.sum(); } @@ -88,7 +85,7 @@ prefix_ void senf::IPv4PacketType::dump(packet p, std::ostream & os) prefix_ void senf::IPv4PacketType::finalize(packet p) { p->length() << p.size(); - p->protocol() << key(p.next()); + p->protocol() << key(p.next(nothrow)); p->checksum() << p->calcChecksum(); }