X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FMPEGDVBBundle%2FDTCPPacket.hh;h=e4006f219ea5ed0baad01d0272eaa6a259a1362f;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=f5bdbe2c80ebc329c799e7df0a35cc2628dedac5;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Packets/MPEGDVBBundle/DTCPPacket.hh b/senf/Packets/MPEGDVBBundle/DTCPPacket.hh
index f5bdbe2..e4006f2 100644
--- a/senf/Packets/MPEGDVBBundle/DTCPPacket.hh
+++ b/senf/Packets/MPEGDVBBundle/DTCPPacket.hh
@@ -2,24 +2,28 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     David Wagner <dw6@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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// 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.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// 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.
-
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   David Wagner <dw6@berlios.de>
 /** \file
     \brief DTCPPacket public header */
 
@@ -27,12 +31,10 @@
 #define HH_SENF_Packets_MPEGDVBBundle_DTCPPacket_ 1
 
 // Custom includes
-#include <senf/Packets/Packets.hh>
-#include <senf/Packets/DefaultBundle/IPv4Packet.hh>
 #include <senf/Packets/DefaultBundle/IPv6Packet.hh>
 
 //#include "DTCPPacket.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -40,9 +42,9 @@ namespace senf {
 #   define DTCP_V6_MCADDRESS "FF02:0:0:0:0:0:1:4"
 #   define DTCP_UDP_PORT 652
 
-    struct DTCPIPv4AddressListParser : public PacketParserBase 
+    struct DTCPIPv4AddressListParser : public PacketParserBase
     {
-#       include SENF_PARSER()        
+#       include SENF_PARSER()
 
         SENF_PARSER_PRIVATE_FIELD( fbipCount_, UInt8Parser ); //<pkgdraw: hide
         SENF_PARSER_PRIVATE_FIELD( reserved_, UInt8Parser ); //<pkgdraw: hide
@@ -55,10 +57,10 @@ namespace senf {
 
         SENF_PARSER_FINALIZE(DTCPIPv4AddressListParser);
     };
-        
-    struct DTCPIPv6AddressListParser : public PacketParserBase 
+
+    struct DTCPIPv6AddressListParser : public PacketParserBase
     {
-#       include SENF_PARSER()        
+#       include SENF_PARSER()
 
         SENF_PARSER_PRIVATE_FIELD( fbipCount_, UInt8Parser ); //<pkgdraw: hide
         SENF_PARSER_PRIVATE_FIELD( reserved_, UInt8Parser ); //<pkgdraw: hide
@@ -75,7 +77,7 @@ namespace senf {
     /** \brief Parse a DTCP HELLO packet
 
         Parser implementing the DTCP packet according to RFC 3077
-        
+
         \see DTCPHelloPacketType
      */
     struct DTCPHelloPacketParser : public PacketParserBase
@@ -95,17 +97,17 @@ namespace senf {
         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            ( tunnelProtocol,       UInt8Parser );
         SENF_PARSER_FIELD_RO         ( fbipCount,            UInt8Parser );
         //>pkgdraw: name=
-        SENF_PARSER_PRIVATE_FIELD    ( reserved1_,           UInt8Parser );  // must be zero 
+        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)) ) 
+                                 key(4, DTCPIPv4AddressListParser)) )
                            ( ids(na, has_v6fbipList, init_v6fbipList,
                                  key(6, DTCPIPv6AddressListParser)) ) );
 
@@ -117,12 +119,12 @@ namespace senf {
 
         typedef DTCPIPv6AddressListParser::fbips_t v6fbipList_t;
         v6fbipList_t v6fbipList() { return fbipList_().get<1>().fbips(); }
-                                                                 
+
         SENF_PARSER_FINALIZE(DTCPHelloPacketParser);
     };
-    
+
     /** \brief DTCP HELLO packet
-        
+
         \par Packet type (typedef):
             \ref DTCPHelloPacket
 
@@ -140,19 +142,19 @@ namespace senf {
         typedef PacketTypeMixin<DTCPHelloPacketType> mixin;
         typedef ConcretePacket<DTCPHelloPacketType> packet;
         typedef DTCPHelloPacketParser parser;
-    
+
         using mixin::nextPacketRange;
         using mixin::init;
         using mixin::initSize;
-        
+
         static void dump(packet p, std::ostream & os);
     };
-    
+
     /** \brief DTCP packet typedef */
     typedef DTCPHelloPacketType::packet DTCPHelloPacket;
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "DTCPPacket.cci"
 //#include "DTCPPacket.ct"
 //#include "DTCPPacket.cti"