Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Bound the maximum number of hosts that will be tested during connectivity test, rather than testing *all* hosts. This avoids that the connectivity test will take VERY long to fail when the Internet connection is actually NOT working.

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-02-02 18:00:21 +01:00
parent cc513cda0e
commit 40250a3cad
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Thread_CheckUpdate.cpp
View File

@ -253,6 +253,7 @@ void UpdateCheckThread::checkForUpdates(void)
// ----- Test Internet Connection ----- // // ----- Test Internet Connection ----- //
int connectionScore = 0; int connectionScore = 0;
int maxConnectTries = 2 * MIN_CONNSCORE;
log("Checking internet connection..."); log("Checking internet connection...");
setStatus(UpdateStatus_CheckingConnection); setStatus(UpdateStatus_CheckingConnection);
@ -277,11 +278,10 @@ void UpdateCheckThread::checkForUpdates(void)
} }
lamexp_seed_rand(); lamexp_seed_rand();
while(!hostList.isEmpty())
while(!(hostList.isEmpty() || (connectionScore >= MIN_CONNSCORE) || (--maxConnectTries < 0)))
{ {
QString currentHost = hostList.takeAt(lamexp_rand() % hostList.count()); QString currentHost = hostList.takeAt(lamexp_rand() % hostList.count());
if(connectionScore < MIN_CONNSCORE)
{
log("", "Testing host:", currentHost); log("", "Testing host:", currentHost);
QString outFile = QString("%1/%2.htm").arg(lamexp_temp_folder2(), lamexp_rand_str()); QString outFile = QString("%1/%2.htm").arg(lamexp_temp_folder2(), lamexp_rand_str());
bool httpOk = false; bool httpOk = false;
@ -299,7 +299,6 @@ void UpdateCheckThread::checkForUpdates(void)
} }
QFile::remove(outFile); QFile::remove(outFile);
} }
}
if(connectionScore < MIN_CONNSCORE) if(connectionScore < MIN_CONNSCORE)
{ {
@ -499,7 +498,7 @@ bool UpdateCheckThread::getFile(const QString &url, const QString &outFile, unsi
lamexp_init_process(process, output.absolutePath()); lamexp_init_process(process, output.absolutePath());
QStringList args; QStringList args;
args << "--no-cache" << "--no-dns-cache" << QString().sprintf("--max-redirect=%u", maxRedir); args << "-T" << "15" << "--no-cache" << "--no-dns-cache" << QString().sprintf("--max-redirect=%u", maxRedir);
args << QString("--referer=%1://%2/").arg(QUrl(url).scheme(), QUrl(url).host()) << "-U" << USER_AGENT_STR; args << QString("--referer=%1://%2/").arg(QUrl(url).scheme(), QUrl(url).host()) << "-U" << USER_AGENT_STR;
args << "-O" << output.fileName() << url; args << "-O" << output.fileName() << url;
@ -524,10 +523,10 @@ bool UpdateCheckThread::getFile(const QString &url, const QString &outFile, unsi
timer.start(); timer.start();
while(process.state() == QProcess::Running) while(process.state() != QProcess::NotRunning)
{ {
loop.exec(); loop.exec();
bool bTimeOut = (!timer.isActive()); const bool bTimeOut = (!timer.isActive());
while(process.canReadLine()) while(process.canReadLine())
{ {
QString line = QString::fromLatin1(process.readLine()).simplified(); QString line = QString::fromLatin1(process.readLine()).simplified();