X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINet6Address.cci;h=f33454c220cf573a949385033b6f72b747df4e7f;hb=d0c31526ac12869eed085891e3ae13e8b21072e6;hp=290db51e0c15928bf26a2a6ce426eb607c005fe4;hpb=ed7919f7207bdda00e275d9a6a31cd120d2e6afa;p=senf.git

diff --git a/senf/Socket/Protocols/INet/INet6Address.cci b/senf/Socket/Protocols/INet/INet6Address.cci
index 290db51..f33454c 100644
--- a/senf/Socket/Protocols/INet/INet6Address.cci
+++ b/senf/Socket/Protocols/INet/INet6Address.cci
@@ -30,7 +30,7 @@
 #include <boost/lambda/lambda.hpp>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::INet6Address::INet6Address(senf::NoInit_t)
 {}
@@ -72,44 +72,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] ^ 0x2;  // invert the "u" (universal/local) bit; see RFC 4291 Appx. A
-    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;
-    addr[8] = eui[0] ^ 0x2;  // invert the "u" (universal/local) bit; see RFC 4291 Appx. A
-    std::copy(eui.begin()+1, eui.end(), addr.begin()+9);
-    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
 {
@@ -233,7 +201,7 @@ prefix_ void senf::INet6Address::id(boost::uint64_t id)
     (*this)[15] = id      ;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::INet6Network
 
 prefix_ senf::INet6Network::INet6Network()
@@ -315,7 +283,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)
@@ -323,7 +291,7 @@ prefix_ boost::uint8_t senf::detail::low_bits_mask(unsigned bits)
     return ((1<<bits)-1);
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_