X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FUDPPacket.cc;h=a985f24b4ec47ba9a9b3370d1eafcbdbf9f7bfaf;hb=e375d44dd7db1d9c27c3d788dc3ccdbfa9d68ce8;hp=d3808e4aa545a4915a6b3fa3e0a23b0a446f38fe;hpb=67608d39cb73231d6deaae285aa5477762246e50;p=senf.git

diff --git a/Packets/DefaultBundle/UDPPacket.cc b/Packets/DefaultBundle/UDPPacket.cc
index d3808e4..a985f24 100644
--- a/Packets/DefaultBundle/UDPPacket.cc
+++ b/Packets/DefaultBundle/UDPPacket.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
@@ -25,7 +25,6 @@
 
 #include "UDPPacket.hh"
 //#include "UDPPacket.ih"
-#include "IPv4Packet.hh"
 
 // Custom includes
 #include <iomanip>
@@ -44,24 +43,21 @@ namespace {
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::Parse_UDP
+// senf::UDPPacketParser
 
-prefix_ boost::uint16_t senf::Parse_UDP::calcChecksum()
+prefix_ boost::uint16_t senf::UDPPacketParser::calcChecksum()
     const
 {
     IpChecksum summer;
-    summer.feed( i(), i()+checksum_offset );
-    summer.feed( i()+checksum_offset+2, data().end() );
-    
-    // Now on to the awkward part: the IP pseudo header
-    IPv4Packet ipv4 (packet().prev<IPv4Packet>(nothrow));
+    // first on to the awkward part: the IP pseudo header
+    IPv4Packet ipv4 (packet().rfind<IPv4Packet>(nothrow));
     if (ipv4) {
         // Pseudo header defined in RFC768
         summer.feed( ipv4->source().i(), 
-                     ipv4->source().i() + Parse_IPv4::source_t::fixed_bytes );
+                     ipv4->source().i() + IPv4Packet::Parser::source_t::fixed_bytes );
         ///\fixme What about a hop-by-hop routing option? Which destination is used in IPv4 ?
         summer.feed( ipv4->destination().i(), 
-                     ipv4->destination().i() + Parse_IPv4::destination_t::fixed_bytes );
+                     ipv4->destination().i() + IPv4PacketParser::destination_t::fixed_bytes );
         summer.feed( 0u );
         ///\fixme May there be another header between the IPv4 header and UDP? if so, we
         /// need to hack the correct protocol number here ...
@@ -70,16 +66,16 @@ prefix_ boost::uint16_t senf::Parse_UDP::calcChecksum()
     } 
     else {
         // Pseudo header defined in RFC2460
-        IPv6Packet ipv6 (packet().prev<IPv6Packet>(nothrow));
+        IPv6Packet ipv6 (packet().rfind<IPv6Packet>(nothrow));
         if (ipv6) {
             summer.feed( ipv6->source().i(), 
-                         ipv6->source().i() + Parse_IPv6::source_t::fixed_bytes );
+                         ipv6->source().i() + IPv6Packet::Parser::source_t::fixed_bytes );
             ///\todo Implement routing header support
             // The destination used here must be the *final* destination ...
             summer.feed( ipv6->destination().i(), 
-                         ipv6->destination().i() + Parse_IPv6::destination_t::fixed_bytes );
-            /// 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
+                         ipv6->destination().i() + IPv6PacketParser::destination_t::fixed_bytes );
+            // 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() + length_offset, i() + length_offset + 2 );
             // RFC2460 specifies, that this must always be 17, not the value used in the ipv6
             // header
@@ -88,6 +84,11 @@ prefix_ boost::uint16_t senf::Parse_UDP::calcChecksum()
         }
     }
     
+    // 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.
+    summer.feed( i(), i()+checksum_offset );
+    summer.feed( i()+checksum_offset+2, data().end() );
+
     boost::uint16_t rv (summer.sum());
     return rv ? rv : 0xffffu;
 }
@@ -99,11 +100,11 @@ prefix_ void senf::UDPPacketType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
     os << "UDP:\n"
-       << "  source port   : " << p->source() << "\n"
-       << "  dest port     : " << p->destination() << "\n"
-       << "  length        : " << p->length() << "\n"
-       << "  checksum      : " 
-         << std::hex << std::setw(4) << std::setfill('0') << p->checksum() << "\n";
+       <<     "  source port             : " << p->source() << "\n"
+       <<     "  dest port               : " << p->destination() << "\n"
+       <<     "  length                  : " << p->length() << "\n"
+       <<     "  checksum                : " 
+       << std::hex << std::setw(4) << std::setfill('0') << p->checksum() << "\n";
 }
 
 prefix_ void senf::UDPPacketType::finalize(packet p)