diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-08-31 22:23:15 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2015-08-31 22:23:15 +0545 |
| commit | 288a2a0f294f992a9536dfbb5c54dd528badbad5 (patch) | |
| tree | 8d1c6be8a2cf5848f6df06b631ce2614485648fe /src/usr/local/www/diag_traceroute.php | |
| parent | 683ba309d50913828decb5fe3f6ade059c1dfab2 (diff) | |
| download | pfsense-288a2a0f294f992a9536dfbb5c54dd528badbad5.zip pfsense-288a2a0f294f992a9536dfbb5c54dd528badbad5.tar.gz | |
bootstrap usr/local/www a to e minor edits
Diffstat (limited to 'src/usr/local/www/diag_traceroute.php')
| -rw-r--r-- | src/usr/local/www/diag_traceroute.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/usr/local/www/diag_traceroute.php b/src/usr/local/www/diag_traceroute.php index f82b963..6792a9d 100644 --- a/src/usr/local/www/diag_traceroute.php +++ b/src/usr/local/www/diag_traceroute.php @@ -175,7 +175,7 @@ $section->addInput(new Form_Checkbox( 'Reverse Address Lookup', '', $resolve -))->setHelp('When checked, traceroute will attempt to perform a PTR lookup to locate hostnames for hops along the path. Will slow down the process as it has to wait for DNS replies.'); +))->setHelp('When checked, traceroute will attempt to perform a PTR lookup to locate hostnames for hops along the path. This will slow down the process as it has to wait for DNS replies.'); $section->addInput(new Form_Checkbox( 'useicmp', @@ -193,17 +193,17 @@ if (!$input_errors && $do_traceroute) { $useicmp = isset($_REQUEST['useicmp']) ? "-I" : ""; $n = isset($resolve) ? "" : "-n"; - $command = "/usr/sbin/traceroute"; - if ($ipproto == "ipv6") { - $command .= "6"; - $ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ipv6($sourceip); - } else { - $ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ip($sourceip); - } - - if ($ifaddr && (is_ipaddr($host) || is_hostname($host))) { - $srcip = "-s " . escapeshellarg($ifaddr); - } + $command = "/usr/sbin/traceroute"; + if ($ipproto == "ipv6") { + $command .= "6"; + $ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ipv6($sourceip); + } else { + $ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ip($sourceip); + } + + if ($ifaddr && (is_ipaddr($host) || is_hostname($host))) { + $srcip = "-s " . escapeshellarg($ifaddr); + } $cmd = "{$command} {$n} {$srcip} -w 2 {$useicmp} -m " . escapeshellarg($ttl) . " " . escapeshellarg($host); ?> |
