From 35a4e5cf48ba418fd9bce4b023a1f897823aafb8 Mon Sep 17 00:00:00 2001 From: Guillaume Mazoyer Date: Sat, 13 Dec 2014 13:33:49 +0100 Subject: Option to hide commands. Set $config\['output'\]\['show_command'\] to true or false to show or hide the command in the output. Also fix ping/traceroute without FQDN on BIRD, Quagga and Cisco. --- routers/bird.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'routers/bird.php') diff --git a/routers/bird.php b/routers/bird.php index 06aea32..bc0a851 100644 --- a/routers/bird.php +++ b/routers/bird.php @@ -36,9 +36,9 @@ final class Bird extends Router { } if (match_ipv4($destination)) { - $ping = 'ping -A -c 10 '.$fqdn; + $ping = 'ping -A -c 10 '.(isset($fqdn) ? $fqdn : $destination); } else if (match_ipv6($destination)) { - $ping = 'ping6 -A -c 10 '.$fqdn; + $ping = 'ping6 -A -c 10 '.(isset($fqdn) ? $fqdn : $destination); } else { throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.'); } @@ -69,9 +69,11 @@ final class Bird extends Router { } if (match_ipv4($destination)) { - $traceroute = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$fqdn; + $traceroute = 'traceroute -4 -A -q1 -N32 -w1 -m15 '. + (isset($fqdn) ? $fqdn : $destination); } else if (match_ipv6($destination)) { - $traceroute = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$fqdn; + $traceroute = 'traceroute -6 -A -q1 -N32 -w1 -m15 '. + (isset($fqdn) ? $fqdn : $destination); } else { throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.'); } -- cgit v1.2.3