diff options
author | Ermal Luçi <eri@pfsense.org> | 2008-09-12 22:54:43 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2008-09-12 22:54:43 +0000 |
commit | 872ce0dd45e0c7733daee13287ac29dbad1dc744 (patch) | |
tree | ba1267d6b1bc59c03b755cde73f2b16aa77bd04c /usr/local/www/ifstats.php | |
parent | fb707f4a3b00a05c441a19eb53ae1d33e6a342d3 (diff) | |
download | pfsense-872ce0dd45e0c7733daee13287ac29dbad1dc744.zip pfsense-872ce0dd45e0c7733daee13287ac29dbad1dc744.tar.gz |
Fix the Status->Traffic Graph graphic.
Diffstat (limited to 'usr/local/www/ifstats.php')
-rw-r--r-- | usr/local/www/ifstats.php | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/usr/local/www/ifstats.php b/usr/local/www/ifstats.php index c8457d1..9ea65ad 100644 --- a/usr/local/www/ifstats.php +++ b/usr/local/www/ifstats.php @@ -37,44 +37,31 @@ ##|-PRIV - require("functions.inc"); - require("config.inc"); + require_once("interfaces.inc"); $ifinfo = array(); $if = $_GET['if']; - $ifinfo['hwif'] = $config['interfaces'][$if]['if']; - if(!$ifinfo['hwif']) - $ifinfo['hwif'] = $if; - - $ifinfo['if'] = $ifinfo['hwif']; + $realif = get_real_wan_interface($if); + if(!$realif) + $realif = $if; // Need for IPSec case interface. /* run netstat to determine link info */ $linkinfo = ""; unset($linkinfo); - exec("/usr/bin/netstat -I " . $ifinfo['hwif'] . " -nWb -f link", $linkinfo); + exec("/usr/bin/netstat -I {$realif} -nWb -f link", $linkinfo); $linkinfo = preg_split("/\s+/", $linkinfo[1]); - if (preg_match("/\*$/", $linkinfo[0])) { - $ifinfo['status'] = "down"; - } else { - $ifinfo['status'] = "up"; - } - - if(preg_match("/^enc|^tun/i", $ifinfo['if'])) { + if (preg_match("/^enc|^tun|^pppoe|^pptp/i", $realif)) { $ifinfo['inpkts'] = $linkinfo[3]; $ifinfo['inbytes'] = $linkinfo[5]; $ifinfo['outpkts'] = $linkinfo[6]; $ifinfo['outbytes'] = $linkinfo[8]; } else { - $ifinfo['macaddr'] = $linkinfo[3]; $ifinfo['inpkts'] = $linkinfo[4]; - $ifinfo['inerrs'] = $linkinfo[5]; $ifinfo['inbytes'] = $linkinfo[6]; $ifinfo['outpkts'] = $linkinfo[7]; - $ifinfo['outerrs'] = $linkinfo[8]; $ifinfo['outbytes'] = $linkinfo[9]; - $ifinfo['collisions'] = $linkinfo[10]; } $temp = gettimeofday(); $timing = (double)$temp["sec"] + (double)$temp["usec"] / 1000000.0; |