diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-10-23 21:51:53 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-10-23 21:51:53 +0000 |
| commit | 85a5da131ccbbb6fe335da3ca7d67cc0c3f60aa0 (patch) | |
| tree | 5599823fbfad08f8e11831c28d9e6caedd41bd1a /usr/local/www/diag_ping.php | |
| parent | cb00b7342f39a96ddbffd3a53965c780359e2d3b (diff) | |
| download | pfsense-85a5da131ccbbb6fe335da3ca7d67cc0c3f60aa0.zip pfsense-85a5da131ccbbb6fe335da3ca7d67cc0c3f60aa0.tar.gz | |
* Rename get_current_wan_address to get_interface_ip
* Rename get_real_wan_interface to get_real_interface
* Simplify get_interface_ip by using find_interface_ip which should help in speed to since its using caching. Pointed by billm@
* Cleanup some code when passing or remove some unused one.
Diffstat (limited to 'usr/local/www/diag_ping.php')
| -rwxr-xr-x | usr/local/www/diag_ping.php | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php index e80aa76..e4cc4f4 100755 --- a/usr/local/www/diag_ping.php +++ b/usr/local/www/diag_ping.php @@ -68,31 +68,6 @@ if (!isset($do_ping)) { $count = DEFAULT_COUNT; } -function get_interface_addr($ifdescr) { - - global $config, $g; - - /* find out interface name */ - if ($ifdescr == "wan") - $if = get_real_wan_interface(); - else - $if = $config['interfaces'][$ifdescr]['if']; - - /* try to determine IP address and netmask with ifconfig */ - $ifconfiginfo = ""; - $matches = ""; - unset($ifconfiginfo); - exec("/sbin/ifconfig " . $if, $ifconfiginfo); - - foreach ($ifconfiginfo as $ici) { - if (preg_match("/inet (\S+)/", $ici, $matches)) { - return $matches[1]; - } - } - - return false; -} - include("head.inc"); ?> <body link="#000000" vlink="#000000" alink="#000000"> <? include("fbegin.inc"); ?> @@ -145,7 +120,7 @@ include("head.inc"); ?> echo("<strong>Ping output:</strong><br>"); echo('<pre>'); ob_end_flush(); - $ifaddr = get_interface_addr($interface); + $ifaddr = get_interface_ip($interface); if ($ifaddr) system("/sbin/ping -S$ifaddr -c$count " . escapeshellarg($host)); else |
