From 5737d9a9411356956457f8bcf4c2f61d529f06d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Feb 2020 21:47:23 +0100
Subject: [PATCH] xbps-fetch: TIMEOUT_CONNECTION to customize time waiting for
 response

---
 bin/xbps-fetch/xbps-fetch.1 |  4 ++++
 lib/fetch/common.c          | 32 ++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/bin/xbps-fetch/xbps-fetch.1 b/bin/xbps-fetch/xbps-fetch.1
index ab95c05f..e04bc4bd 100644
--- a/bin/xbps-fetch/xbps-fetch.1
+++ b/bin/xbps-fetch/xbps-fetch.1
@@ -82,6 +82,10 @@ Overrides the default CA certificates path, by default set to
 Sets the SSL/TLS client verification certificate file.
 .It Sy SSL_CLIENT_KEY_FILE
 Sets the SSL/TLS client verification key file.
+.It Sy CONNECTION_TIMEOUT
+Sets connection timeout in milliseconds
+instead of default value of 5 minutes.
+When -1, waits indefinitely.
 .El
 .Sh SEE ALSO
 .Xr xbps-checkvers 1 ,
diff --git a/lib/fetch/common.c b/lib/fetch/common.c
index 885fc743..7180c6ef 100644
--- a/lib/fetch/common.c
+++ b/lib/fetch/common.c
@@ -428,6 +428,31 @@ fetch_socks5(conn_t *conn, struct url *url, struct url *socks, int verbose)
 	return 0;
 }
 
+static int
+get_conn_timeout(void)
+{
+	static int result = -2;
+	char *conn_timeout;
+
+	if (result != -2) {
+		return result;
+	}
+
+	conn_timeout = getenv("CONNECTION_TIMEOUT");
+	if (conn_timeout) {
+		char *char_read = conn_timeout;
+		long from_env = strtol(conn_timeout, &char_read, 10);
+		if (from_env < -1 || char_read == conn_timeout) {
+			from_env = fetchConnTimeout;
+		}
+		result = from_env > INT_MAX ? INT_MAX: from_env;
+	} else {
+		result = fetchConnTimeout;
+	}
+
+	return result;
+}
+
 /*
  * Happy Eyeballs (RFC8305):
  *
@@ -442,6 +467,8 @@ fetch_socks5(conn_t *conn, struct url *url, struct url *socks, int verbose)
  * connections with the failing address family.
  *
  * If there are no more addresses to attempt, wait for
+ * CONNECTION_TIMEOUT milliseconds if given, where value
+ * -1 means waiting for response indefinitely, else
  * `fetchConnTimeout` and return the first established
  * connection.
  *
@@ -455,6 +482,7 @@ static int
 happy_eyeballs_connect(struct addrinfo *res0, int verbose)
 {
 	static int unreach = 0;
+	int connTimeout = get_conn_timeout();
 	struct pollfd *pfd;
 	struct addrinfo *res;
 	const char *bindaddr;
@@ -522,10 +550,10 @@ happy_eyeballs_connect(struct addrinfo *res0, int verbose)
 					family = AF_INET6;
 			}
 		} else {
+			timeout = connTimeout;
 			/* no more connections to try */
 			if (verbose)
 				fetch_info("attempted to connect to all addresses, waiting...");
-			timeout = fetchConnTimeout;
 			done = 1;
 			goto wait;
 		}
@@ -1508,7 +1536,7 @@ fetch_read(conn_t *conn, char *buf, size_t len)
 			rlen = read(conn->sd, buf, len);
 		if (rlen >= 0)
 			break;
-	
+
 		if (errno != EINTR || !fetchRestartCalls)
 			return (-1);
 	}