FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further tweaks to only consider IP4 addresses for the moment, when using getaddrinfo.

Browse Source
This commit is contained in:
James Turner
2011-08-26 11:27:50 +01:00
parent 2f9ba31b0a
commit c7152af191
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
simgear/io/raw_socket.cxx
View File

@@ -119,19 +119,29 @@ void IPAddress::set ( const char* host, int port )
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = AF_INET;
struct addrinfo* result = NULL;
int err = getaddrinfo(host, NULL, NULL /* no hints */, &result);
struct addrinfo* result0 = NULL;
int err = getaddrinfo(host, NULL, &hints, &result0);
if (err) {
SG_LOG(SG_IO, SG_WARN, "getaddrinfo failed for '" << host << "' : " << gai_strerror(err));
} else if (result->ai_addrlen != getAddrLen()) {
SG_LOG(SG_IO, SG_ALERT, "mismatch in socket address sizes: got " <<
result->ai_addrlen << ", expected " << getAddrLen());
SG_LOG(SG_IO, SG_ALERT, "family:" << result->ai_family);
} else {
memcpy(addr, result->ai_addr, result->ai_addrlen);
}
freeaddrinfo(result);
struct addrinfo* result;
for (result = result0; result != NULL; result = result->ai_next) {
if (result->ai_family != AF_INET) { // only accept IP4 for the moment
continue;
}
if (result->ai_addrlen != getAddrLen()) {
SG_LOG(SG_IO, SG_ALERT, "mismatch in socket address sizes: got " <<
result->ai_addrlen << ", expected " << getAddrLen());
continue;
}
memcpy(addr, result->ai_addr, result->ai_addrlen);
break;
} // of getaddrinfo results iteration
} // of getaddrinfo succeeded
freeaddrinfo(result0);
addr->sin_port = htons (port); // fix up port after getaddrinfo
}