removed some tabs

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

diff --git a/Socket/Protocols/INet/INet6Address.cc b/Socket/Protocols/INet/INet6Address.cc
index 0def041..6c76f77 100644 (file)
--- a/Socket/Protocols/INet/INet6Address.cc
+++ b/Socket/Protocols/INet/INet6Address.cc
@@ -1,6 +1,8 @@
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// $Id$
+//
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -30,6 +32,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <boost/lexical_cast.hpp>
 
 //#include "INet6Address.mpp"
 #define prefix_
@@ -38,15 +41,20 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::INet6Address
 
-prefix_ senf::INet6Address senf::INet6Address::from_string(std::string const & s)
+prefix_ senf::INet6Address senf::INet6Address::from_string(std::string const & s,
+                                                           Resolve_t resolve)
 {
     struct in6_addr ina;
     if (::inet_pton(AF_INET6,s.c_str(),&ina) > 0)
         return senf::INet6Address::from_data(&ina.s6_addr[0]);
+
+    if (s.empty())
+        throw AddressSyntaxException();
+
     int herr (0);
 
     // If available, we use the reentrant GNU variant. This has the additional advantage, that we
-    // can explicitly ask for IpV4 addresses
+    // can explicitly ask for IPv4 addresses
 
 #   ifdef __GLIBC__
 
@@ -66,33 +74,62 @@ prefix_ senf::INet6Address senf::INet6Address::from_string(std::string const & s
 
 #   endif // __GLIBC__
 
-    if (!ent)
-        ///\fixme Need to give better exception here
-        throw SyntaxException(); 
-    if (ent->h_addrtype != AF_INET6)
-        throw SyntaxException();    
+    if (ent && ent->h_addrtype == AF_INET6)
+        // We are only interested in the first address ...
+        return senf::INet6Address::from_data(
+            &reinterpret_cast<in6_addr*>(*(ent->h_addr_list))->s6_addr[0]);
 
-    // We are only interested in the first address ...
-    return senf::INet6Address::from_data(
-        &reinterpret_cast<in6_addr*>(*(ent->h_addr_list))->s6_addr[0]);
+    if (resolve == ResolveINet4)
+        return from_inet4address(INet4Address::from_string(s));
+    else
+        throw UnknownHostnameException(s);
 }
 
-prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6Address const & addr)
-{
+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::string senf::INet6Address::toString() const {
     char buffer[5*8];
-    std::copy(addr.begin(),addr.end(),&ina.s6_addr[0]);
-    ::inet_ntop(AF_INET6,&ina,buffer,sizeof(buffer));
-    buffer[5*8] = 0;
-    os << buffer;
+    ::in6_addr ina  = (*this).toin6_addr();
+    ::inet_ntop(AF_INET6, & ina , buffer, sizeof(buffer));
+    buffer[sizeof(buffer)-1] = 0;
+    return buffer;
+}
+
+prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6Address const & addr)
+{
+    os << addr.toString();
     return os;
 }
 
+
 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);
 senf::INet6Address const senf::INet6Address::AllRouters (0xFF02u,0u,0u,0u,0u,0u,0u,2u);
 
+///////////////////////////////////////////////////////////////////////////
+// senf::INet6Network
+
+prefix_ senf::INet6Network::INet6Network(std::string s)
+{
+    using boost::lambda::_1;
+    using boost::lambda::_2;
+    std::string::size_type i (s.find('/'));
+    if (i == std::string::npos)
+        throw AddressSyntaxException();
+    try {
+        prefix_len_ = boost::lexical_cast<unsigned>(std::string(s,i+1));
+    } catch (boost::bad_lexical_cast const &) {
+        throw AddressSyntaxException();
+    }
+    address_ = INet6Address::from_string(std::string(s, 0, i));
+    detail::apply_mask(prefix_len_, address_.begin(), address_.end(), _1 &= _2);
+}
+
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "INet6Address.mpp"