summaryrefslogtreecommitdiff
path: root/routers
diff options
context:
space:
mode:
Diffstat (limited to 'routers')
-rw-r--r--routers/bird.php24
-rw-r--r--routers/cisco.php20
-rw-r--r--routers/juniper.php8
-rw-r--r--routers/quagga.php24
4 files changed, 38 insertions, 38 deletions
diff --git a/routers/bird.php b/routers/bird.php
index fe9b197..b1a75b8 100644
--- a/routers/bird.php
+++ b/routers/bird.php
@@ -26,21 +26,21 @@ final class Bird extends Router {
protected function build_ping($destination) {
$ping = null;
- if (match_fqdn($destination)) {
- $fqdn = $destination;
- $destination = fqdn_to_ip_address($fqdn);
+ if (match_hostname($destination)) {
+ $hostname = $destination;
+ $destination = hostname_to_ip_address($hostname);
if (!$destination) {
- throw new Exception('No A or AAAA record found for '.$fqdn);
+ throw new Exception('No A or AAAA record found for '.$hostname);
}
}
if (match_ipv4($destination)) {
$ping = 'ping '.$this->global_config['tools']['ping_options'].' '.
- (isset($fqdn) ? $fqdn : $destination);
+ (isset($hostname) ? $hostname : $destination);
} else if (match_ipv6($destination)) {
$ping = 'ping6 '.$this->global_config['tools']['ping_options'].' '.
- (isset($fqdn) ? $fqdn : $destination);
+ (isset($hostname) ? $hostname : $destination);
} else {
throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.');
}
@@ -63,23 +63,23 @@ final class Bird extends Router {
protected function build_traceroute($destination) {
$traceroute = null;
- if (match_fqdn($destination)) {
- $fqdn = $destination;
- $destination = fqdn_to_ip_address($fqdn);
+ if (match_hostname($destination)) {
+ $hostname = $destination;
+ $destination = hostname_to_ip_address($hostname);
if (!$destination) {
- throw new Exception('No A or AAAA record found for '.$fqdn);
+ throw new Exception('No A or AAAA record found for '.$hostname);
}
}
if (match_ipv4($destination)) {
$traceroute = $this->global_config['tools']['traceroute4'].' '.
$this->global_config['tools']['traceroute_options'].' '.
- (isset($fqdn) ? $fqdn : $destination);
+ (isset($hostname) ? $hostname : $destination);
} else if (match_ipv6($destination)) {
$traceroute = $this->global_config['tools']['traceroute6'].' '.
$this->global_config['tools']['traceroute_options'].' '.
- (isset($fqdn) ? $fqdn : $destination);
+ (isset($hostname) ? $hostname : $destination);
} else {
throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.');
}
diff --git a/routers/cisco.php b/routers/cisco.php
index 0763bd7..e36a6bf 100644
--- a/routers/cisco.php
+++ b/routers/cisco.php
@@ -27,10 +27,10 @@ final class Cisco extends Router {
$ping = null;
if (match_ipv4($destination) || match_ipv6($destination) ||
- match_fqdn($destination)) {
+ match_hostname($destination)) {
$ping = 'ping '.$destination.' repeat 10';
} else {
- throw new Exception('The parameter is not an IPv4/IPv6 address or a FQDN.');
+ throw new Exception('The parameter is not an IPv4/IPv6 address or a hostname.');
}
if (($ping != null) && $this->has_source_interface_id()) {
@@ -44,25 +44,25 @@ final class Cisco extends Router {
$traceroute = null;
if (match_ipv4($destination) || match_ipv6($destination) ||
- (match_fqdn($destination) && !$this->has_source_interface_id())) {
+ (match_hostname($destination) && !$this->has_source_interface_id())) {
$traceroute = 'traceroute '.$destination;
- } else if (match_fqdn($destination)) {
- $fqdn = $destination;
- $destination = fqdn_to_ip_address($fqdn);
+ } else if (match_hostname($destination)) {
+ $hostname = $destination;
+ $destination = hostname_to_ip_address($hostname);
if (!$destination) {
- throw new Exception('No A or AAAA record found for '.$fqdn);
+ throw new Exception('No A or AAAA record found for '.$hostname);
}
if (match_ipv4($destination)) {
- $traceroute = 'traceroute ip '.(isset($fqdn) ? $fqdn : $destination);
+ $traceroute = 'traceroute ip '.(isset($hostname) ? $hostname : $destination);
} else if (match_ipv6($destination)) {
- $traceroute = 'traceroute ipv6 '.(isset($fqdn) ? $fqdn : $destination);
+ $traceroute = 'traceroute ipv6 '.(isset($hostname) ? $hostname : $destination);
} else {
throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.');
}
} else {
- throw new Exception('The parameter is not an IPv4/IPv6 address or a FQDN.');
+ throw new Exception('The parameter is not an IPv4/IPv6 address or a hostname.');
}
if (($traceroute != null) && $this->has_source_interface_id() &&
diff --git a/routers/juniper.php b/routers/juniper.php
index b5c3449..3eb34e5 100644
--- a/routers/juniper.php
+++ b/routers/juniper.php
@@ -27,10 +27,10 @@ final class Juniper extends Router {
$ping = null;
if (match_ipv4($destination) || match_ipv6($destination) ||
- match_fqdn($destination)) {
+ match_hostname($destination)) {
$ping = 'ping count 10 rapid '.$destination;
} else {
- throw new Exception('The parameter is not an IPv4/IPv6 address or a FQDN.');
+ throw new Exception('The parameter is not an IPv4/IPv6 address or a hostname.');
}
if (($ping != null) && $this->has_source_interface_id()) {
@@ -45,10 +45,10 @@ final class Juniper extends Router {
if (match_ipv4($destination)) {
$traceroute = 'traceroute as-number-lookup '.$destination;
- } else if (match_ipv6($destination) || match_fqdn($destination)) {
+ } else if (match_ipv6($destination) || match_hostname($destination)) {
$traceroute = 'traceroute '.$destination;
} else {
- throw new Exception('The parameter is not an IPv4/IPv6 address or a FQDN.');
+ throw new Exception('The parameter is not an IPv4/IPv6 address or a hostname.');
}
if (($traceroute != null) && $this->has_source_interface_id()) {
diff --git a/routers/quagga.php b/routers/quagga.php
index 1944273..9ce6606 100644
--- a/routers/quagga.php
+++ b/routers/quagga.php
@@ -26,21 +26,21 @@ final class Quagga extends Router {
protected function build_ping($destination) {
$ping = null;
- if (match_fqdn($destination)) {
- $fqdn = $destination;
- $destination = fqdn_to_ip_address($fqdn);
+ if (match_hostname($destination)) {
+ $hostname = $destination;
+ $destination = hostname_to_ip_address($hostname);
if (!$destination) {
- throw new Exception('No A or AAAA record found for '.$fqdn);
+ throw new Exception('No A or AAAA record found for '.$hostname);
}
}
if (match_ipv4($destination)) {
$ping = 'ping '.$this->global_config['tools']['ping_options'].' '.
- (isset($fqdn) ? $fqdn : $destination);
+ (isset($hostname) ? $hostname : $destination);
} else if (match_ipv6($destination)) {
$ping = 'ping6 '.$this->global_config['tools']['ping_options'].' '.
- (isset($fqdn) ? $fqdn : $destination);
+ (isset($hostname) ? $hostname : $destination);
} else {
throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.');
}
@@ -63,23 +63,23 @@ final class Quagga extends Router {
protected function build_traceroute($destination) {
$traceroute = null;
- if (match_fqdn($destination)) {
- $fqdn = $destination;
- $destination = fqdn_to_ip_address($fqdn);
+ if (match_hostname($destination)) {
+ $hostname = $destination;
+ $destination = hostname_to_ip_address($hostname);
if (!$destination) {
- throw new Exception('No A or AAAA record found for '.$fqdn);
+ throw new Exception('No A or AAAA record found for '.$hostname);
}
}
if (match_ipv4($destination)) {
$traceroute = $this->global_config['tools']['traceroute4'].' '.
$this->global_config['tools']['traceroute_options'].' '.
- (isset($fqdn) ? $fqdn : $destination);
+ (isset($hostname) ? $hostname : $destination);
} else if (match_ipv6($destination)) {
$traceroute = $this->global_config['tools']['traceroute6'].' '.
$this->global_config['tools']['traceroute_options'].' '.
- (isset($fqdn) ? $fqdn : $destination);
+ (isset($hostname) ? $hostname : $destination);
} else {
throw new Exception('The parameter does not resolve to an IPv4/IPv6 address.');
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-13 20:03:39 +0000