replaced all BOOST_CHECK_NO_THROW with SENF_CHECK_NO_THROW

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

diff --git a/Socket/Protocols/INet/INet4Address.cc b/Socket/Protocols/INet/INet4Address.cc
index 2833d57..e162200 100644 (file)
--- a/Socket/Protocols/INet/INet4Address.cc
+++ b/Socket/Protocols/INet/INet4Address.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
@@ -28,7 +30,8 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/socket.h>
-#ifdef _REENTRANT
+#include <boost/lexical_cast.hpp>
+#if defined(_REENTRANT) && !defined(__GLIBC__)
 #include <boost/thread/mutex.hpp>
 #endif
 
@@ -40,24 +43,47 @@
 // senf::INet4Address::INet4Address
 
 prefix_ senf::INet4Address::INet4Address(address_type value)
-    : addr_(htonl(value))
-{}
+{
+    iref() = htonl(value);
+}
 
 prefix_ senf::INet4Address senf::INet4Address::from_string(std::string const & s)
 {
-    ::in_addr ina;
+    struct in_addr ina;
     if (::inet_pton(AF_INET,s.c_str(),&ina) > 0)
         return senf::INet4Address::from_inaddr(ina.s_addr);
+
+    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
+
+#   ifdef __GLIBC__
+
+    struct hostent entbuf;
+    char buffer[4096];
+    struct hostent * ent (0);
+    ::gethostbyname2_r(s.c_str(), AF_INET, &entbuf, buffer, sizeof(buffer), &ent, &herr);
+
+#   else // ! __GLIBC__
+
 #   ifdef _REENTRANT
     static boost::mutex mutex;
     boost::mutex::scoped_lock lock(mutex);
 #   endif
-    ::hostent * ent (::gethostbyname(s.c_str()));
+    struct hostent * ent (::gethostbyname(s.c_str()));
+    herr = h_errno;
+
+#   endif // __GLIBC__
+
     if (!ent)
-        ///\fixme Need to give better exception here
-        throw SyntaxException(); 
+        throw UnknownHostnameException(s);
     if (ent->h_addrtype != AF_INET)
-        throw SyntaxException();    
+        throw UnknownHostnameException(s);
+
     // We are only interested in the first address ...
     return senf::INet4Address::from_inaddr(
         reinterpret_cast<in_addr*>(*(ent->h_addr_list))->s_addr);
@@ -66,8 +92,8 @@ prefix_ senf::INet4Address senf::INet4Address::from_string(std::string const & s
 prefix_ bool senf::INet4Address::local()
     const
 {
-    address_type l (ntohl(addr_));
-    return 
+    address_type l (address());
+    return
         (l & 0xFF000000u) == 0x0A000000u ||
         (l & 0xFFF00000u) == 0xAC100000u ||
         (l & 0xFFFF0000u) == 0xA9FE0000u ||
@@ -77,19 +103,40 @@ prefix_ bool senf::INet4Address::local()
 prefix_ bool senf::INet4Address::loopback()
     const
 {
-    return (ntohl(addr_) & 0xFF000000u) == 0x7F000000u;
+    return (address() & 0xFF000000u) == 0x7F000000u;
 }
 
 prefix_ bool senf::INet4Address::multicast()
     const
 {
-    return (ntohl(addr_) & 0xF0000000u) == 0xE0000000u;
+    return (address() & 0xF0000000u) == 0xE0000000u;
+}
+
+prefix_ senf::INet4Address::address_type senf::INet4Address::address()
+    const
+{
+    return ntohl(iref());
 }
 
 senf::INet4Address const senf::INet4Address::None;
-senf::INet4Address const senf::INet4Address::Loopback = senf::INet4Address(0x7F000001u);
-senf::INet4Address const senf::INet4Address::Broadcast = senf::INet4Address(0xFFFFFFFFu);
+senf::INet4Address const senf::INet4Address::Loopback (0x7F000001u);
+senf::INet4Address const senf::INet4Address::Broadcast (0xFFFFFFFFu);
 
+///////////////////////////////////////////////////////////////////////////
+// senf::INet4Network
+
+prefix_ senf::INet4Network::INet4Network(std::string const & s)
+{
+    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_ = INet4Address(INet4Address::from_string(std::string(s, 0, i)).address() & mask());
+}
 
 ///////////////////////////////////////////////////////////////////////////
 // namespace members
@@ -98,18 +145,32 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, INet4Address const &
 {
     ::in_addr ina;
     char buffer[16];
-    ina.s_addr = addr.raw();
+    ina.s_addr = addr.inaddr();
     ::inet_ntop(AF_INET,&ina,buffer,16);
-    buffer[15] = 0; 
+    buffer[15] = 0;
     os << buffer;
     return os;
 }
 
+prefix_ std::istream & senf::operator>>(std::istream & is, INet4Address & addr)
+{
+    std::string s;
+    if (!(is >> s))
+        return is;
+    try {
+        addr = INet4Address::from_string(s);
+    }
+    catch (AddressException &) {
+        is.setstate(std::ios::failbit);
+    }
+    return is;
+}
+
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "INet4Address.mpp"
 
-\f
+
 // Local Variables:
 // mode: c++
 // fill-column: 100