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

pull/155/head
glx 15 years ago
parent a2c5cf906c
commit da49105b9e

@ -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);
} }

Loading…
Cancel
Save