From ff4f15214100d209f39e4ed85f47e572c8fe9289 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 7 Apr 2018 20:17:23 +0200
Subject: Add network timeouts and retries

All network operations can time out now. API requests are retried up to
three times (default). Replaces setting max_player_errors with
max_retries, which is used for player and API. Adds timeout setting.

Partially reverts 436a1d4012553a2f33d0e3a5180b3b5ae0378bdd and fixes
(at least) issue #657.

Thanks to @exarkun for testing.
---
 src/ui.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/ui.c')

diff --git a/src/ui.c b/src/ui.c
index 5c4e42d..689ad1e 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -205,6 +205,7 @@ static CURLcode BarPianoHttpRequest (CURL * const http,
 	setAndCheck (CURLOPT_PROGRESSDATA, &lint);
 	setAndCheck (CURLOPT_NOPROGRESS, 0);
 	setAndCheck (CURLOPT_POST, 1);
+	setAndCheck (CURLOPT_TIMEOUT, settings->timeout);
 	if (settings->caBundle != NULL) {
 		setAndCheck (CURLOPT_CAINFO, settings->caBundle);
 	}
@@ -241,7 +242,21 @@ static CURLcode BarPianoHttpRequest (CURL * const http,
 	list = curl_slist_append (list, "Content-Type: text/plain");
 	setAndCheck (CURLOPT_HTTPHEADER, list);
 
-	httpret = curl_easy_perform (http);
+	unsigned int retry = 0;
+	do {
+		httpret = curl_easy_perform (http);
+		++retry;
+		if (httpret == CURLE_OPERATION_TIMEDOUT) {
+			free (buffer.data);
+			buffer.data = NULL;
+			buffer.pos = 0;
+			if (retry > settings->maxRetry) {
+				break;
+			}
+		} else {
+			break;
+		}
+	} while (true);
 
 	curl_slist_free_all (list);
 
-- 
cgit v1.2.3