X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FMPEGDVBBundle%2FSNDUPacket.hh;h=f7ebedc2107925847ebebe5dbbbd39176638a308;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=e7009420f79d0ed6195dbeffbeeefc1a20e034d9;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Packets/MPEGDVBBundle/SNDUPacket.hh b/senf/Packets/MPEGDVBBundle/SNDUPacket.hh
index e700942..f7ebedc 100644
--- a/senf/Packets/MPEGDVBBundle/SNDUPacket.hh
+++ b/senf/Packets/MPEGDVBBundle/SNDUPacket.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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
-// 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):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief SNDUPacket public header */
@@ -27,20 +32,19 @@
 #define HH_SENF_Packets_MPEGDVBBundle_SNDUPacket_ 1
 
 // Custom includes
-#include <algorithm>
 #include <boost/crc.hpp>
 #include <senf/Packets/Packets.hh>
 #include <senf/Packets/DefaultBundle/EthernetPacket.hh>
 
 //#include "SNDUPacket.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
     /** \brief parse ULE SNDU Packet
-    
+
         Parser implementing the header and trailer of a ULE SNDU Packet
-        
+
         \see SNDUPacketType
      */
     struct SNDUPacketParser : public PacketParserBase
@@ -53,36 +57,36 @@ namespace senf {
         SENF_PARSER_PRIVATE_BITFIELD ( d_bit_       ,  1 , unsigned );
         SENF_PARSER_BITFIELD         ( length       , 15 , unsigned );
         SENF_PARSER_FIELD            ( type         , UInt16Parser  );
-        SENF_PARSER_PRIVATE_VARIANT  ( destination_ , d_bit_        , 
+        SENF_PARSER_PRIVATE_VARIANT  ( destination_ , d_bit_        ,
                                                       (MACAddressParser) (VoidPacketParser) );
-        
+
         SENF_PARSER_FINALIZE( SNDUPacketParser );
-        
-        MACAddressParser destination()         /// Only defined if d_bit() == \c false
+
+        MACAddressParser destination()  ///< Only defined if d_bit() == \c false
             { return destination_().get<0>(); }
 
-        bool d_bit()                    /// Destination absent bit
+        bool d_bit()                    ///< Destination absent bit
             { return d_bit_(); }
 
-        void withDestination()          /// Clear destination absent bit
+        void withDestination()          ///< Clear destination absent bit
             { destination_().init<0>(); }
-        
-        void withoutDestination()       /// Set destination absent bit
+
+        void withoutDestination()       ///< Set destination absent bit
             { destination_().init<1>(); }
 
-        UInt32Parser crc() 
+        UInt32Parser crc()
             { return parse<UInt32Parser>( data().size() - 4 ); }
 
         boost::uint32_t calcCrc() const;
     };
 
-    
+
     struct ULEExtHeaderTypes {
         typedef boost::uint16_t key_t;
     };
-    
+
     /** \brief ULE SNDU Packet
-        
+
         \par Packet type (typedef):
             \ref SNDUPacket
 
@@ -103,37 +107,37 @@ namespace senf {
 //        using mixin::nextPacketRange;
 //        using mixin::nextPacketType;
 //        using mixin::init;
-        
+
 //        static key_t nextPacketKey(packet p);
-        
+
         static void init(packet p);
 
         static factory_t nextPacketType(packet p);
-        
+
         static optional_range nextPacketRange(packet p);
-        
+
         static void dump(packet p, std::ostream & os);
-        
+
         static PacketParserBase::size_type initSize();
-        
+
         static PacketParserBase::size_type initHeadSize();
     };
-        
+
     typedef SNDUPacketType::packet SNDUPacket;
-    
+
     typedef boost::crc_optimal<32, 0x04C11DB7, 0xFFFFFFFF, 0, false, false> ule_crc32;
 
 
     /*!
-     \def ULE_END_INDICATOR 
-         ULE End Indicator; indicates to the receiver that there are no 
+     \def ULE_END_INDICATOR
+         ULE End Indicator; indicates to the receiver that there are no
          further SNDUs present within the current TS packet.
     */
 #   define ULE_END_INDICATOR 0xffff
 }
 
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "SNDUPacket.cci"
 //#include "SNDUPacket.ct"
 //#include "SNDUPacket.cti"