AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error handling in QHostInfo windows backend

Browse Source 
If the DNS server returns a non authoritative host not found response,
then windows returns WSATRY_AGAIN error code.
This is now reported as HostNotFound and not UnknownError

Change-Id: I212985acd4e85ff4b2bdb6c57ec403405a7695fb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Shane Kearns 2012-02-17 15:14:01 +00:00 committed by Qt by Nokia
parent 400c865f29
commit 844b096d67
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/network/kernel/qhostinfo_win.cpp
View File

@ -95,6 +95,22 @@ static void resolveLibrary()
#endif
}
static void translateWSAError(int error, QHostInfo *results)
{
switch (error) {
case WSAHOST_NOT_FOUND: //authoritative not found
case WSATRY_AGAIN: //non authoritative not found
case WSANO_DATA: //valid name, no associated address
results->setError(QHostInfo::HostNotFound);
results->setErrorString(QHostInfoAgent::tr("Host not found"));
return;
default:
results->setError(QHostInfo::UnknownError);
results->setErrorString(QHostInfoAgent::tr("Unknown error (%1)").arg(error));
return;
}
}
QHostInfo QHostInfoAgent::fromName(const QString &hostName)
{
#if defined(Q_OS_WINCE)
@ -200,12 +216,8 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
}
results.setAddresses(addresses);
local_freeaddrinfo(res);
} else if (WSAGetLastError() == WSAHOST_NOT_FOUND || WSAGetLastError() == WSANO_DATA) {
results.setError(QHostInfo::HostNotFound);
results.setErrorString(tr("Host not found"));
} else {
results.setError(QHostInfo::UnknownError);
results.setErrorString(tr("Unknown error"));
translateWSAError(WSAGetLastError(), &results);
}
} else {
// Fall back to gethostbyname, which only supports IPv4.
@ -228,12 +240,8 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
break;
}
results.setAddresses(addresses);
} else if (WSAGetLastError() == 11001) {
results.setErrorString(tr("Host not found"));
results.setError(QHostInfo::HostNotFound);
} else {
results.setErrorString(tr("Unknown error"));
results.setError(QHostInfo::UnknownError);
translateWSAError(WSAGetLastError(), &results);
}
}