integrated changes from 1.3.5

This commit is contained in:
Guenter Obiltschnig
2009-06-16 17:04:40 +00:00
parent 99c48cff49
commit c93c16008b
9 changed files with 53 additions and 62 deletions

View File

@@ -1,7 +1,7 @@
//
// HostEntry.cpp
//
// $Id: //poco/Main/Net/src/HostEntry.cpp#9 $
// $Id: //poco/Main/Net/src/HostEntry.cpp#10 $
//
// Library: Net
// Package: NetCore
@@ -92,15 +92,15 @@ HostEntryImpl::HostEntryImpl(struct addrinfo* ainfo)
{
_name.assign(ai->ai_canonname);
}
else if (ai->ai_addrlen && ai->ai_addr)
if (ai->ai_addrlen && ai->ai_addr)
{
switch (ai->ai_addr->sa_family)
{
case AF_INET:
_addresses.push_back(IPAddress(&reinterpret_cast<struct sockaddr_in*>(&ai->ai_addr)->sin_addr, sizeof(in_addr)));
_addresses.push_back(IPAddress(&reinterpret_cast<struct sockaddr_in*>(ai->ai_addr)->sin_addr, sizeof(in_addr)));
break;
case AF_INET6:
_addresses.push_back(IPAddress(&reinterpret_cast<struct sockaddr_in6*>(&ai->ai_addr)->sin6_addr, sizeof(in6_addr)));
_addresses.push_back(IPAddress(&reinterpret_cast<struct sockaddr_in6*>(ai->ai_addr)->sin6_addr, sizeof(in6_addr)));
break;
}
}