X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FSNDUPacket.cc;h=96709d08b2d33911e0dbf3c843db382cebf9dd38;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=900b3db66bc4de9db74f232b107db482ab87bfec;hpb=981204dbf160d3dd77e303b9bd133eb187e0384f;p=senf.git

diff --git a/Packets/MPEGDVBBundle/SNDUPacket.cc b/Packets/MPEGDVBBundle/SNDUPacket.cc
index 900b3db..96709d0 100644
--- a/Packets/MPEGDVBBundle/SNDUPacket.cc
+++ b/Packets/MPEGDVBBundle/SNDUPacket.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2007
-// 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
+//     Thorsten Horstmann <tho@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
@@ -28,8 +28,8 @@
 
 // Custom includes
 #include <iomanip>
-#include "Utils/hexdump.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
+#include "../../Utils/hexdump.hh"
+#include "../../Packets/DefaultBundle/EthernetPacket.hh"
 
 
 #define prefix_
@@ -41,16 +41,7 @@
 //}
 
 
-prefix_ senf::PacketParserBase::size_type senf::Parse_SNDUPacket::bytes()
-    const
-{
-    if ( d_bit() )
-        return 2 + 2 + 4;  // D-Bit + 15 bits length + 16 bits type field + 32 bits crc
-    else
-        return 2 + 2 + 4 + 6;  // + 6 Byte NPA destination address
-}
-
-prefix_ boost::uint32_t senf::Parse_SNDUPacket::calcCrc()
+prefix_ boost::uint32_t senf::SNDUPacketParser::calcCrc()
     const
 {
     return std::for_each(
@@ -59,7 +50,7 @@ prefix_ boost::uint32_t senf::Parse_SNDUPacket::calcCrc()
             ule_crc32() ).checksum();
 }
 
-//prefix_ senf::SNDUPacketType::registry_key_t senf::SNDUPacketType::nextPacketKey(packet p)
+//prefix_ senf::SNDUPacketType::key_t senf::SNDUPacketType::nextPacketKey(packet p)
 //{
 //    return p->type(); 
 //}
@@ -77,7 +68,7 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::SNDUPacketType::nextPacketT
     if (p->type() < 1536)
         e = PacketRegistry<senf::ULEExtHeaderTypes>::lookup( p->type(), nothrow );
     else
-        e = PacketRegistry<senf::EtherTypes>::lookup( 0x86dd, nothrow );
+        e = PacketRegistry<senf::EtherTypes>::lookup( p->type(), nothrow );
     return e ? e->factory() : no_factory();
 }