Skip to content

Improve compatibility with ping under FreeBSD #5869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 19, 2024
Merged

Improve compatibility with ping under FreeBSD #5869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
510dfdc
fix freebsd ping path and parameters
xmacan Oct 17, 2024
8fa3c54
update
xmacan Oct 18, 2024
f589263
Update ping.php
TheWitness Oct 19, 2024
93ee368
Merge branch '1.2.x' into fix_freebsd_ipv6
TheWitness Oct 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Cacti CHANGELOG
-issue#5856: Help HTML file is incorrect for Automation Networks
-issue#5867: Disabling a Tree does not function as expected
-issue#5868: Error when remove Orphaned Graphs from GUI
-issue#5869: Fix FreeBSD IPv6 ping
-issue#5870: CLI utility splice_rrd.php generates an error in PHP8+

1.2.28
Expand Down
7 changes: 5 additions & 2 deletions lib/ping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ function ping_icmp() {
$result = shell_exec('ping -t ' . ceil($this->timeout/1000) . ' -c ' . $this->retries . ' ' . $this->host['hostname']);
} elseif (substr_count(strtolower(PHP_OS), 'freebsd')) {
if (strpos($host_ip, ':') !== false) {
$result = shell_exec('/usr/sbin/ping6 -x ' . $this->timeout . ' -c ' . $this->retries . ' ' . $this->host['hostname']);
$result = shell_exec('ping6 -t ' . $this->timeout . ' -c ' . $this->retries . ' ' . $this->host['hostname']);
} else {
$result = shell_exec('ping -W ' . $this->timeout . ' -c ' . $this->retries . ' ' . $this->host['hostname']);
}
Expand All @@ -189,7 +189,7 @@ function ping_icmp() {
* as it now tries to open an ICMP socket and fails
* $result will be empty, then. */
if (strpos($host_ip, ':') !== false) {
$result = shell_exec('/usr/sbin/ping6 -W ' . ceil($this->timeout/1000) . ' -c ' . $this->retries . ' -p ' . $pattern . ' ' . $this->host['hostname']);
$result = shell_exec('ping -6 -W ' . ceil($this->timeout/1000) . ' -c ' . $this->retries . ' -p ' . $pattern . ' ' . $this->host['hostname']);
} else {
$result = shell_exec('ping -W ' . ceil($this->timeout/1000) . ' -c ' . $this->retries . ' -p ' . $pattern . ' ' . $this->host['hostname'] . ' 2>&1');
if ((strpos($result, 'unknown host') !== false || strpos($result, 'Address family') !== false) && file_exists('/bin/ping6')) {
Expand Down Expand Up @@ -745,6 +745,9 @@ function strip_ip_address($ip_address) {
$ip_address = str_replace('tcp:', '', strtolower($ip_address));
} elseif (strpos($ip_address, 'udp:') !== false) {
$ip_address = str_replace('udp:', '', strtolower($ip_address));
} elseif (strpos($ip_address, '[') !== false) {
$parts = explode(']', $ip_address);
$ip_address = trim($parts[0], '[');
}

return $ip_address;
Expand Down
Loading