added $Id$ to file header

[senf.git] / Packets / MPEGDVBBundle / DTCPPacket.hh

diff --git a/Packets/MPEGDVBBundle/DTCPPacket.hh b/Packets/MPEGDVBBundle/DTCPPacket.hh
index 420f0a7..eca766e 100644 (file)
--- a/Packets/MPEGDVBBundle/DTCPPacket.hh
+++ b/Packets/MPEGDVBBundle/DTCPPacket.hh
@@ -1,34 +1,52 @@
+// $Id$
+//
 // Copyright (C) 2007 
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
 // Kompetenzzentrum NETwork research (NET)
 //     David Wagner <david.wagner@fokus.fraunhofer.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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
 #ifndef DTCPPACKET_HH_
 #define DTCPPACKET_HH_
 
 #include "../../Packets/Packets.hh"
-#include "../../Packets/DefaultBundle/IpV4Packet.hh"
-#include "../../Packets/DefaultBundle/IpV6Packet.hh"
+#include "../../Packets/DefaultBundle/IPv4Packet.hh"
+#include "../../Packets/DefaultBundle/IPv6Packet.hh"
 
 namespace senf {
     
     //first we have to define some helpers
-    struct DTCPIpV4AddressListParser : public PacketParserBase {
+    struct DTCPIPv4AddressListParser : public PacketParserBase {
 #       include SENF_PARSER()        
         SENF_PARSER_PRIVATE_FIELD ( num_of_fbips, Parse_UInt8 );
         SENF_PARSER_PRIVATE_FIELD ( reserved ,    Parse_UInt8 );   //must be zero 
         SENF_PARSER_VEC_N         ( fbiplist,     num_of_fbips, Parse_INet4Address );
 
-       SENF_PARSER_FINALIZE(DTCPIpV4AddressListParser);
+       SENF_PARSER_FINALIZE(DTCPIPv4AddressListParser);
     };
         
-    struct DTCPIpV6AddressListParser : public PacketParserBase {
+    struct DTCPIPv6AddressListParser : public PacketParserBase {
 #       include SENF_PARSER()        
         SENF_PARSER_PRIVATE_FIELD ( num_of_fbips, Parse_UInt8 );
         SENF_PARSER_PRIVATE_FIELD ( reserved,     Parse_UInt8 );   //must be zero 
         SENF_PARSER_VEC_N         ( fbiplist,     num_of_fbips, Parse_INet6Address );
 
-       SENF_PARSER_FINALIZE(DTCPIpV6AddressListParser);
+       SENF_PARSER_FINALIZE(DTCPIPv6AddressListParser);
     };
 
     /** \brief Parse a DTCP packet
@@ -56,9 +74,9 @@ namespace senf {
          *                                                       (senf::VoidPacketParser) //1
          *                                                       (senf::VoidPacketParser) //2
          *                                                       (senf::VoidPacketParser) //3
-         *                                                       (senf::Parse_ListB< IpV4Packet, num_of_fbips>) //4 
+         *                                                       (senf::Parse_ListB< IPv4Packet, num_of_fbips>) //4 
          *                                                       (senf::VoidPacketParser) //5
-         *                                                       (senf::Parse_ListB< IpV6Packet, num_of_fbips>) ); //6
+         *                                                       (senf::Parse_ListB< IPv6Packet, num_of_fbips>) ); //6
          * This can't work for two reasons: 
          *             -SENF_PARSER_PRIVATE_VARIANT only accepts 6 templates in types but you have to start from 0.
          *             -you NEVER can use templated Parsers in these macros since the macro-preprocessor won't recognize the <> brackets and will
@@ -87,8 +105,8 @@ namespace senf {
                };
     
         SENF_PARSER_VARIANT_TRANS    ( fbiplist,             ip_version, ip_version_translator,
-                                                                 (senf::DTCPIpV4AddressListParser)        //IPv4 
-                                                                 (senf::DTCPIpV6AddressListParser) );     //IPv6
+                                                                 (senf::DTCPIPv4AddressListParser)        //IPv4 
+                                                                 (senf::DTCPIPv6AddressListParser) );     //IPv6
 
        SENF_PARSER_FINALIZE(Parse_DTCPPacket);
     };