nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply same workaround to all BIO_should_retry() calls and log timeout in send+recv as well

Browse Source
This commit is contained in:
John
2023-06-17 10:08:34 +02:00
parent 8f190e9e84
commit 333ae3b82f
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utils/httpclient.cpp
+14 -4
View File
@@ -86,6 +86,7 @@ SSLSocket::~SSLSocket() {
} }
ssize_t SSLSocket::send(const char* data, size_t len) { ssize_t SSLSocket::send(const char* data, size_t len) {
time_t now = 0;
do { do {
#if OPENSSL_VERSION_NUMBER >= 0x10101000L #if OPENSSL_VERSION_NUMBER >= 0x10101000L
size_t part = 0; size_t part = 0;
@@ -99,18 +100,23 @@ ssize_t SSLSocket::send(const char* data, size_t len) {
return static_cast<ssize_t>(res); return static_cast<ssize_t>(res);
} }
#endif #endif
if (!BIO_should_retry(m_bio)) { if (!BIO_should_retry(m_bio) && now > 0) { // always repeat on first failure
if (isError("send", true)) { if (isError("send", true)) {
return -1; return -1;
} }
return 0; return 0;
} }
if ((now=time(nullptr)) > m_until) {
logError(lf_network, "HTTP send: timed out after %d sec", now-m_until);
break;
}
usleep(SLEEP_NANOS); usleep(SLEEP_NANOS);
} while (time(nullptr) < m_until); } while (true);
return -1; // timeout return -1; // timeout
} }
ssize_t SSLSocket::recv(char* data, size_t len) { ssize_t SSLSocket::recv(char* data, size_t len) {
time_t now = 0;
do { do {
#if OPENSSL_VERSION_NUMBER >= 0x10101000L #if OPENSSL_VERSION_NUMBER >= 0x10101000L
size_t part = 0; size_t part = 0;
@@ -124,14 +130,18 @@ ssize_t SSLSocket::recv(char* data, size_t len) {
return static_cast<ssize_t>(res); return static_cast<ssize_t>(res);
} }
#endif #endif
if (!BIO_should_retry(m_bio)) { if (!BIO_should_retry(m_bio) && now > 0) { // always repeat on first failure
if (isError("recv", true)) { if (isError("recv", true)) {
return -1; return -1;
} }
return 0; return 0;
} }
if ((now=time(nullptr)) > m_until) {
logError(lf_network, "HTTP recv: timed out after %d sec", now-m_until);
break;
}
usleep(SLEEP_NANOS); usleep(SLEEP_NANOS);
} while (time(nullptr) < m_until); } while (true);
return -1; // timeout return -1; // timeout
} }