switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Packets / DefaultBundle / LlcSnapPacket.hh

diff --git a/senf/Packets/DefaultBundle/LlcSnapPacket.hh b/senf/Packets/DefaultBundle/LlcSnapPacket.hh
index 9f0993d..61f7fa3 100644 (file)
--- a/senf/Packets/DefaultBundle/LlcSnapPacket.hh
+++ b/senf/Packets/DefaultBundle/LlcSnapPacket.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 LLC/SNAP public header */
@@ -27,17 +32,15 @@
 #define HH_SENF_Packets_DefaultBundle_LlcSnapPacket_ 1
 
 // Custom includes
-#include <algorithm>
 #include "EthernetPacket.hh"
-#include <senf/Packets/Packets.hh>
 
 //#include "LlcSnapPacket.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
     /** \brief Parse a LLC/SNAP header
-        
+
         \image html LlcSnapPacket.png
         \todo document me
      */
@@ -53,7 +56,7 @@ namespace senf {
         SENF_PARSER_FIELD( type_length, UInt16Parser );
 
         SENF_PARSER_FINALIZE(LlcSnapPacketParser);
-        
+
         SENF_PARSER_INIT() {
             dsap() = 0xaa;
             ssap() = 0xaa;
@@ -81,7 +84,7 @@ namespace senf {
         \ingroup protocolbundle_default
      */
     struct LlcSnapPacketType
-        : public PacketTypeBase, 
+        : public PacketTypeBase,
           public PacketTypeMixin<LlcSnapPacketType, EtherTypes>
     {
 #ifndef DOXYGEN
@@ -93,10 +96,10 @@ namespace senf {
         using mixin::nextPacketRange;
         using mixin::initSize;
         using mixin::init;
-        
+
         static factory_t nextPacketType(packet p);
         /** \brief Dump given LlcSnapPacket in readable form to given output stream */
-        static void dump(packet p, std::ostream & os); 
+        static void dump(packet p, std::ostream & os);
         static void finalize(packet p);
     };
 
@@ -107,7 +110,7 @@ namespace senf {
 }
 
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "LlcSnapPacket.cci"
 //#include "LlcSnapPacket.ct"
 //#include "LlcSnapPacket.cti"