(interfaces -> traffic graph) trash old svg graph and start using d3

This commit is contained in:
Ad Schellevis 2016-05-10 10:36:26 +02:00
parent 556dc7384a
commit c7edec885d
4 changed files with 45 additions and 504 deletions

View File

@ -51,9 +51,7 @@
"match": [
"index.php*",
"*.widget.php*",
"graph.php*",
"widgets/api/get.php*",
"legacy_traffic_stats.php*",
"diag_logs_filter_dynamic.php*"
]
},
@ -99,13 +97,6 @@
"diag_halt.php*"
]
},
"page-diagnostics-interfacetraffic": {
"name": "WebCfg - Diagnostics: Interface Traffic page",
"descr": "Allow access to the 'Diagnostics: Interface Traffic' page.",
"match": [
"graph.php*"
]
},
"page-diagnostics-limiter-info": {
"name": "WebCfg - Diagnostics: Limiter Info",
"descr": "Allows access to the 'Diagnostics: Limiter Info' page",
@ -957,9 +948,7 @@
"name": "WebCfg - Status: Traffic Graph page",
"descr": "Allow access to the 'Status: Traffic Graph' page.",
"match": [
"status_graph.php*",
"graph.php*",
"legacy_traffic_stats.php*"
"status_graph.php*"
]
},
"page-service-upnp": {
@ -1251,13 +1240,6 @@
"vpn_openvpn_server.php*"
]
},
"page-xmlrpcinterfacestats": {
"name": "WebCfg - XMLRPC Interface Stats page",
"descr": "Allow access to the 'XMLRPC Interface Stats' page.",
"match": [
"legacy_traffic_stats.php*"
]
},
"page-xmlrpclibrary": {
"name": "WebCfg - XMLRPC Library page",
"descr": "Allow access to the 'XMLRPC Library' page.",

View File

@ -1,373 +0,0 @@
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2004-2006 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>
and Jonathan Watt <jwatt@jwatt.org>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("guiconfig.inc");
require_once("interfaces.inc");
header("Last-Modified: " . gmdate( "D, j M Y H:i:s" ) . " GMT" );
header("Expires: " . gmdate( "D, j M Y H:i:s", time() ) . " GMT" );
header("Cache-Control: no-store, no-cache, must-revalidate" ); // HTTP/1.1
header("Cache-Control: post-check=0, pre-check=0", FALSE );
header("Pragma: no-cache"); // HTTP/1.0
header("Content-type: image/svg+xml");
/********** HTTP GET Based Conf ***********/
$ifnum=@$_GET["ifnum"]; // BSD / SNMP interface name / number
$ifnum = get_real_interface($ifnum);
$ifname=@$_GET["ifname"]?$_GET["ifname"]:"Interface $ifnum"; //Interface name that will be showed on top right of graph
/********* Other conf *******/
if (isset($config["widgets"]["trafficgraphs"]["scale_type"]))
$scale_type = $config["widgets"]["trafficgraphs"]["scale_type"];
else
$scale_type = "up";
$nb_plot=120; //NB plot in graph
if ($_GET["timeint"])
$time_interval = $_GET["timeint"]; //Refresh time Interval
else
$time_interval = 3;
if ($_GET["initdelay"])
$init_delay = $_GET["initdelay"]; //Initial Delay
else
$init_delay = 3;
//SVG attributes
$attribs['axis']='fill="black" stroke="black"';
$attribs['in']='fill="#f07712" font-family="Tahoma, Verdana, Arial, Helvetica, sans-serif" font-size="7"';
$attribs['out']='fill="#333333" font-family="Tahoma, Verdana, Arial, Helvetica, sans-serif" font-size="7"';
$attribs['graph_in']='fill="none" stroke="#f07712" stroke-opacity="0.8"';
$attribs['graph_out']='fill="none" stroke="#333333" stroke-opacity="0.8"';
$attribs['legend']='fill="black" font-family="Tahoma, Verdana, Arial, Helvetica, sans-serif" font-size="4"';
$attribs['graphname']='fill="#f07712" font-family="Tahoma, Verdana, Arial, Helvetica, sans-serif" font-size="8"';
$attribs['grid_txt']='fill="gray" font-family="Tahoma, Verdana, Arial, Helvetica, sans-serif" font-size="6"';
$attribs['grid']='stroke="gray" stroke-opacity="0.5"';
$attribs['switch_unit']='fill="#f07712" font-family="Tahoma, Verdana, Arial, Helvetica, sans-serif" font-size="4" text-decoration="underline"';
$attribs['switch_scale']='fill="#f07712" font-family="Tahoma, Verdana, Arial, Helvetica, sans-serif" font-size="4" text-decoration="underline"';
$attribs['error']='fill="blue" font-family="Arial" font-size="4"';
$attribs['collect_initial']='fill="gray" font-family="Tahoma, Verdana, Arial, Helvetica, sans-serif" font-size="4"';
//Error text if we cannot fetch data : depends on which method is used
$error_text = sprintf(gettext('Cannot get data about interface %s'), htmlspecialchars($ifnum));
$height=100; //SVG internal height : do not modify
$width=200; //SVG internal width : do not modify
$fetch_link = "legacy_traffic_stats.php?if=" . htmlspecialchars($ifnum);
/********* Graph DATA **************/
print('<?xml version="1.0" ?>' . "\n");?>
<svg width="100%" height="100%" viewBox="0 0 <?=$width?> <?=$height?>" preserveAspectRatio="none" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" onload="init(evt)">
<g id="graph">
<rect id="bg" x1="0" y1="0" width="100%" height="100%" fill="white"/>
<line id="axis_x" x1="0" y1="0" x2="0" y2="100%" <?=$attribs['axis']?>/>
<line id="axis_y" x1="0" y1="100%" x2="100%" y2="100%" <?=$attribs['axis']?>/>
<path id="graph_out" d="M0 <?=$height?> L 0 <?=$height?>" <?=$attribs['graph_out']?>/>
<path id="graph_in" d="M0 <?=$height?> L 0 <?=$height?>" <?=$attribs['graph_in']?>/>
<path id="grid" d="M0 <?=$height/4*1?> L <?=$width?> <?=$height/4*1?> M0 <?=$height/4*2?> L <?=$width?> <?=$height/4*2?> M0 <?=$height/4*3?> L <?=$width?> <?=$height/4*3?>" <?=$attribs['grid']?>/>
<text id="grid_txt1" x="<?=$width?>" y="<?=$height/4*1?>" <?=$attribs['grid_txt']?> text-anchor="end"> </text>
<text id="grid_txt2" x="<?=$width?>" y="<?=$height/4*2?>" <?=$attribs['grid_txt']?> text-anchor="end"> </text>
<text id="grid_txt3" x="<?=$width?>" y="<?=$height/4*3?>" <?=$attribs['grid_txt']?> text-anchor="end"> </text>
<text id="graph_in_lbl" x="5" y="8" <?=$attribs['in']?>><?=gettext("In"); ?></text>
<text id="graph_out_lbl" x="5" y="16" <?=$attribs['out']?>><?=gettext("Out"); ?></text>
<text id="graph_in_txt" x="20" y="8" <?=$attribs['in']?>> </text>
<text id="graph_out_txt" x="20" y="16" <?=$attribs['out']?>> </text>
<text id="ifname" x="<?=$width?>" y="8" <?=$attribs['graphname']?> text-anchor="end"><?=htmlspecialchars($ifname)?></text>
<text id="switch_unit" x="<?=$width*0.55?>" y="5" <?=$attribs['switch_unit']?>><?=gettext("Switch to bytes/s"); ?></text>
<text id="switch_scale" x="<?=$width*0.55?>" y="11" <?=$attribs['switch_scale']?>><?=gettext("AutoScale"); ?> (<?=$scale_type?>)</text>
<text id="date" x="<?=$width*0.33?>" y="5" <?=$attribs['legend']?>> </text>
<text id="time" x="<?=$width*0.33?>" y="11" <?=$attribs['legend']?>> </text>
<text id="graphlast" x="<?=$width*0.55?>" y="17" <?=$attribs['legend']?>><?=gettext("Graph shows last"); ?> <?=$time_interval*$nb_plot?> <?=gettext("seconds"); ?></text>
<polygon id="axis_arrow_x" <?=$attribs['axis']?> points="<?=($width) . "," . ($height)?> <?=($width-2) . "," . ($height-2)?> <?=($width-2) . "," . $height?>"/>
<text id="error" x="<?=$width*0.5?>" y="<?=$height*0.5?>" visibility="hidden" <?=$attribs['error']?> text-anchor="middle"><?=$error_text?></text>
<text id="collect_initial" x="<?=$width*0.5?>" y="<?=$height*0.5?>" visibility="hidden" <?=$attribs['collect_initial']?> text-anchor="middle"><?=gettext("Collecting initial data, please wait"); ?>...</text>
</g>
<script type="text/ecmascript">
<![CDATA[
/**
* getURL is a proprietary Adobe function, but it's simplicity has made it very
* popular. If getURL is undefined we spin our own by wrapping XMLHttpRequest.
*/
if (typeof getURL == 'undefined') {
getURL = function(url, callback) {
if (!url)
throw '<?=gettext("No URL for getURL"); ?>';
try {
if (typeof callback.operationComplete == 'function')
callback = callback.operationComplete;
} catch (e) {}
if (typeof callback != 'function')
throw '<?=gettext("No callback function for getURL"); ?>';
var http_request = null;
if (typeof XMLHttpRequest != 'undefined') {
http_request = new XMLHttpRequest();
}
else if (typeof ActiveXObject != 'undefined') {
try {
http_request = new ActiveXObject('Msxml2.XMLHTTP');
} catch (e) {
try {
http_request = new ActiveXObject('Microsoft.XMLHTTP');
} catch (e) {}
}
}
if (!http_request)
throw '<?=gettext("Both getURL and XMLHttpRequest are undefined"); ?>';
http_request.onreadystatechange = function() {
if (http_request.readyState == 4) {
callback( { success : true,
content : http_request.responseText,
contentType : http_request.getResponseHeader("Content-Type") } );
}
}
http_request.open('GET', url, true);
http_request.send(null);
}
}
var SVGDoc = null;
var last_ifin = 0;
var last_ifout = 0;
var last_ugmt = 0;
var max = 0;
var plot_in = new Array();
var plot_out = new Array();
var max_num_points = <?=$nb_plot?>; // maximum number of plot data points
var step = <?=$width?> / max_num_points ;
var unit = 'bits';
var scale_type = '<?=$scale_type?>';
function init(evt) {
SVGDoc = evt.target.ownerDocument;
SVGDoc.getElementById("switch_unit").addEventListener("mousedown", switch_unit, false);
SVGDoc.getElementById("switch_scale").addEventListener("mousedown", switch_scale, false);
fetch_data();
}
function switch_unit(event)
{
SVGDoc.getElementById('switch_unit').firstChild.data = '<?=gettext("Switch to"); ?> ' + unit + '/s';
unit = (unit == 'bits') ? 'bytes' : 'bits';
}
function switch_scale(event)
{
scale_type = (scale_type == 'up') ? '<?=gettext("follow"); ?>' : '<?=gettext("up"); ?>';
SVGDoc.getElementById('switch_scale').firstChild.data = 'AutoScale (' + scale_type + ')';
}
function fetch_data() {
getURL('<?=$fetch_link?>', plot_data);
}
function plot_data(obj) {
// Show datetimelegend
var now = new Date();
var time = LZ(now.getHours()) + ":" + LZ(now.getMinutes()) + ":" + LZ(now.getSeconds());
SVGDoc.getElementById('time').firstChild.data = time;
var date = (now.getMonth()+1) + "/" + now.getDate() + "/" + now.getFullYear();
SVGDoc.getElementById('date').firstChild.data = date;
if (!obj.success)
return handle_error(); // getURL failed to get data
var t = obj.content.split("|");
var ugmt = parseFloat(t[0]); // ugmt is an unixtimestamp style
var ifin = parseInt(t[1], 10); // number of bytes received by the interface
var ifout = parseInt(t[2], 10); // number of bytes sent by the interface
var scale;
if (!isNumber(ifin) || !isNumber(ifout))
return handle_error();
var diff_ugmt = ugmt - last_ugmt;
var diff_ifin = ifin - last_ifin;
var diff_ifout = ifout - last_ifout;
if (diff_ugmt == 0)
diff_ugmt = 1; /* avoid division by zero */
last_ugmt = ugmt;
last_ifin = ifin;
last_ifout = ifout;
var graphTimerId = 0;
switch (plot_in.length) {
case 0:
SVGDoc.getElementById("collect_initial").setAttributeNS(null, 'visibility', 'visible');
plot_in[0] = diff_ifin / diff_ugmt;
plot_out[0] = diff_ifout / diff_ugmt;
setTimeout('fetch_data()',<?=1000*($time_interval + $init_delay)?>);
return;
case 1:
SVGDoc.getElementById("collect_initial").setAttributeNS(null, 'visibility', 'hidden');
break;
case max_num_points:
// shift plot to left if the maximum number of plot points has been reached
var i = 0;
while (i < max_num_points) {
plot_in[i] = plot_in[i+1];
plot_out[i] = plot_out[++i];
}
plot_in.length--;
plot_out.length--;
}
plot_in[plot_in.length] = diff_ifin / diff_ugmt;
plot_out[plot_out.length]= diff_ifout / diff_ugmt;
var index_plot = plot_in.length - 1;
SVGDoc.getElementById('graph_in_txt').firstChild.data = formatSpeed(plot_in[index_plot], unit);
SVGDoc.getElementById('graph_out_txt').firstChild.data = formatSpeed(plot_out[index_plot], unit);
/* determine peak for sensible scaling */
if (scale_type == 'up') {
if (plot_in[index_plot] > max)
max = plot_in[index_plot];
if (plot_out[index_plot] > max)
max = plot_out[index_plot];
}
else if (scale_type == 'follow') {
i = 0;
max = 0;
while (i < plot_in.length) {
if (plot_in[i] > max)
max = plot_in[i];
if (plot_out[i] > max)
max = plot_out[i];
i++;
}
}
var rmax; // max, rounded up
if (unit == 'bits') {
/* round up max, such that
100 kbps -> 200 kbps -> 400 kbps -> 800 kbps -> 1 Mbps -> 2 Mbps -> ... */
rmax = 12500;
i = 0;
while (max > rmax) {
i++;
if (i && (i % 4 == 0))
rmax *= 1.25;
else
rmax *= 2;
}
} else {
/* round up max, such that
10 KB/s -> 20 KB/s -> 40 KB/s -> 80 KB/s -> 100 KB/s -> 200 KB/s -> 400 KB/s -> 800 KB/s -> 1 MB/s ... */
rmax = 10240;
i = 0;
while (max > rmax) {
i++;
if (i && (i % 4 == 0))
rmax *= 1.25;
else
rmax *= 2;
if (i == 8)
rmax *= 1.024;
}
}
scale = <?=$height?> / rmax;
/* change labels accordingly */
SVGDoc.getElementById('grid_txt1').firstChild.data = formatSpeed(3*rmax/4,unit);
SVGDoc.getElementById('grid_txt2').firstChild.data = formatSpeed(2*rmax/4,unit);
SVGDoc.getElementById('grid_txt3').firstChild.data = formatSpeed(rmax/4,unit);
var path_in = "M 0 " + (<?=$height?> - (plot_in[0] * scale));
var path_out = "M 0 " + (<?=$height?> - (plot_out[0] * scale));
for (i = 1; i < plot_in.length; i++)
{
var x = step * i;
var y_in = <?=$height?> - (plot_in[i] * scale);
var y_out = <?=$height?> - (plot_out[i] * scale);
path_in += " L" + x + " " + y_in;
path_out += " L" + x + " " + y_out;
}
SVGDoc.getElementById('error').setAttributeNS(null, 'visibility', 'hidden');
SVGDoc.getElementById('graph_in').setAttributeNS(null, 'd', path_in);
SVGDoc.getElementById('graph_out').setAttributeNS(null, 'd', path_out);
setTimeout('fetch_data()',<?=1000*$time_interval?>);
}
function handle_error() {
SVGDoc.getElementById("error").setAttributeNS(null, 'visibility', 'visible');
setTimeout('fetch_data()',<?=1000*$time_interval?>);
}
function isNumber(a) {
return typeof a == 'number' && isFinite(a);
}
function formatSpeed(speed, unit) {
if (unit == 'bits')
return formatSpeedBits(speed);
if (unit == 'bytes')
return formatSpeedBytes(speed);
}
function formatSpeedBits(speed) {
// format speed in bits/sec, input: bytes/sec
if (speed < 125000)
return Math.round(speed / 125) + " <?=gettext("Kbps"); ?>";
if (speed < 125000000)
return Math.round(speed / 1250)/100 + " <?=gettext("Mbps"); ?>";
// else
return Math.round(speed / 1250000)/100 + " <?=gettext("Gbps"); ?>"; /* wow! */
}
function formatSpeedBytes(speed) {
// format speed in bytes/sec, input: bytes/sec
if (speed < 1048576)
return Math.round(speed / 10.24)/100 + " <?=gettext("KB/s"); ?>";
if (speed < 1073741824)
return Math.round(speed / 10485.76)/100 + " <?=gettext("MB/s"); ?>";
// else
return Math.round(speed / 10737418.24)/100 + " <?=gettext("GB/s"); ?>"; /* wow! */
}
function LZ(x) {
return (x < 0 || x > 9 ? "" : "0") + x;
}
]]>
</script>
</svg>

View File

@ -1,94 +0,0 @@
<?php
/*
Copyright (C) 2016 Deciso B.V.
Copyright (C) 2004-2014 by Electric Sheep Fencing LLC
Copyright (C) 2005-2006 Scott Ullrich <sullrich@gmail.com>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once('guiconfig.inc');
require_once('interfaces.inc');
require_once('pfsense-utils.inc');
//get interface IP and break up into an array
$real_interface = get_real_interface($_GET['if']);
if (!does_interface_exist($real_interface)) {
echo gettext("Wrong Interface");
exit;
} elseif (!empty($_GET['act']) && $_GET['act'] == "top") {
//
// find top bandwitdh users
// (parts copied from bandwidth_by_ip.php)
//
//get interface subnet
$netmask = find_interface_subnet($real_interface);
$intsubnet = gen_subnet(find_interface_ip($real_interface), $netmask) . "/$netmask";
$cmd_args = "";
switch (!empty($_GET['filter']) ? $_GET['filter'] : "") {
case "local":
$cmd_args .= " -c " . $intsubnet . " ";
break;
case "remote":
default:
$cmd_args .= " -lc 0.0.0.0/0 ";
break;
}
if (!empty($_GET['sort']) && $_GET['sort'] == "out") {
$cmd_args .= " -T ";
} else {
$cmd_args .= " -R ";
}
$listedIPs = array();
$cmd_action = "/usr/local/bin/rate -i {$real_interface} -nlq 1 -Aba 20 {$cmd_args} | tr \"|\" \" \" | awk '{ printf \"%s:%s:%s:%s:%s\\n\", $1, $2, $4, $6, $8 }'";
exec($cmd_action, $listedIPs);
$result = array();
for ($idx = 2 ; $idx < count($listedIPs) ; ++$idx) {
$fields = explode(':', $listedIPs[$idx]);
if (!empty($_GET['hostipformat'])) {
$addrdata = gethostbyaddr($fields[0]);
if ($_GET['hostipformat'] == 'hostname' && $addrdata != $fields[0]){
$addrdata = explode(".", $addrdata)[0];
}
} else {
$addrdata = $fields[0];
}
$result[] = array('host' => $addrdata, 'in' => $fields[1], 'out' => $fields[2]);
}
// return json traffic
echo json_encode($result);
} else {
// collect interface statistics
// original source ifstats.php
$ifinfo = legacy_interface_stats($real_interface);
$temp = gettimeofday();
$timing = (double)$temp["sec"] + (double)$temp["usec"] / 1000000.0;
echo "$timing|" . $ifinfo['bytes received'] . "|" . $ifinfo['bytes transmitted'] . "\n";
}
exit;

View File

@ -29,6 +29,8 @@
*/
require_once("guiconfig.inc");
require_once('interfaces.inc');
require_once("/usr/local/www/widgets/api/plugins/traffic.inc");
// Get configured interface list
$ifdescrs = get_configured_interface_with_descr();
@ -45,7 +47,6 @@ foreach (array('server', 'client') as $mode) {
}
}
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
// load initial form data
$pconfig = array();
@ -59,6 +60,37 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['sort'] = !empty($_GET['sort']) ? $_GET['sort'] : "";
$pconfig['filter'] = !empty($_GET['filter']) ? $_GET['filter'] : "";
$pconfig['hostipformat'] = !empty($_GET['hostipformat']) ? $_GET['hostipformat'] : "";
$pconfig['act'] = !empty($_GET['act']) ? $_GET['act'] : "";
if ($pconfig['act'] == "traffic") {
// traffic graph data
echo json_encode(traffic_api());
exit;
} elseif ($pconfig['act'] == 'top') {
// top data
$result = array();
$real_interface = get_real_interface($pconfig['if']);
if (does_interface_exist($real_interface)) {
$netmask = find_interface_subnet($real_interface);
$intsubnet = gen_subnet(find_interface_ip($real_interface), $netmask) . "/$netmask";
$cmd_args = $pconfig['filter'] == "local" ? " -c " . $intsubnet . " " : " -lc 0.0.0.0/0 ";
$cmd_args .= $pconfig['sort'] == "out" ? " -T " : " -R ";
$cmd_action = "/usr/local/bin/rate -i {$real_interface} -nlq 1 -Aba 20 {$cmd_args} | tr \"|\" \" \" | awk '{ printf \"%s:%s:%s:%s:%s\\n\", $1, $2, $4, $6, $8 }'";
exec($cmd_action, $listedIPs);
for ($idx = 2 ; $idx < count($listedIPs) ; ++$idx) {
$fields = explode(':', $listedIPs[$idx]);
if (!empty($pconfig['hostipformat'])) {
$addrdata = gethostbyaddr($fields[0]);
if ($pconfig['hostipformat'] == 'hostname' && $addrdata != $fields[0]){
$addrdata = explode(".", $addrdata)[0];
}
} else {
$addrdata = $fields[0];
}
$result[] = array('host' => $addrdata, 'in' => $fields[1], 'out' => $fields[2]);
}
}
echo json_encode($result);
}
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
header("Location: status_graph.php");
exit;
@ -74,6 +106,9 @@ include("head.inc");
<script type="text/javascript">
$( document ).ready(function() {
function update_bandwidth_stats() {
$.ajax("status_graph.php", {'type': 'get', 'cache': false, 'dataType': 'json', 'data': {'act': 'traffic'}}).done(function(data){
traffic_widget_update($("[data-plugin=traffic]")[0], data, 360);
});
$.ajax("legacy_traffic_stats.php", {
type: 'get',
cache: false,
@ -99,6 +134,7 @@ include("head.inc");
setTimeout(update_bandwidth_stats, 1000);
}
update_bandwidth_stats();
});
</script>
@ -121,7 +157,7 @@ include("head.inc");
<tbody>
<tr>
<td>
<select id="if" name="if" onchange="document.form1.submit()">
<select id="if" name="if">
<?php
foreach ($ifdescrs as $ifn => $ifd):?>
<option value="<?=$ifn;?>" <?=$ifn == $pconfig['if'] ? " selected=\"selected\"" : "";?>>
@ -132,7 +168,7 @@ include("head.inc");
</select>
</td>
<td>
<select id="sort" name="sort" onchange="document.form1.submit()">
<select id="sort" name="sort">
<option value="">
<?= gettext('Bw In') ?>
</option>
@ -142,7 +178,7 @@ include("head.inc");
</select>
</td>
<td>
<select id="filter" name="filter" onchange="document.form1.submit()">
<select id="filter" name="filter">
<option value="local" <?=$pconfig['filter'] == "local" ? " selected=\"selected\"" : "";?>>
<?= gettext('Local') ?>
</option>
@ -152,7 +188,7 @@ include("head.inc");
</select>
</td>
<td>
<select id="hostipformat" name="hostipformat" onchange="document.form1.submit()">
<select id="hostipformat" name="hostipformat">
<option value=""><?= gettext('IP Address') ?></option>
<option value="hostname" <?=$pconfig['hostipformat'] == "hostname" ? " selected" : "";?>>
<?= gettext('Host Name') ?>
@ -172,16 +208,9 @@ include("head.inc");
<section class="col-xs-12">
<div class="content-box">
<div class="col-sm-6 col-xs-12">
<div>
<br/>
<object data="graph.php?ifnum=<?=htmlspecialchars($pconfig['if']);?>&amp;ifname=<?=rawurlencode($ifdescrs[htmlspecialchars($pconfig['if'])]);?>">
<param name="id" value="graph" />
<param name="type" value="image/svg+xml" />
<param name="width" value="100%" />
<param name="height" value="100%" />
<param name="pluginspage" value="http://www.adobe.com/svg/viewer/install/auto" />
</object>
</div>
<?php
// plugin dashboard widget
include ('/usr/local/www/widgets/widgets/traffic_graphs.widget.php');?>
</div>
<div class="col-sm-6 col-xs-12">
<div class="table-responsive" >
@ -198,9 +227,6 @@ include("head.inc");
</table>
</div>
</div>
<div class="col-xs-12">
<p><?=gettext("Note:"); ?> <?=sprintf(gettext('The %sAdobe SVG Viewer%s, Firefox 1.5 or later or other browser supporting SVG is required to view the graph.'),'<a href="http://www.adobe.com/svg/viewer/install/" target="_blank">','</a>'); ?></p>
</div>
</div>
</section>
</div>