// $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
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 SyntaxException();
+
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__
return senf::INet6Address::from_data(
&reinterpret_cast<in6_addr*>(*(ent->h_addr_list))->s6_addr[0]);
- ///\todo Throw better exceptions here ?
-
if (resolve == ResolveINet4)
try {
return from_inet4address(INet4Address::from_string(s));
} catch (INet4Address::SyntaxException const & ex) {
throw SyntaxException();
+ } catch (INet4Address::UnknownHostnameException const & ex) {
+ throw UnknownHostnameException();
}
else
- throw SyntaxException();
+ throw UnknownHostnameException();
}
prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6Address const & addr)
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;
+ buffer[sizeof(buffer)-1] = 0;
os << buffer;
return os;
}