X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FINet%2FINet4Address.cc;h=f6b53627503fa83a3ed7b49011ea15aabad0a5c1;hb=81ffa1c459b96dd44472bcef37e1e373934ee138;hp=2833d577c025ebfaee36013681084d5a164d8a1f;hpb=9c67039f2a8d9c445ce21912ed814743f61b104c;p=senf.git

diff --git a/Socket/Protocols/INet/INet4Address.cc b/Socket/Protocols/INet/INet4Address.cc
index 2833d57..f6b5362 100644
--- a/Socket/Protocols/INet/INet4Address.cc
+++ b/Socket/Protocols/INet/INet4Address.cc
@@ -1,3 +1,5 @@
+// $Id$
+//
 // Copyright (C) 2007 
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
 // Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
@@ -28,6 +30,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/socket.h>
+#include <boost/lexical_cast.hpp>
 #ifdef _REENTRANT
 #include <boost/thread/mutex.hpp>
 #endif
@@ -40,24 +43,44 @@
 // 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);
+    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(); 
     if (ent->h_addrtype != AF_INET)
         throw SyntaxException();    
+
     // We are only interested in the first address ...
     return senf::INet4Address::from_inaddr(
         reinterpret_cast<in_addr*>(*(ent->h_addr_list))->s_addr);
@@ -66,7 +89,7 @@ prefix_ senf::INet4Address senf::INet4Address::from_string(std::string const & s
 prefix_ bool senf::INet4Address::local()
     const
 {
-    address_type l (ntohl(addr_));
+    address_type l (address());
     return 
         (l & 0xFF000000u) == 0x0A000000u ||
         (l & 0xFFF00000u) == 0xAC100000u ||
@@ -77,19 +100,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 s)
+{
+    std::string::size_type i (s.find('/'));
+    if (i == std::string::npos)
+        throw INet4Address::SyntaxException();
+    try {
+        prefix_len_ = boost::lexical_cast<unsigned>(std::string(s,i+1));
+    } catch (boost::bad_lexical_cast const &) {
+        throw INet4Address::SyntaxException();
+    }
+    address_ = INet4Address(INet4Address::from_string(std::string(s, 0, i)).address() & mask());
+}
 
 ///////////////////////////////////////////////////////////////////////////
 // namespace members
@@ -98,7 +142,7 @@ 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; 
     os << buffer;