Socket/Protocols/INet: Allow socket address string representation to omit the address...

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

diff --git a/Socket/Protocols/INet/INet4Address.cc b/Socket/Protocols/INet/INet4Address.cc
index bd9bd68..043e215 100644 (file)
--- a/Socket/Protocols/INet/INet4Address.cc
+++ b/Socket/Protocols/INet/INet4Address.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// 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
@@ -31,7 +31,7 @@
 #include <netdb.h>
 #include <sys/socket.h>
 #include <boost/lexical_cast.hpp>
-#ifdef _REENTRANT
+#if defined(_REENTRANT) && !defined(__GLIBC__)
 #include <boost/thread/mutex.hpp>
 #endif
 
@@ -54,12 +54,12 @@ prefix_ senf::INet4Address senf::INet4Address::from_string(std::string const & s
         return senf::INet4Address::from_inaddr(ina.s_addr);
 
     if  (s.empty())
-        throw SyntaxException();
+        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__
 
@@ -80,9 +80,9 @@ prefix_ senf::INet4Address senf::INet4Address::from_string(std::string const & s
 #   endif // __GLIBC__
 
     if (!ent)
-        throw UnknownHostnameException(); 
+        throw UnknownHostnameException(s);
     if (ent->h_addrtype != AF_INET)
-        throw UnknownHostnameException();
+        throw UnknownHostnameException(s);
 
     // We are only interested in the first address ...
     return senf::INet4Address::from_inaddr(
@@ -129,11 +129,11 @@ prefix_ senf::INet4Network::INet4Network(std::string s)
 {
     std::string::size_type i (s.find('/'));
     if (i == std::string::npos)
-        throw INet4Address::SyntaxException();
+        throw AddressSyntaxException();
     try {
         prefix_len_ = boost::lexical_cast<unsigned>(std::string(s,i+1));
     } catch (boost::bad_lexical_cast const &) {
-        throw INet4Address::SyntaxException();
+        throw AddressSyntaxException();
     }
     address_ = INet4Address(INet4Address::from_string(std::string(s, 0, i)).address() & mask());
 }