X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FIPv4Packet.cc;h=2a9fa1a4383e4a83e7b776871841f86251f76e6a;hb=a1fdb7bb122f0b05be809a922d4b7ef5e125fa67;hp=8cac8caaadf80ed988d02deb1d8b2bf7d646bb97;hpb=67608d39cb73231d6deaae285aa5477762246e50;p=senf.git

diff --git a/Packets/DefaultBundle/IPv4Packet.cc b/Packets/DefaultBundle/IPv4Packet.cc
index 8cac8ca..2a9fa1a 100644
--- a/Packets/DefaultBundle/IPv4Packet.cc
+++ b/Packets/DefaultBundle/IPv4Packet.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Stefan Bund <g0dil@berlios.de>
 //
 // 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
@@ -47,17 +47,14 @@ namespace {
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::Parse_IPv4
+// senf::IPv4PacketParser
 
-prefix_ boost::uint16_t senf::Parse_IPv4::calcChecksum()
+prefix_ boost::uint16_t senf::IPv4PacketParser::calcChecksum()
     const
 {
     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();
 }