Skip to content

O
OpnSense
Commit b991dd8a authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

(legacy) refactor status_graph.php, consolidate ifstats.php and... 

(legacy) refactor status_graph.php, consolidate ifstats.php and bandwidth_by_ip.php into legacy_traffic_stats.php, leave graph.php as it is for now (although replacing should be a good idea)
parent 2fa4255b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 277 additions and 388 deletions
src/www/graph.php
View file @ b991dd8a
......@@ -81,7 +81,7 @@ $error_text = sprintf(gettext('Cannot get data about interface %s'), htmlspecial
$height=100; //SVG internal height : do not modify
$width=200; //SVG internal width : do not modify
$fetch_link = "ifstats.php?if=" . htmlspecialchars($ifnum);
$fetch_link = "legacy_traffic_stats.php?if=" . htmlspecialchars($ifnum);
/********* Graph DATA **************/
print('<?xml version="1.0" ?>' . "\n");?>
......
src/www/ifstats.php deleted 100644 → 0
View file @ 2fa4255b
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
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");
$if = $_GET['if'];
$realif = get_real_interface($if);
if (!$realif) {
$realif = $if; // Need for IPSec case interface.
}
$ifinfo = legacy_interface_stats($realif);
$temp = gettimeofday();
$timing = (double)$temp["sec"] + (double)$temp["usec"] / 1000000.0;
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
echo "$timing|" . $ifinfo['bytes received'] . "|" . $ifinfo['bytes transmitted'] . "\n";
src/www/bandwidth_by_ip.php → src/www/legacy_traffic_stats.php
View file @ b991dd8a
<?php
/*
Copyright © 2014 Deciso B.V.
Copyright © 2004 - 2014 by Electric Sheep Fencing LLC
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
......@@ -26,118 +27,68 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*
*/
$omit_nocacheheaders = true;
require_once('guiconfig.inc');
require_once('interfaces.inc');
require_once('pfsense-utils.inc');
$listedIPs = "";
//get interface IP and break up into an array
$interface = $_GET['if'];
$real_interface = get_real_interface($interface);
$real_interface = get_real_interface($_GET['if']);
if (!does_interface_exist($real_interface)) {
echo gettext("Wrong Interface");
return;
}
$intip = find_interface_ip($real_interface);
//get interface subnet
$netmask = find_interface_subnet($real_interface);
$intsubnet = gen_subnet($intip, $netmask) . "/$netmask";
// see if they want local, remote or all IPs returned
$filter = $_GET['filter'];
if ($filter == "")
$filter = "local";
if ($filter == "local") {
$ratesubnet = "-c " . $intsubnet;
} else {
// Tell the rate utility to consider the whole internet (0.0.0.0/0)
// and to consider local "l" traffic - i.e. traffic within the whole internet
// then we can filter the resulting output as we wish below.
$ratesubnet = "-lc 0.0.0.0/0";
}
//get the sort method
$sort = $_GET['sort'];
if ($sort == "out")
{$sort_method = "-T";}
else
{$sort_method = "-R";}
// get the desired format for displaying the host name or IP
$hostipformat = $_GET['hostipformat'];
$iplookup = array();
// If hostname display is requested and the DNS forwarder does not already have DHCP static names registered,
// then load the DHCP static mappings into an array keyed by IP address.
if (($hostipformat != "") && ((!isset($config['dnsmasq']['enable']) || !isset($config['dnsmasq']['regdhcpstatic']))
|| (!isset($config['unbound']['enable']) || !isset($config['unbound']['regdhcpstatic'])))) {
if (is_array($config['dhcpd'])) {
foreach ($config['dhcpd'] as $ifdata) {
if (is_array($ifdata['staticmap'])) {
foreach ($ifdata['staticmap'] as $hostent) {
if (($hostent['ipaddr'] != "") && ($hostent['hostname'] != "")) {
$iplookup[$hostent['ipaddr']] = $hostent['hostname'];
}
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;
}
}
}
}
}
$_grb = exec("/usr/local/bin/rate -i {$real_interface} -nlq 1 -Aba 20 {$sort_method} {$ratesubnet} | tr \"|\" \" \" | awk '{ printf \"%s:%s:%s:%s:%s\\n\", $1, $2, $4, $6, $8 }'", $listedIPs);
$someinfo = false;
for ($x=2; $x<12; $x++){
$bandwidthinfo = $listedIPs[$x];
// echo $bandwidthinfo;
$emptyinfocounter = 1;
if ($bandwidthinfo != "") {
$infoarray = explode (":",$bandwidthinfo);
if (($filter == "all") ||
(($filter == "local") && (ip_in_subnet($infoarray[0], $intsubnet))) ||
(($filter == "remote") && (!ip_in_subnet($infoarray[0], $intsubnet)))) {
if ($hostipformat == "") {
$addrdata = $infoarray[0];
} else {
// $hostipformat is "hostname" or "fqdn"
$addrdata = gethostbyaddr($infoarray[0]);
if ($addrdata == $infoarray[0]) {
// gethostbyaddr() gave us back the IP address, so try the static mapping array
if ($iplookup[$infoarray[0]] != "")
$addrdata = $iplookup[$infoarray[0]];
if (!empty($_GET['sort']) && $_GET['sort'] == "out") {
$cmd_args .= " -T ";
} else {
if ($hostipformat == "hostname") {
// Only pass back the first part of the name, not the FQDN.
$name_array = explode(".", $addrdata);
$addrdata = $name_array[0];
}
}
$cmd_args .= " -R ";
}
//print host information;
echo $addrdata . ";" . $infoarray[1] . ";" . $infoarray[2] . "|";
//mark that we collected information
$someinfo = true;
$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(".", $fields)[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";
}
unset($bandwidthinfo, $_grb);
unset($listedIPs);
//no bandwidth usage found
if ($someinfo == false)
echo gettext("no info");
?>
exit;
src/www/status_graph.php
View file @ b991dd8a
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023