github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

use OS specific ping count parameter (#932) 

* use OS specific ping count parameter

* Reorganized and complied with PSR-12

Co-authored-by: TimZ99 <TimZ99@users.noreply.github.com>
pull/936/head
wienfuchs 2020-05-24 23:40:19 +02:00 committed by GitHub
parent 96d0c3fa57
commit 07abc7d294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,19 +175,28 @@ class StatusUpdater
*/ */
protected function updatePing($max_runs, $run = 1) protected function updatePing($max_runs, $run = 1)
{ {
// Settings
if ($max_runs == null || $max_runs > 1) { if ($max_runs == null || $max_runs > 1) {
$max_runs = 1; $max_runs = 1;
} }
$result = null;
// Choose right ping version, ping6 for IPV6, ping for IPV4
$pingCommand = 'ping6';
$serverIp = $this->server['ip']; $serverIp = $this->server['ip'];
$pingCommand = 'ping6';
$ping_count = " -c ";
$result = null;
// Choose right ping version, ping6 for IPV6, ping for IPV4
if (filter_var($serverIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) { if (filter_var($serverIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
$pingCommand = 'ping'; $pingCommand = 'ping';
} }
// Use -n instead of -c for Windows machines
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$ping_count = " -n ";
}
// execute PING // execute PING
$txt = exec($pingCommand . " -c " . $max_runs . " " . $serverIp . " 2>&1", $output); $txt = exec($pingCommand . $ping_count . $max_runs . " " . $serverIp . " 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);