1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNetworkInterface: remove fallback code for Windows pre-XP and CE pre-4

Browse Source 
All versions we support have support for the WinXP-style functions we
need, so we don't need the Win2k fallback.

Change-Id: I7de033f80b0e4431b7f1ffff13f99175a507a2ed
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Thiago Macieira 2015-08-11 18:04:50 -07:00
parent 4fbc63f03b
commit 3ae90ed371
1 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/network/kernel/qnetworkinterface_win.cpp
View File

@ -222,67 +222,11 @@ static QList<QNetworkInterfacePrivate *> interfaceListingWinXP()
return interfaces;
}
static QList<QNetworkInterfacePrivate *> interfaceListingWin2k()
{
QList<QNetworkInterfacePrivate *> interfaces;
IP_ADAPTER_INFO staticBuf[2]; // 2 is arbitrary
PIP_ADAPTER_INFO pAdapter = staticBuf;
ULONG bufSize = sizeof staticBuf;
DWORD retval = ptrGetAdaptersInfo(pAdapter, &bufSize);
if (retval == ERROR_BUFFER_OVERFLOW) {
// need more memory
pAdapter = (IP_ADAPTER_INFO *)malloc(bufSize);
if (!pAdapter)
return interfaces;
// try again
if (ptrGetAdaptersInfo(pAdapter, &bufSize) != ERROR_SUCCESS) {
free(pAdapter);
return interfaces;
}
} else if (retval != ERROR_SUCCESS) {
// error
return interfaces;
}
// iterate over the list and add the entries to our listing
for (PIP_ADAPTER_INFO ptr = pAdapter; ptr; ptr = ptr->Next) {
QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate;
interfaces << iface;
iface->index = ptr->Index;
iface->flags = QNetworkInterface::IsUp | QNetworkInterface::IsRunning;
if (ptr->Type == MIB_IF_TYPE_PPP)
iface->flags |= QNetworkInterface::IsPointToPoint;
else
iface->flags |= QNetworkInterface::CanBroadcast;
iface->name = QString::fromLocal8Bit(ptr->AdapterName);
iface->hardwareAddress = QNetworkInterfacePrivate::makeHwAddress(ptr->AddressLength,
ptr->Address);
for (PIP_ADDR_STRING addr = &ptr->IpAddressList; addr; addr = addr->Next) {
QNetworkAddressEntry entry;
entry.setIp(QHostAddress(QLatin1String(addr->IpAddress.String)));
entry.setNetmask(QHostAddress(QLatin1String(addr->IpMask.String)));
// broadcast address is set on postProcess()
iface->addressEntries << entry;
}
}
if (pAdapter != staticBuf)
free(pAdapter);
return interfaces;
}
static QList<QNetworkInterfacePrivate *> interfaceListing()
{
resolveLibs();
if (ptrGetAdaptersAddresses != NULL)
return interfaceListingWinXP();
else if (ptrGetAdaptersInfo != NULL)
return interfaceListingWin2k();
// failed
return QList<QNetworkInterfacePrivate *>();