// $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
return senf::INet6Address::from_data(&ina.s6_addr[0]);
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__
&reinterpret_cast<in6_addr*>(*(ent->h_addr_list))->s6_addr[0]);
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();
- }
+ return from_inet4address(INet4Address::from_string(s));
else
- throw UnknownHostnameException();
+ throw UnknownHostnameException(s);
}
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;
}
using boost::lambda::_2;
std::string::size_type i (s.find('/'));
if (i == std::string::npos)
- throw INet6Address::SyntaxException();
+ throw AddressSyntaxException();
try {
prefix_len_ = boost::lexical_cast<unsigned>(std::string(s,i+1));
} catch (boost::bad_lexical_cast const &) {
- throw INet6Address::SyntaxException();
+ throw AddressSyntaxException();
}
address_ = INet6Address::from_string(std::string(s, 0, i));
detail::apply_mask(prefix_len_, address_.begin(), address_.end(), _1 &= _2);