mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

gateway monitoring, give apinger some time to properly 'initialize' before using its results

Browse Source
This commit is contained in:
PiBa-NL 2017-06-24 20:09:21 +02:00
parent 05ae852482
commit 29fa6f0f46
1 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/etc/inc/gwlb.inc
View File

@ -323,27 +323,45 @@ function get_dpinger_status($gwname, $detailed = false) {
log_error("dpinger: status socket {$proc['socket']} not found");
return false;
}
$timeoutcounter = 0;
while (true) {
$fp = stream_socket_client("unix://{$proc['socket']}", $errno, $errstr, 10);
if (!$fp) {
log_error(sprintf(gettext('dpinger: cannot connect to status socket %1$s - %2$s (%3$s)'), $proc['socket'], $errstr, $errno));
return false;
}
$fp = stream_socket_client("unix://{$proc['socket']}", $errno, $errstr, 10);
if (!$fp) {
log_error(sprintf(gettext('dpinger: cannot connect to status socket %1$s - %2$s (%3$s)'), $proc['socket'], $errstr, $errno));
return false;
$status = '';
while (!feof($fp)) {
$status .= fgets($fp, 1024);
}
fclose($fp);
$r = array();
list(
$r['gwname'],
$r['latency_avg'],
$r['latency_stddev'],
$r['loss']
) = explode(' ', preg_replace('/\n/', '', $status));
// dpinger returns '<gwname> 0 0 0' when queried directly after it starts.
// while a latency of 0 and a loss of 0 would be perfect, in a real world it doesnt happen.
// or does it, anyone? if so we must 'detect' the initialization period differently..
$ready = $r['latency_stddev'] != '0' || $r['loss'] != '0';
if ($ready) {
break;
} else {
$timeoutcounter++;
if ($timeoutcounter > 300) {
log_error(sprintf(gettext('dpinger: timeout while retrieving status for gateway %s'), $gwname));
return false;
}
usleep(10000);
}
}
$status = '';
while (!feof($fp)) {
$status .= fgets($fp, 1024);
}
fclose($fp);
$r = array();
list(
$r['gwname'],
$r['latency_avg'],
$r['latency_stddev'],
$r['loss']
) = explode(' ', preg_replace('/\n/', '', $status));
$r['srcip'] = $proc['srcip'];
$r['targetip'] = $proc['targetip'];