X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FINet%2FINet6Address.cci;h=93ab3c0aa1321dafd31b047a8ebb00bdf5aba177;hb=d001b1fe2a8fb121145d2a111d737219abae20d7;hp=323968b56f12a99d1fe689ae3b5cf3040d203090;hpb=e9db10951ae84696e2c287c22c86add276213281;p=senf.git

diff --git a/Socket/Protocols/INet/INet6Address.cci b/Socket/Protocols/INet/INet6Address.cci
index 323968b..93ab3c0 100644
--- a/Socket/Protocols/INet/INet6Address.cci
+++ b/Socket/Protocols/INet/INet6Address.cci
@@ -58,7 +58,12 @@ prefix_ senf::INet6Address::INet6Address(boost::uint16_t a0, boost::uint16_t a1,
     (*this)[15] = boost::uint8_t(a7);
 }
 
-prefix_ senf::INet6Address senf::INet6Address::from_inet4address(INet4Address addr4)
+prefix_ senf::INet6Address senf::INet6Address::from_in6addr(in6_addr const & in6addr)
+{
+    return senf::INet6Address::from_data(&in6addr.s6_addr[0]);
+}
+
+prefix_ senf::INet6Address senf::INet6Address::from_inet4address(INet4Address const & addr4)
 {
     INet6Address addr;
     addr[10] = 0xffu;
@@ -70,7 +75,7 @@ prefix_ senf::INet6Address senf::INet6Address::from_inet4address(INet4Address ad
 prefix_ boost::uint64_t senf::INet6Address::network()
     const
 {
-    return 
+    return
         ((boost::uint64_t((*this)[0]) & 0xff) << 56 ) |
         ((boost::uint64_t((*this)[1]) & 0xff) << 48 ) |
         ((boost::uint64_t((*this)[2]) & 0xff) << 40 ) |
@@ -81,16 +86,10 @@ prefix_ boost::uint64_t senf::INet6Address::network()
         ((boost::uint64_t((*this)[7]) & 0xff)       );
 }
 
-prefix_ bool senf::INet6Address::hasEuid64()
-    const
-{
-    return unicast() && ((*this)[0]&0xE0u) != 0u;
-}
-
 prefix_ boost::uint64_t senf::INet6Address::id()
     const
 {
-    return 
+    return
         ((boost::uint64_t((*this)[ 8]) & 0xff) << 56 ) |
         ((boost::uint64_t((*this)[ 9]) & 0xff) << 48 ) |
         ((boost::uint64_t((*this)[10]) & 0xff) << 40 ) |
@@ -113,16 +112,22 @@ prefix_ bool senf::INet6Address::groupId()
     return (*this)[8] & 1u;
 }
 
-prefix_ bool senf::INet6Address::unicast()
+prefix_ senf::INet4Address senf::INet6Address::inet4address()
     const
 {
-    return ! multicast();
+    return INet4Address::from_data(&(*this)[12]);
+}
+
+prefix_ bool senf::INet6Address::inet4Mapped()
+    const
+{
+    return CheckINet6Network<0u,0u,0u,0u,0u,0xFFFFu,96>::match(*this);
 }
 
 prefix_ bool senf::INet6Address::multicast()
     const
 {
-    return (*this)[0] == 0xFFu;
+    return (*this)[0] == 0xFFu || (inet4Mapped() && inet4address().multicast());
 }
 
 prefix_ senf::INet6Address::ScopeId senf::INet6Address::scope()
@@ -133,40 +138,40 @@ prefix_ senf::INet6Address::ScopeId senf::INet6Address::scope()
             AdminScope, SiteScope, UnassignedScope, UnassignedScope,
             OrganizationScope, UnassignedScope, UnassignedScope, UnassignedScope,
             UnassignedScope, UnassignedScope, GlobalScope, ReservedScope };
-    return multicast() ? scopeMap[(*this)[1] & 0x0Fu] : 
-        (*this)[0] == 0xFEu ? (((*this)[1]&0xC0) == 0x80 ? LinkScope : 
-                               ((*this)[1]&0xC0) == 0xC0 ? SiteScope : GlobalScope ) 
+    return multicast() ? scopeMap[(*this)[1] & 0x0Fu] :
+        (*this)[0] == 0xFEu ? (((*this)[1]&0xC0) == 0x80 ? LinkScope :
+                               ((*this)[1]&0xC0) == 0xC0 ? SiteScope : GlobalScope )
         : GlobalScope;
 }
 
-prefix_ bool senf::INet6Address::globalScope()
+prefix_ bool senf::INet6Address::unicast()
     const
 {
-    return scope() == GlobalScope;
+    return ! multicast();
 }
- 
-prefix_ bool senf::INet6Address::linkScope()
+
+prefix_ bool senf::INet6Address::hasEuid64()
     const
 {
-    return scope() == LinkScope;
+    return unicast() && ((*this)[0]&0xE0u) != 0u;
 }
 
-prefix_ senf::INet4Address senf::INet6Address::inet4address()
+prefix_ bool senf::INet6Address::globalScope()
     const
 {
-    return INet4Address::from_data(&(*this)[12]);
+    return scope() == GlobalScope;
 }
 
-prefix_ bool senf::INet6Address::inet4Compatible()
+prefix_ bool senf::INet6Address::linkScope()
     const
 {
-    return CheckINet6Network<0u,96>::match(*this);
+    return scope() == LinkScope;
 }
 
-prefix_ bool senf::INet6Address::inet4Mapped()
+prefix_ bool senf::INet6Address::inet4Compatible()
     const
 {
-    return CheckINet6Network<0u,0u,0u,0u,0u,0xFFFFu,96>::match(*this);
+    return CheckINet6Network<0u,96>::match(*this);
 }
 
 prefix_ bool senf::INet6Address::globalMulticastAddr()
@@ -225,7 +230,7 @@ prefix_ senf::INet6Network::INet6Network()
     : prefix_len_(), address_()
 {}
 
-prefix_ senf::INet6Network::INet6Network(INet6Address address, unsigned prefix_len)
+prefix_ senf::INet6Network::INet6Network(INet6Address const & address, unsigned prefix_len)
     : prefix_len_(prefix_len), address_(address)
 {
     using boost::lambda::_1;
@@ -257,7 +262,7 @@ prefix_ bool senf::INet6Network::operator==(INet6Network const & other)
     return prefix_len() == other.prefix_len() && address() == other.address();
 }
 
-prefix_ bool senf::INet6Network::match(INet6Address addr)
+prefix_ bool senf::INet6Network::match(INet6Address const & addr)
     const
 {
     using boost::lambda::_1;
@@ -267,7 +272,7 @@ prefix_ bool senf::INet6Network::match(INet6Address addr)
                                 _1 != (_2 & _3)) == address_.end();
 }
 
-prefix_ bool senf::INet6Network::match(INet6Network net)
+prefix_ bool senf::INet6Network::match(INet6Network const & net)
     const
 {
     return net.prefix_len() >= prefix_len() && match(net.address());
@@ -311,7 +316,7 @@ prefix_ boost::uint8_t senf::detail::low_bits_mask(unsigned bits)
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100