From 4d7eef2d55ac1f1d4648c1f5982e8eb0fa91099b Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 20 Apr 2017 13:40:23 +0200
Subject: [PATCH] Improve behavior if socket connection does not work because,
 e.g. pihole-FTL is not listening: don't wait until socket timeout, but define
 our own timeout of 3 seconds

---
 scripts/pi-hole/php/FTL.php | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index c80f20b6..4b20e528 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -14,6 +14,8 @@ function testFTL()
 
 function connectFTL($address, $port=4711, $quiet=true)
 {
+	$timeout = 3;
+
 	if(!$quiet)
 	{
 		echo "Attempting to connect to '$address' on port '$port'...\n";
@@ -31,12 +33,31 @@ function connectFTL($address, $port=4711, $quiet=true)
 	$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP)
 	or die("socket_create() failed: reason: " . socket_strerror(socket_last_error()) . "\n");
 
-	$result = socket_connect($socket, $address, $port)
-	or die("socket_connect() failed.\nReason: ($result) " . socket_strerror(socket_last_error($socket)) . "\n");
+	socket_set_nonblock($socket) or die("Unable to set nonblock on socket\n");
 
-	// Set timeout to 10 seconds
-	socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, ['sec'=>10, 'usec'=>0]);
-	socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, ['sec'=>10, 'usec'=>0]);
+	$time = time();
+	while (!@socket_connect($socket, $address, $port))
+	{
+		$err = socket_last_error($socket);
+		if ($err == 115 || $err == 114)
+		{
+			if ((time() - $time) >= $timeout)
+			{
+				socket_close($socket);
+				die("Connection timed out.\n");
+			}
+			// Wait for 1 millisecond
+			usleep(1000);
+			continue;
+		}
+		die(socket_strerror($err) . "\n");
+	}
+
+	socket_set_block($socket) or die("Unable to set block on socket\n");
+
+	// Set timeout to 3 seconds
+	socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, ['sec'=>$timeout, 'usec'=>0]);
+	socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, ['sec'=>$timeout, 'usec'=>0]);
 
 	if(!$quiet)
 	{