X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINet6Address.cc;h=9319489d2b7b911e998c9712b96ea8fc7c437f59;hb=cb50871835b7a5c37e4fd32d38de67fa12570ebc;hp=760952b004b40900f5c59cca7ea47c2131e8b21a;hpb=5bd0f0d58ba30d95a02b46fc9122a7e981bcbcad;p=senf.git

diff --git a/senf/Socket/Protocols/INet/INet6Address.cc b/senf/Socket/Protocols/INet/INet6Address.cc
index 760952b..9319489 100644
--- a/senf/Socket/Protocols/INet/INet6Address.cc
+++ b/senf/Socket/Protocols/INet/INet6Address.cc
@@ -34,6 +34,8 @@
 #include <netdb.h>
 #include <boost/lexical_cast.hpp>
 #include <senf/Socket/Protocols/AddressExceptions.hh>
+#include <senf/Socket/Protocols/Raw/MACAddress.hh>
+#include <senf/Socket/Protocols/Raw/EUI64.hh>
 
 //#include "INet6Address.mpp"
 #define prefix_
@@ -92,6 +94,38 @@ prefix_ in6_addr senf:: INet6Address::toin6_addr() const {
     return ina;
 }
 
+prefix_ senf::INet6Address senf::INet6Address::from_mac(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(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::EUI64 senf::INet6Address::id()
+    const
+{
+    return EUI64::from_data(begin()+8);
+}
+
 prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6Address const & addr)
 {
     ::in6_addr ina;
@@ -141,11 +175,25 @@ prefix_ senf::INet6Network::INet6Network(std::string const & s)
     detail::apply_mask(prefix_len_, address_.begin(), address_.end(), _1 &= _2);
 }
 
+prefix_ std::istream & senf::operator>>(std::istream & is, INet6Network & addr)
+{
+    std::string s;
+    if (!(is >> s))
+        return is;
+    try {
+        addr = INet6Network(s);
+    }
+    catch (AddressException &) {
+        is.setstate(std::ios::failbit);
+    }
+    return is;
+}
+
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "INet6Address.mpp"
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100