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 a167849..9d16e19 100644 (file)
--- a/Socket/Protocols/INet/INet6Address.cc
+++ b/Socket/Protocols/INet/INet6Address.cc
@@ -49,7 +49,7 @@ prefix_ senf::INet6Address senf::INet6Address::from_string(std::string const & s
         return senf::INet6Address::from_data(&ina.s6_addr[0]);
 
     if (s.empty())
-        throw SyntaxException();
+        throw AddressSyntaxException();
 
     int herr (0);
 
@@ -80,15 +80,15 @@ prefix_ senf::INet6Address senf::INet6Address::from_string(std::string const & s
             &reinterpret_cast<in6_addr*>(*(ent->h_addr_list))->s6_addr[0]);
 
     if (resolve == ResolveINet4)
-        try {
-            return from_inet4address(INet4Address::from_string(s));
-        } catch (INet4Address::SyntaxException const & ex) {
-            throw SyntaxException();
-        } catch (INet4Address::UnknownHostnameException const & ex) {
-            throw UnknownHostnameException();
-        }
+        return from_inet4address(INet4Address::from_string(s));
     else
-        throw UnknownHostnameException();
+        throw UnknownHostnameException(s);
+}
+
+prefix_ in6_addr senf:: INet6Address::toin6_addr() const {
+    ::in6_addr ina;
+    std::copy((*this).begin(), (*this).end(), &ina.s6_addr[0]);
+    return ina;
 }
 
 prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6Address const & addr)
@@ -102,6 +102,20 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6Address const &
     return os;
 }
 
+prefix_ std::istream & senf::operator>>(std::istream & is, INet6Address & addr)
+{
+    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);
@@ -110,17 +124,17 @@ 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;
     std::string::size_type i (s.find('/'));
     if (i == std::string::npos)
-        throw INet6Address::SyntaxException();
+        throw AddressSyntaxException();
     try {
         prefix_len_ = boost::lexical_cast<unsigned>(std::string(s,i+1));
     } catch (boost::bad_lexical_cast const &) {
-        throw INet6Address::SyntaxException();
+        throw AddressSyntaxException();
     }
     address_ = INet6Address::from_string(std::string(s, 0, i));
     detail::apply_mask(prefix_len_, address_.begin(), address_.end(), _1 &= _2);
@@ -130,7 +144,7 @@ prefix_ senf::INet6Network::INet6Network(std::string s)
 #undef prefix_
 //#include "INet6Address.mpp"
 
-\f
+
 // Local Variables:
 // mode: c++
 // fill-column: 100