-// 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
#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
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
+ // can explicitly ask for IPv4 addresses
# ifdef __GLIBC__
# endif // __GLIBC__
if (!ent)
- ///\fixme Need to give better exception here
- throw SyntaxException();
+ throw UnknownHostnameException();
if (ent->h_addrtype != AF_INET)
- throw SyntaxException();
+ throw UnknownHostnameException();
// We are only interested in the first address ...
return senf::INet4Address::from_inaddr(
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 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