X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FDTCPPacket.hh;h=78f226fc896dbcd2f384b762868ddb1fa28f1b9a;hb=f7dcc6267c7637efaba2ebe5a20df5f849a68d39;hp=e619c1110df8a5cff697728a96a8390f3fd32d50;hpb=7baaacae27c02c86ceda5c7ee41d3172d1e23ffa;p=senf.git

diff --git a/Packets/MPEGDVBBundle/DTCPPacket.hh b/Packets/MPEGDVBBundle/DTCPPacket.hh
index e619c11..78f226f 100644
--- a/Packets/MPEGDVBBundle/DTCPPacket.hh
+++ b/Packets/MPEGDVBBundle/DTCPPacket.hh
@@ -23,8 +23,8 @@
 /** \file
     \brief DTCPPacket public header */
 
-#ifndef HH_DTCPPacket_
-#define HH_DTCPPacket_ 1
+#ifndef HH_SENF_Packets_MPEGDVBBundle_DTCPPacket_
+#define HH_SENF_Packets_MPEGDVBBundle_DTCPPacket_ 1
 
 // Custom includes
 #include "../../Packets/Packets.hh"
@@ -44,8 +44,8 @@ namespace senf {
     {
 #       include SENF_PARSER()        
 
-        SENF_PARSER_PRIVATE_FIELD( fbipCount_, UInt8Parser );
-        SENF_PARSER_PRIVATE_FIELD( reserved_, UInt8Parser );
+        SENF_PARSER_PRIVATE_FIELD( fbipCount_, UInt8Parser ); //<pkgdraw: hide
+        SENF_PARSER_PRIVATE_FIELD( reserved_, UInt8Parser ); //<pkgdraw: hide
 
         SENF_PARSER_VECTOR( fbips, fbipCount_, INet4AddressParser );
 
@@ -60,8 +60,8 @@ namespace senf {
     {
 #       include SENF_PARSER()        
 
-        SENF_PARSER_PRIVATE_FIELD( fbipCount_, UInt8Parser );
-        SENF_PARSER_PRIVATE_FIELD( reserved_, UInt8Parser );
+        SENF_PARSER_PRIVATE_FIELD( fbipCount_, UInt8Parser ); //<pkgdraw: hide
+        SENF_PARSER_PRIVATE_FIELD( reserved_, UInt8Parser ); //<pkgdraw: hide
 
         SENF_PARSER_VECTOR( fbips, fbipCount_, INet6AddressParser );
 
@@ -76,36 +76,38 @@ namespace senf {
 
         Parser implementing the DTCP packet according to RFC 3077
         
-        \see DTCPPacketType
+        \see DTCPHelloPacketType
      */
     struct DTCPHelloPacketParser : public PacketParserBase
     {
 #       include SENF_PARSER()
 
+        //>pkgdraw: name=vers
         SENF_PARSER_BITFIELD         ( versionNumber,        4, unsigned );  // must be 1
-        SENF_PARSER_BITFIELD         ( command,              4, unsigned );
+        SENF_PARSER_BITFIELD         ( command,              4, unsigned );  //<pkgdraw: name=cmd
 
-	enum Command { JOIN=1, LEAVE=2 };
+        enum Command { JOIN=1, LEAVE=2 };
 
         SENF_PARSER_FIELD            ( interval,             UInt8Parser );  // should be 5
         SENF_PARSER_FIELD            ( sequenceNumber,       UInt16Parser );
 
-        SENF_PARSER_PRIVATE_BITFIELD ( reserved0_,           3, unsigned );
+        SENF_PARSER_PRIVATE_BITFIELD ( reserved0_,           3, unsigned );  //<pkgdraw: name=
         SENF_PARSER_BITFIELD         ( receiveCapableFeed,   1, bool );
         SENF_PARSER_BITFIELD_RO      ( ipVersion,            4, unsigned );  // 4=IPv4, 6=IPv6
 
         SENF_PARSER_FIELD            ( tunnelProtocol,       UInt8Parser ); 
         SENF_PARSER_FIELD_RO         ( fbipCount,            UInt8Parser );
-        SENF_PARSER_PRIVATE_FIELD    ( reserved1_,           UInt8Parser );  //must be zero 
+        //>pkgdraw: name=
+        SENF_PARSER_PRIVATE_FIELD    ( reserved1_,           UInt8Parser );  // must be zero 
 
         // Go back to fbipCount so the variant has access to that field
         SENF_PARSER_GOTO( fbipCount );
 
         SENF_PARSER_VARIANT          ( fbipList_,            ipVersion,
-				           ( ids(na, has_v4fbipList, init_v4fbipList,
-                                                 key(4, DTCPIPv4AddressListParser)) ) 
-				           ( ids(na, has_v6fbipList, init_v6fbipList,
-                                                 key(6, DTCPIPv6AddressListParser)) ) );
+                           ( ids(na, has_v4fbipList, init_v4fbipList,
+                                 key(4, DTCPIPv4AddressListParser)) ) 
+                           ( ids(na, has_v6fbipList, init_v6fbipList,
+                                 key(6, DTCPIPv6AddressListParser)) ) );
 
         // We define the two variant accessors ourselves so we can directly return the vector and
         // not the collection parser which contains the vector ...
@@ -127,6 +129,8 @@ namespace senf {
         \par Fields:
             \ref DTCPHelloPacketParser
 
+        \image html DTCPPacket.png
+
         \ingroup protocolbundle_mpegdvb
      */
     struct DTCPHelloPacketType