mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7617 from Zmegolaz/fping-options

Browse Source 
Fix: Better sanity checks of fping options.
This commit is contained in:
Zmegolaz
2017-11-09 08:42:06 +01:00
committed by GitHub
parent c4e0b8e2e0 ddb60f4266
commit f453875c0f
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
includes/functions.php
View File

@@ -658,16 +658,28 @@ function isPingable($hostname, $address_family = AF_INET, $attribs = array())
$response = array(); $response = array();
if (can_ping_device($attribs) === true) { if (can_ping_device($attribs) === true) {
$fping_params = ''; $fping_params = '';
if (is_numeric($config['fping_options']['retries']) || $config['fping_options']['retries'] > 1) { if (is_numeric($config['fping_options']['retries']) && $config['fping_options']['retries'] > 0) {
if ($config['fping_options']['retries'] > 20) {
$config['fping_options']['retries'] = 20;
}
$fping_params .= ' -r ' . $config['fping_options']['retries']; $fping_params .= ' -r ' . $config['fping_options']['retries'];
} }
if (is_numeric($config['fping_options']['timeout']) || $config['fping_options']['timeout'] > 1) { if (is_numeric($config['fping_options']['timeout'])) {
if ($config['fping_options']['timeout'] < 50) {
$config['fping_options']['timeout'] = 50;
}
if ($config['fping_options']['millisec'] < $config['fping_options']['timeout']) {
$config['fping_options']['millisec'] = $config['fping_options']['timeout'];
}
$fping_params .= ' -t ' . $config['fping_options']['timeout']; $fping_params .= ' -t ' . $config['fping_options']['timeout'];
} }
if (is_numeric($config['fping_options']['count']) || $config['fping_options']['count'] > 0) { if (is_numeric($config['fping_options']['count']) && $config['fping_options']['count'] > 0) {
$fping_params .= ' -c ' . $config['fping_options']['count']; $fping_params .= ' -c ' . $config['fping_options']['count'];
} }
if (is_numeric($config['fping_options']['millisec']) || $config['fping_options']['millisec'] > 0) { if (is_numeric($config['fping_options']['millisec'])) {
if ($config['fping_options']['millisec'] < 20) {
$config['fping_options']['millisec'] = 20;
}
$fping_params .= ' -p ' . $config['fping_options']['millisec']; $fping_params .= ' -p ' . $config['fping_options']['millisec'];
} }
$status = fping($hostname, $fping_params, $address_family); $status = fping($hostname, $fping_params, $address_family);