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

Codechange: use std::vector over CallocT/free

pull/13377/head
Rubidium 2025-01-16 17:57:38 +01:00 committed by rubidium42
parent 043d1ac111
commit c6fc280ff1
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,35 +27,34 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Wi
SOCKET sock = socket(AF_INET, SOCK_DGRAM, 0); SOCKET sock = socket(AF_INET, SOCK_DGRAM, 0);
if (sock == INVALID_SOCKET) return; if (sock == INVALID_SOCKET) return;
DWORD len = 0; std::vector<INTERFACE_INFO> ifos;
int num = 2; ifos.resize(2);
INTERFACE_INFO *ifo = CallocT<INTERFACE_INFO>(num);
for (;;) { for (;;) {
if (WSAIoctl(sock, SIO_GET_INTERFACE_LIST, nullptr, 0, ifo, num * sizeof(*ifo), &len, nullptr, nullptr) == 0) break; DWORD len = 0;
free(ifo); if (WSAIoctl(sock, SIO_GET_INTERFACE_LIST, nullptr, 0, ifos.data(), static_cast<DWORD>(ifos.size() * sizeof(INTERFACE_INFO)), &len, nullptr, nullptr) == 0) {
ifos.resize(len / sizeof(INTERFACE_INFO));
break;
}
if (WSAGetLastError() != WSAEFAULT) { if (WSAGetLastError() != WSAEFAULT) {
closesocket(sock); closesocket(sock);
return; return;
} }
num *= 2; ifos.resize(ifos.size() * 2);
ifo = CallocT<INTERFACE_INFO>(num);
} }
for (uint j = 0; j < len / sizeof(*ifo); j++) { for (auto &ifo : ifos) {
if (ifo[j].iiFlags & IFF_LOOPBACK) continue; if (ifo.iiFlags & IFF_LOOPBACK) continue;
if (!(ifo[j].iiFlags & IFF_BROADCAST)) continue; if (!(ifo.iiFlags & IFF_BROADCAST)) continue;
sockaddr_storage address; sockaddr_storage address{};
memset(&address, 0, sizeof(address));
/* iiBroadcast is unusable, because it always seems to be set to 255.255.255.255. */ /* iiBroadcast is unusable, because it always seems to be set to 255.255.255.255. */
memcpy(&address, &ifo[j].iiAddress.Address, sizeof(sockaddr)); memcpy(&address, &ifo.iiAddress.Address, sizeof(sockaddr));
((sockaddr_in*)&address)->sin_addr.s_addr = ifo[j].iiAddress.AddressIn.sin_addr.s_addr | ~ifo[j].iiNetmask.AddressIn.sin_addr.s_addr; reinterpret_cast<sockaddr_in*>(&address)->sin_addr.s_addr = ifo.iiAddress.AddressIn.sin_addr.s_addr | ~ifo.iiNetmask.AddressIn.sin_addr.s_addr;
NetworkAddress addr(address, sizeof(sockaddr)); NetworkAddress addr(address, sizeof(sockaddr));
if (std::none_of(broadcast->begin(), broadcast->end(), [&addr](NetworkAddress const &elem) -> bool { return elem == addr; })) broadcast->push_back(addr); if (std::none_of(broadcast->begin(), broadcast->end(), [&addr](NetworkAddress const &elem) -> bool { return elem == addr; })) broadcast->push_back(addr);
} }
free(ifo);
closesocket(sock); closesocket(sock);
} }