mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15974) -Fix (r15969): win32 compilation was broken (again)

release/1.0
glx 2009-04-08 00:10:20 +00:00
parent 8cf88876ef
commit d466fa9672
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/core/host.cpp
View File

@ -112,11 +112,18 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Wi
if (sock == INVALID_SOCKET) return; if (sock == INVALID_SOCKET) return;
DWORD len = 0; DWORD len = 0;
INTERFACE_INFO *ifo = AllocaM(INTERFACE_INFO, limit); int num = 2;
memset(ifo, 0, limit * sizeof(*ifo)); INTERFACE_INFO *ifo = CallocT<INTERFACE_INFO>(num);
if ((WSAIoctl(sock, SIO_GET_INTERFACE_LIST, NULL, 0, &ifo[0], limit * sizeof(*ifo), &len, NULL, NULL)) != 0) {
closesocket(sock); for(;;) {
return; if (WSAIoctl(sock, SIO_GET_INTERFACE_LIST, NULL, 0, ifo, num * sizeof(*ifo), &len, NULL, NULL) == 0) break;
free(ifo);
if (WSAGetLastError() != WSAEFAULT) {
closesocket(sock);
return;
}
num *= 2;
ifo = CallocT<INTERFACE_INFO>(num);
} }
for (uint j = 0; j < len / sizeof(*ifo); j++) { for (uint j = 0; j < len / sizeof(*ifo); j++) {
@ -131,6 +138,7 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Wi
*broadcast->Append() = NetworkAddress(address, sizeof(sockaddr)); *broadcast->Append() = NetworkAddress(address, sizeof(sockaddr));
} }
free(ifo);
closesocket(sock); closesocket(sock);
} }