Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-25 11:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
DL6ER
2017-04-20 13:40:23 +02:00
parent 3e88e72557
commit 4d7eef2d55
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/pi-hole/php/FTL.php
View File

@@ -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)
{