X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FMACAddress.hh;h=154d9f0ab18dc3313179a14499702fcde5f8077f;hb=51b24c3227717ce5ad8111a99c2d7eea5fa0bd8d;hp=6b3287ddb2e5f76fb7afc48b7346977ad604f90c;hpb=3fe2ed38b800bcb57afff676698462e763724245;p=senf.git

diff --git a/senf/Socket/Protocols/Raw/MACAddress.hh b/senf/Socket/Protocols/Raw/MACAddress.hh
index 6b3287d..154d9f0 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.hh
+++ b/senf/Socket/Protocols/Raw/MACAddress.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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 MACAddress public header */
@@ -34,10 +39,9 @@
 #include <boost/type_traits.hpp>
 #include <senf/Utils/safe_bool.hh>
 #include <senf/Utils/Tags.hh>
-#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 //#include "MACAddress.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -112,7 +116,7 @@ namespace senf {
                                              to a MAC address. This conversion is only possible, if
                                              the EUI-64 is MAC compatible: the 4th/5th byte (in
                                              transmission order) must be 0xFFFE.
-                                             \throws AddressSyntaxException if \a v is not a MAC
+                                             \throws AddressSyntaxException if \a eui is not a MAC
                                                  compatible EUI-64. */
 
         bool local() const;             ///< \c true, if address is locally administered
@@ -138,9 +142,12 @@ namespace senf {
      */
     std::istream & operator>>(std::istream & os, MACAddress & mac);
 
+    bool operator==(MACAddress const & mac, EUI64 const & eui64);
+    bool operator==(EUI64 const & eui64, MACAddress const & mac);
+
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "MACAddress.cci"
 #include "MACAddress.ct"
 //#include "MACAddress.cti"