X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINet6Address.cci;h=4e3d7f7f6b5e00c17f54386d3e1ceabdf023e83b;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=9fc8dd7f5a082fb52f5d2a26401c0a479b57e7f7;hpb=3fe2ed38b800bcb57afff676698462e763724245;p=senf.git

diff --git a/senf/Socket/Protocols/INet/INet6Address.cci b/senf/Socket/Protocols/INet/INet6Address.cci
index 9fc8dd7..4e3d7f7 100644
--- a/senf/Socket/Protocols/INet/INet6Address.cci
+++ b/senf/Socket/Protocols/INet/INet6Address.cci
@@ -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 INet6Address inline non-template implementation */
@@ -30,7 +35,7 @@
 #include <boost/lambda/lambda.hpp>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::INet6Address::INet6Address(senf::NoInit_t)
 {}
@@ -72,43 +77,12 @@ prefix_ senf::INet6Address senf::INet6Address::from_inet4address(INet4Address co
     return addr;
 }
 
-prefix_ senf::INet6Address senf::INet6Address::from_mac(senf::MACAddress const & mac)
-{
-    INet6Address addr;
-    addr[0] = 0xfe;
-    addr[1] = 0x80;
-    addr[8] = mac[0];
-    addr[9] = mac[1];
-    addr[10] = mac[2];
-    addr[11] = 0xff;
-    addr[12] = 0xfe;
-    addr[13] = mac[3];
-    addr[14] = mac[4];
-    addr[15] = mac[5];
-    return addr;
-}
-
-prefix_ senf::INet6Address senf::INet6Address::from_eui64(senf::EUI64 const & eui)
-{
-    INet6Address addr;
-    addr[0] = 0xfe;
-    addr[1] = 0x80;
-    std::copy(eui.begin(), eui.end(), addr.begin()+8);
-    return addr;
-}
-
 prefix_ senf::INet6Network senf::INet6Address::network()
     const
 {
     return senf::INet6Network(*this, 64);
 }
 
-prefix_ senf::EUI64 senf::INet6Address::id()
-    const
-{
-    return senf::EUI64::from_data(begin()+8);
-}
-
 prefix_ bool senf::INet6Address::universalId()
     const
 {
@@ -232,7 +206,7 @@ prefix_ void senf::INet6Address::id(boost::uint64_t id)
     (*this)[15] = id      ;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::INet6Network
 
 prefix_ senf::INet6Network::INet6Network()
@@ -314,7 +288,7 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6Network const &
     return os;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // namespace senf::detail members
 
 prefix_ boost::uint8_t senf::detail::low_bits_mask(unsigned bits)
@@ -322,7 +296,7 @@ prefix_ boost::uint8_t senf::detail::low_bits_mask(unsigned bits)
     return ((1<<bits)-1);
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_