From 7436934fe3e1d28ca4c1124ccec5bbcdecdc986f Mon Sep 17 00:00:00 2001 From: Guillaume Mazoyer Date: Wed, 10 Dec 2014 20:47:56 +0100 Subject: Add option to specify an interface or an address for routers. The interface is used on routers to source ping and traceroute. On software routers, an address is required instead of the interface. --- routers/bird.php | 58 +++++++++++++++++++++++++++++++++++++++++++++-------- routers/cisco.php | 12 +++++++++-- routers/juniper.php | 23 ++++++++++++++++++--- routers/quagga.php | 58 +++++++++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 130 insertions(+), 21 deletions(-) (limited to 'routers') diff --git a/routers/bird.php b/routers/bird.php index b86315b..71a8602 100644 --- a/routers/bird.php +++ b/routers/bird.php @@ -63,10 +63,23 @@ final class Bird extends Router { break; case 'ping': + $append = null; + if (isset($this->config['source-interface-id'])) { + $append = ' -I '.$this->config['source-interface-id']; + } + if (match_ipv4($parameters)) { - $commands[] = 'ping -A -c 10 '.$parameters; + $ping = 'ping -A -c 10 '.$parameters; + if ($append != null) { + $ping .= $append; + } + $commands[] = $ping; } else if (match_ipv6($parameters)) { - $commands[] = 'ping6 -A -c 10 '.$parameters; + $ping = 'ping6 -A -c 10 '.$parameters; + if ($append != null) { + $ping .= $append; + } + $commands[] = $ping; } else if (match_fqdn($parameters)) { $ip_address = fqdn_to_ip_address($parameters); @@ -75,9 +88,17 @@ final class Bird extends Router { } if (match_ipv4($ip_address)) { - $commands[] = 'ping -A -c 10 '.$parameters; + $ping = 'ping -A -c 10 '.$parameters; + if ($append != null) { + $ping .= $append; + } + $commands[] = $ping; } else if (match_ipv6($ip_address)) { - $commands[] = 'ping6 -A -c 10 '.$parameters; + $ping = 'ping6 -A -c 10 '.$parameters; + if ($append != null) { + $ping .= $append; + } + $commands[] = $ping; } } else { throw new Exception('The parameter is not an IPv4/IPv6 address.'); @@ -85,10 +106,23 @@ final class Bird extends Router { break; case 'traceroute': + $append = null; + if (isset($this->config['source-interface-id'])) { + $append = ' -s '.$this->config['source-interface-id']; + } + if (match_ipv4($parameters)) { - $commands[] = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$parameters; + $traceroute = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$parameters; + if ($append != null) { + $traceroute .= $append; + } + $commands[] = $traceroute; } else if (match_ipv6($parameters)) { - $commands[] = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$parameters; + $traceroute = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$parameters; + if ($append != null) { + $traceroute .= $append; + } + $commands[] = $traceroute; } else if (match_fqdn($parameters)) { $ip_address = fqdn_to_ip_address($parameters); @@ -97,9 +131,17 @@ final class Bird extends Router { } if (match_ipv4($ip_address)) { - $commands[] = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$parameters; + $traceroute = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$parameters; + if ($append != null) { + $traceroute .= $append; + } + $commands[] = $traceroute; } else if (match_ipv6($ip_address)) { - $commands[] = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$parameters; + $traceroute = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$parameters; + if ($append != null) { + $traceroute .= $append; + } + $commands[] = $traceroute; } } else { throw new Exception('The parameter is not an IPv4/IPv6 address.'); diff --git a/routers/cisco.php b/routers/cisco.php index bc34653..285653a 100644 --- a/routers/cisco.php +++ b/routers/cisco.php @@ -57,7 +57,11 @@ final class Cisco extends Router { case 'ping': if (match_ipv4($parameters) || match_ipv6($parameters) || match_fqdn($parameters)) { - $commands[] = 'ping '.$parameters.' repeat 10'; + $ping = 'ping '.$parameters.' repeat 10'; + if (isset($this->config['source-interface-id'])) { + $ping .= ' source '.$this->config['source-interface-id']; + } + $commands[] = $ping; } else { throw new Exception('The parameter is not an IPv4/IPv6 address.'); } @@ -65,7 +69,11 @@ final class Cisco extends Router { case 'traceroute': if (match_ipv4($parameters) || match_ipv6($parameters) || match_fqdn($parameters)) { - $commands[] = 'traceroute '.$parameters; + $traceroute = 'traceroute '.$parameters; + if (isset($this->config['source-interface-id'])) { + $traceroute .= ' source '.$this->config['source-interface-id']; + } + $commands[] = $traceroute; } else { throw new Exception('The parameter is not an IPv4/IPv6 address.'); } diff --git a/routers/juniper.php b/routers/juniper.php index 6c6acf7..fefdf1c 100644 --- a/routers/juniper.php +++ b/routers/juniper.php @@ -64,17 +64,34 @@ final class Juniper extends Router { case 'ping': if (match_ipv4($parameters) || match_ipv6($parameters) || match_fqdn($parameters)) { - $commands[] = 'ping count 10 '.$parameters.' rapid'; + $ping = 'ping count 10 rapid '.$parameters; + if (isset($this->config['source-interface-id'])) { + $ping .= ' interface '.$this->config['source-interface-id']; + } + $commands[] = $ping; } else { throw new Exception('The parameter is not an IPv4/IPv6 address or a FQDN.'); } break; case 'traceroute': + $append = null; + if (isset($this->config['source-interface-id'])) { + $append = ' interface '.$this->config['source-interface-id']; + } + if (match_ipv4($parameters)) { - $commands[] = 'traceroute '.$parameters.' as-number-lookup'; + $traceroute = 'traceroute as-number-lookup '.$parameters; + if ($append != null) { + $traceroute .= $append; + } + $commands[] = $traceroute; } else if (match_ipv6($parameters) || match_fqdn($parameters)) { - $commands[] = 'traceroute '.$parameters; + $traceroute = 'traceroute '.$parameters; + if ($append != null) { + $traceroute .= $append; + } + $commands[] = $traceroute; } else { throw new Exception('The parameter is not an IPv4/IPv6 address or a FQDN.'); } diff --git a/routers/quagga.php b/routers/quagga.php index 9d7ee77..d12c9e3 100644 --- a/routers/quagga.php +++ b/routers/quagga.php @@ -58,10 +58,23 @@ final class Quagga extends Router { break; case 'ping': + $append = null; + if (isset($this->config['source-interface-id'])) { + $append = ' -I '.$this->config['source-interface-id']; + } + if (match_ipv4($parameters)) { - $commands[] = 'ping -A -c 10 '.$parameters; + $ping = 'ping -A -c 10 '.$parameters; + if ($append != null) { + $ping .= $append; + } + $commands[] = $ping; } else if (match_ipv6($parameters)) { - $commands[] = 'ping6 -A -c 10 '.$parameters; + $ping = 'ping6 -A -c 10 '.$parameters; + if ($append != null) { + $ping .= $append; + } + $commands[] = $ping; } else if (match_fqdn($parameters)) { $ip_address = fqdn_to_ip_address($parameters); @@ -70,9 +83,17 @@ final class Quagga extends Router { } if (match_ipv4($ip_address)) { - $commands[] = 'ping -A -c 10 '.$parameters; + $ping = 'ping -A -c 10 '.$parameters; + if ($append != null) { + $ping .= $append; + } + $commands[] = $ping; } else if (match_ipv6($ip_address)) { - $commands[] = 'ping6 -A -c 10 '.$parameters; + $ping = 'ping6 -A -c 10 '.$parameters; + if ($append != null) { + $ping .= $append; + } + $commands[] = $ping; } } else { throw new Exception('The parameter is not an IPv4/IPv6 address.'); @@ -80,10 +101,23 @@ final class Quagga extends Router { break; case 'traceroute': + $append = null; + if (isset($this->config['source-interface-id'])) { + $append = ' -s '.$this->config['source-interface-id']; + } + if (match_ipv4($parameters)) { - $commands[] = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$parameters; + $traceroute = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$parameters; + if ($append != null) { + $traceroute .= $append; + } + $commands[] .= $traceroute; } else if (match_ipv6($parameters)) { - $commands[] = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$parameters; + $traceroute = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$parameters; + if ($append != null) { + $traceroute .= $append; + } + $commands[] = $traceroute; } else if (match_fqdn($parameters)) { $ip_address = fqdn_to_ip_address($parameters); @@ -92,9 +126,17 @@ final class Quagga extends Router { } if (match_ipv4($ip_address)) { - $commands[] = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$parameters; + $traceroute = 'traceroute -4 -A -q1 -N32 -w1 -m15 '.$parameters; + if ($append != null) { + $traceroute .= $append; + } + $commands[] .= $traceroute; } else if (match_ipv6($ip_address)) { - $commands[] = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$parameters; + $traceroute = 'traceroute -6 -A -q1 -N32 -w1 -m15 '.$parameters; + if ($append != null) { + $traceroute .= $append; + } + $commands[] = $traceroute; } } else { throw new Exception('The parameter is not an IPv4/IPv6 address.'); -- cgit v1.2.3