X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FLLAddressing.hh;h=b59ce922105541563dad9c4f4bccd105c48b3cb5;hb=51b24c3227717ce5ad8111a99c2d7eea5fa0bd8d;hp=0fa5017abfdb025083b7103f76389a327fc4ac8c;hpb=874b9d37b59223d9b0dce3bddafa130045419750;p=senf.git

diff --git a/senf/Socket/Protocols/Raw/LLAddressing.hh b/senf/Socket/Protocols/Raw/LLAddressing.hh
index 0fa5017..b59ce92 100644
--- a/senf/Socket/Protocols/Raw/LLAddressing.hh
+++ b/senf/Socket/Protocols/Raw/LLAddressing.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@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):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief LLSocketAddress and LLAddressingPolicy public header
@@ -29,19 +34,19 @@
 
 // Custom includes
 #include <sys/socket.h>
-#include <netpacket/packet.h>
+#include <linux/if_packet.h>
 #include <senf/Socket/Protocols/BSDAddressingPolicy.hh>
 #include <senf/Socket/Protocols/BSDSocketAddress.hh>
 #include "MACAddress.hh"
 
 //#include "LLAddressing.mpp"
 //#include "LLAddressing.ih"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
     /// \addtogroup addr_group
-    /// @{
+    //\{
 
     /** \brief Link local address
 
@@ -71,9 +76,9 @@ namespace senf {
                      , Outgoing  = PACKET_OUTGOING  /**< Packet sent out from this host */
         };
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         LLSocketAddress();              ///< Create empty address
         explicit LLSocketAddress(unsigned proto, std::string const & iface="");
@@ -101,11 +106,11 @@ namespace senf {
                                              \throws UnknownInterfaceException if \a iface is not
                                                  a valid interface name. */
 
-        LLSocketAddress(const LLSocketAddress& other);
-        LLSocketAddress& operator=(const LLSocketAddress& other);
+        LLSocketAddress(LLSocketAddress const & other);
+        LLSocketAddress& operator=(LLSocketAddress const & other);
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         MACAddress address() const;     ///< Return address
         std::string interface() const;  ///< Return interface name
@@ -130,10 +135,10 @@ namespace senf {
         struct ::sockaddr_ll addr_;
     };
 
-    /// @}
+    //\}
 
     /// \addtogroup policy_impl_group
-    /// @{
+    //\{
 
     /** \brief Addressing policy supporting link-local addressing
 
@@ -158,7 +163,7 @@ namespace senf {
         using BSDAddressingPolicyMixin<LLSocketAddress>::bind;
     };
 
-    /// @}
+    //\}
 
     /** \brief Write link layer address
         \related LLSocketAddress
@@ -166,7 +171,7 @@ namespace senf {
     std::ostream & operator<<(std::ostream & os, LLSocketAddress const & llAddr);
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "LLAddressing.cci"
 //#include "LLAddressing.ct"
 //#include "LLAddressing.cti"