X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FGREPacket.hh;h=32b8c1118ca0e60397c8aba295c9b28efec30d1f;hb=b8ca4a544cce3e6023bb56b712a03d6362f2bb79;hp=bbf21f8f38a59dac9f0340cae1d7fbeb6029b5cd;hpb=ea2f773d1bf79ff787f2c68766ecd154bd9f3631;p=senf.git

diff --git a/Packets/MPEGDVBBundle/GREPacket.hh b/Packets/MPEGDVBBundle/GREPacket.hh
index bbf21f8..32b8c11 100644
--- a/Packets/MPEGDVBBundle/GREPacket.hh
+++ b/Packets/MPEGDVBBundle/GREPacket.hh
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Joachim Kaeber <joachim.kaeber@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Joachim Kaeber <jkaeber@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
@@ -44,26 +44,26 @@ namespace senf {
      */
     struct GREChecksumParser : public PacketParserBase {
 #       include SENF_PARSER()        
-        SENF_PARSER_FIELD ( checksum1_, Parse_UInt16 );
-        SENF_PARSER_PRIVATE_FIELD ( reserved1_, Parse_UInt16 );
-  	SENF_PARSER_FINALIZE(GREChecksumParser);
+        SENF_PARSER_FIELD ( checksum1_, UInt16Parser );
+        SENF_PARSER_PRIVATE_FIELD ( reserved1_, UInt16Parser );
+        SENF_PARSER_FINALIZE(GREChecksumParser);
     };
 
-    struct Parse_GREPacket : public PacketParserBase
+    struct GREPacketParser : public PacketParserBase
     {
 #       include SENF_PARSER()
 
         SENF_PARSER_BITFIELD         ( checksum_present,  1, bool );
         SENF_PARSER_PRIVATE_BITFIELD ( reserved0_,       12, unsigned ); // TODO: SKIP !!
         SENF_PARSER_BITFIELD         ( version_number,    3, unsigned ); // TODO: Always Zero !!
-        SENF_PARSER_FIELD            ( protocol_type,    Parse_UInt16 );
+        SENF_PARSER_FIELD            ( protocol_type,    UInt16Parser );
         SENF_PARSER_PRIVATE_VARIANT  ( checksum_,  checksum_present,
                                                    (VoidPacketParser) (GREChecksumParser) );
  
-        SENF_PARSER_FINALIZE( Parse_GREPacket );
+        SENF_PARSER_FINALIZE( GREPacketParser );
 
       private: 
-        Parse_UInt16 checksum() const /// only defined if checksum_present() == \c true
+        UInt16Parser checksum() const /// only defined if checksum_present() == \c true
              { return checksum_().get<1>().checksum1_(); }
     };
     
@@ -73,7 +73,8 @@ namespace senf {
             \ref GREPacket
 
         \par Fields:
-            \ref Parse_GREPacket
+            \ref GREPacketParser
+            \image html GREPacket.png
 
         \ingroup protocolbundle_mpegdvb
      */
@@ -83,7 +84,7 @@ namespace senf {
     {
         typedef PacketTypeMixin<GREPacketType, EtherTypes> mixin;
         typedef ConcretePacket<GREPacketType> packet;
-        typedef Parse_GREPacket parser;
+        typedef GREPacketParser parser;
     
         using mixin::nextPacketRange;
         using mixin::nextPacketType;
@@ -95,7 +96,7 @@ namespace senf {
           return p->protocol_type();
         }
         static void finalize(packet p) {
-          p->protocol_type() << key(p.next());
+          p->protocol_type() << key(p.next(nothrow));
           p->version_number() = 0; // as per RFC2784, 2.3.1
 
           if (p->checksum_present()) {