fdr: Fix socket receive timeout handling logic

This fixes flaky restores / activation not proceeding if you're more
than 100ms away from Apple's servers.

Signed-off-by: Hector Martin <marcan@marcan.st>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/fdr.c b/src/fdr.c
index ff7b56e..e3703fe 100644
--- a/src/fdr.c
+++ b/src/fdr.c
@@ -593,12 +593,14 @@ static int fdr_handle_proxy_cmd(fdr_client_t fdr)
 			}
 		}
 		bytes_ret = socket_receive_timeout(sockfd, buf, bufsize, 0, 100);
-		if (bytes_ret < 0) {
-			if (errno)
-				error("ERROR: FDR %p receiving proxy payload failed: %s\n",
-				      fdr, strerror(errno));
-			else
-				res = 1; /* close connection if no data with no error */
+		if (bytes_ret == -ETIMEDOUT) {
+			bytes_ret = 0;
+		} else if (bytes_ret == -ECONNRESET) {
+			res = 1;
+			break;
+		} else if (bytes_ret < 0) {
+			error("ERROR: FDR %p receiving proxy payload failed: %d (%s)\n",
+			      fdr, bytes_ret, strerror(-bytes_ret));
 			break;
 		}