From 6ac8e7a464cc56190854121e3ec4e42363cadc9e Mon Sep 17 00:00:00 2001 From: selsta Date: Sun, 9 Apr 2023 03:00:42 +0200 Subject: p2pool: add more detailed failure message --- src/p2pool/P2PoolManager.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/p2pool/P2PoolManager.cpp') diff --git a/src/p2pool/P2PoolManager.cpp b/src/p2pool/P2PoolManager.cpp index e4655c14..0119aa98 100644 --- a/src/p2pool/P2PoolManager.cpp +++ b/src/p2pool/P2PoolManager.cpp @@ -68,7 +68,10 @@ void P2PoolManager::download() { std::chrono::milliseconds timeout = std::chrono::seconds(10); http_client.set_server(url.host().toStdString(), "443", {}); bool success = http_client.invoke_get(url.path().toStdString(), timeout, {}, std::addressof(response), {{"User-Agent", userAgent}}); - if (response->m_response_code == 302) { + if (response->m_response_code == 404) { + emit p2poolDownloadFailure(BinaryNotAvailable); + return; + } else if (response->m_response_code == 302) { epee::net_utils::http::fields_list fields = response->m_header_info.m_etc_fields; for (std::pair i : fields) { if (i.first == "Location") { @@ -82,7 +85,7 @@ void P2PoolManager::download() { } } if (!success) { - emit p2poolDownloadFailure(); + emit p2poolDownloadFailure(ConnectionIssue); } else { std::string stringData = response->m_body; @@ -90,7 +93,7 @@ void P2PoolManager::download() { QByteArray hashData = QCryptographicHash::hash(data, QCryptographicHash::Sha256); QString hash = hashData.toHex(); if (hash != validHash) { - emit p2poolDownloadFailure(); + emit p2poolDownloadFailure(HashVerificationFailed); } else { file.open(QIODevice::WriteOnly); @@ -102,7 +105,7 @@ void P2PoolManager::download() { emit p2poolDownloadSuccess(); } else { - emit p2poolDownloadFailure(); + emit p2poolDownloadFailure(InstallationFailed); } } } -- cgit v1.2.3 From 33310786dbb2e8817bfe4cac36b45069031d14bd Mon Sep 17 00:00:00 2001 From: selsta Date: Sun, 9 Apr 2023 18:26:03 +0200 Subject: p2pool: fix crash without network connection --- src/p2pool/P2PoolManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/p2pool/P2PoolManager.cpp') diff --git a/src/p2pool/P2PoolManager.cpp b/src/p2pool/P2PoolManager.cpp index 0119aa98..74391528 100644 --- a/src/p2pool/P2PoolManager.cpp +++ b/src/p2pool/P2PoolManager.cpp @@ -68,10 +68,10 @@ void P2PoolManager::download() { std::chrono::milliseconds timeout = std::chrono::seconds(10); http_client.set_server(url.host().toStdString(), "443", {}); bool success = http_client.invoke_get(url.path().toStdString(), timeout, {}, std::addressof(response), {{"User-Agent", userAgent}}); - if (response->m_response_code == 404) { + if (success && response->m_response_code == 404) { emit p2poolDownloadFailure(BinaryNotAvailable); return; - } else if (response->m_response_code == 302) { + } else if (success && response->m_response_code == 302) { epee::net_utils::http::fields_list fields = response->m_header_info.m_etc_fields; for (std::pair i : fields) { if (i.first == "Location") { -- cgit v1.2.3