echosystem.fr
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed ping6 to ping -6 for windows (#936) 

Resolving #935.
This commit is contained in:
Tim 2020-05-25 14:39:30 +02:00 committed by GitHub
parent 07abc7d294
commit f02d55635e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/psm/Util/Server/Updater/StatusUpdater.php
View File

@ -179,24 +179,24 @@ class StatusUpdater
if ($max_runs == null || $max_runs > 1) { if ($max_runs == null || $max_runs > 1) {
$max_runs = 1; $max_runs = 1;
} }
$serverIp = $this->server['ip']; $server_ip = $this->server['ip'];
$pingCommand = 'ping6'; $ping_command = 'ping';
$ping_count = "-c"; $ping_count = "-c";
$os_is_windows = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
$result = null; $result = null;
// Choose right ping version, ping6 for IPV6, ping for IPV4 // Choose right ping version, ping6 for IPV6, ping for IPV4
if (filter_var($serverIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) { if (filter_var($server_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false) {
$pingCommand = 'ping'; $ping_command = $os_is_windows ? 'ping -6' : 'ping6';
} }
// Use -n instead of -c for Windows machines // Use -n instead of -c for Windows machines
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { if ($os_is_windows) {
$ping_count = "-n"; $ping_count = "-n";
} }
// execute PING // execute PING
$txt = exec($pingCommand . $ping_count . $max_runs . " " . $serverIp . " 2>&1", $output); $txt = exec($ping_command . " " . $ping_count . " " . $max_runs . " " . $server_ip . " 2>&1", $output);
// Check if output is PING and if transmitted packets is equal to received packets. // Check if output is PING and if transmitted packets is equal to received packets.
preg_match('/^(\d{1,3}) packets transmitted, (\d{1,3}).*$/', $output[count($output) - 2], $output_package_loss); preg_match('/^(\d{1,3}) packets transmitted, (\d{1,3}).*$/', $output[count($output) - 2], $output_package_loss);