Socket/Protocols/Raw/PacketSocketHandle: added promisc() method

[senf.git] / Socket / Protocols / INet / INet6Address.cc

diff --git a/Socket/Protocols/INet/INet6Address.cc b/Socket/Protocols/INet/INet6Address.cc
index 6c76f77..9d16e19 100644 (file)
--- a/Socket/Protocols/INet/INet6Address.cc
+++ b/Socket/Protocols/INet/INet6Address.cc
@@ -91,21 +91,31 @@ prefix_ in6_addr senf:: INet6Address::toin6_addr() const {
     return ina;
 }
 
-prefix_ std::string senf::INet6Address::toString() const {
+prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6Address const & addr)
+{
+    ::in6_addr ina;
     char buffer[5*8];
-    ::in6_addr ina  = (*this).toin6_addr();
-    ::inet_ntop(AF_INET6, & ina , buffer, sizeof(buffer));
+    std::copy(addr.begin(),addr.end(),&ina.s6_addr[0]);
+    ::inet_ntop(AF_INET6,&ina,buffer,sizeof(buffer));
     buffer[sizeof(buffer)-1] = 0;
-    return buffer;
+    os << buffer;
+    return os;
 }
 
-prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6Address const & addr)
+prefix_ std::istream & senf::operator>>(std::istream & is, INet6Address & addr)
 {
-    os << addr.toString();
-    return os;
+    std::string s;
+    if (!(is >> s))
+        return is;
+    try {
+        addr = INet6Address::from_string(s);
+    }
+    catch (AddressException &) {
+        is.setstate(std::ios::failbit);
+    }
+    return is;
 }
 
-
 senf::INet6Address const senf::INet6Address::None;
 senf::INet6Address const senf::INet6Address::Loopback   (0u,0u,0u,0u,0u,0u,0u,1u);
 senf::INet6Address const senf::INet6Address::AllNodes   (0xFF02u,0u,0u,0u,0u,0u,0u,1u);
@@ -114,7 +124,7 @@ senf::INet6Address const senf::INet6Address::AllRouters (0xFF02u,0u,0u,0u,0u,0u,
 ///////////////////////////////////////////////////////////////////////////
 // senf::INet6Network
 
-prefix_ senf::INet6Network::INet6Network(std::string s)
+prefix_ senf::INet6Network::INet6Network(std::string const & s)
 {
     using boost::lambda::_1;
     using boost::lambda::_2;
@@ -134,7 +144,7 @@ prefix_ senf::INet6Network::INet6Network(std::string s)
 #undef prefix_
 //#include "INet6Address.mpp"
 
-\f
+
 // Local Variables:
 // mode: c++
 // fill-column: 100