cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-18 16:05:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Retry once on (GnuTLS) Recv errors

Browse source 
Try resuming download on CURLE_RECV_ERROR.
Will not retry more than once if nothing has been
downloaded since last attempt.

Ref #306
This commit is contained in:
Floris Bos 2021-12-21 23:07:53 +01:00
parent 69f5799145
commit be40f05b50
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
downloadthread.cpp
View file

@ -34,7 +34,7 @@ QByteArray DownloadThread::_proxy;
int DownloadThread::_curlCount = 0; int DownloadThread::_curlCount = 0;
DownloadThread::DownloadThread(const QByteArray &url, const QByteArray &localfilename, const QByteArray &expectedHash, QObject *parent) : DownloadThread::DownloadThread(const QByteArray &url, const QByteArray &localfilename, const QByteArray &expectedHash, QObject *parent) :
QThread(parent), _startOffset(0), _lastDlTotal(0), _lastDlNow(0), _verifyTotal(0), _lastVerifyNow(0), _bytesWritten(0), _sectorsStart(-1), _url(url), _filename(localfilename), _expectedHash(expectedHash), QThread(parent), _startOffset(0), _lastDlTotal(0), _lastDlNow(0), _verifyTotal(0), _lastVerifyNow(0), _bytesWritten(0), _lastFailureOffset(0), _sectorsStart(-1), _url(url), _filename(localfilename), _expectedHash(expectedHash),
_firstBlock(nullptr), _cancelled(false), _successful(false), _verifyEnabled(false), _cacheEnabled(false), _lastModified(0), _serverTime(0), _lastFailureTime(0), _firstBlock(nullptr), _cancelled(false), _successful(false), _verifyEnabled(false), _cacheEnabled(false), _lastModified(0), _serverTime(0), _lastFailureTime(0),
_inputBufferSize(0), _file(NULL), _writehash(OSLIST_HASH_ALGORITHM), _verifyhash(OSLIST_HASH_ALGORITHM) _inputBufferSize(0), _file(NULL), _writehash(OSLIST_HASH_ALGORITHM), _verifyhash(OSLIST_HASH_ALGORITHM)
{ {
@ -392,7 +392,7 @@ void DownloadThread::run()
/* Deal with badly configured HTTP servers that terminate the connection quickly /* Deal with badly configured HTTP servers that terminate the connection quickly
if connections stalls for some seconds while kernel commits buffers to slow SD card. if connections stalls for some seconds while kernel commits buffers to slow SD card.
And also reconnect if we detect from our end that transfer stalled for more than one minute */ And also reconnect if we detect from our end that transfer stalled for more than one minute */
while (ret == CURLE_PARTIAL_FILE || ret == CURLE_OPERATION_TIMEDOUT) while (ret == CURLE_PARTIAL_FILE || ret == CURLE_OPERATION_TIMEDOUT || (ret == CURLE_RECV_ERROR && _lastDlNow != _lastFailureOffset) )
{ {
time_t t = time(NULL); time_t t = time(NULL);
qDebug() << "HTTP connection lost. Time:" << t; qDebug() << "HTTP connection lost. Time:" << t;
@ -407,6 +407,7 @@ void DownloadThread::run()
_lastFailureTime = t; _lastFailureTime = t;
_startOffset = _lastDlNow; _startOffset = _lastDlNow;
_lastFailureOffset = _lastDlNow;
curl_easy_setopt(_c, CURLOPT_RESUME_FROM_LARGE, _startOffset); curl_easy_setopt(_c, CURLOPT_RESUME_FROM_LARGE, _startOffset);
ret = curl_easy_perform(_c); ret = curl_easy_perform(_c);

1
downloadthread.h
View file

@ -163,6 +163,7 @@ protected:
CURL *_c; CURL *_c;
curl_off_t _startOffset; curl_off_t _startOffset;
std::atomic<std::uint64_t> _lastDlTotal, _lastDlNow, _verifyTotal, _lastVerifyNow, _bytesWritten; std::atomic<std::uint64_t> _lastDlTotal, _lastDlNow, _verifyTotal, _lastVerifyNow, _bytesWritten;
std::uint64_t _lastFailureOffset;
qint64 _sectorsStart; qint64 _sectorsStart;
QByteArray _url, _useragent, _buf, _filename, _lastError, _expectedHash, _config, _cmdline, _firstrun, _cloudinit, _cloudinitNetwork, _initFormat; QByteArray _url, _useragent, _buf, _filename, _lastError, _expectedHash, _config, _cmdline, _firstrun, _cloudinit, _cloudinitNetwork, _initFormat;
char *_firstBlock; char *_firstBlock;