mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make get_real_interface return real interface enc0 for "ipsec". Refactor enable_rrd_graphing() to

Browse Source 
use get_configured_interface_with_descr()
This commit is contained in:
Seth Mos 2010-01-11 21:44:55 +01:00
parent 981a2fbeb4
commit 4563d12f70
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/inc/interfaces.inc
View File

@ -2323,6 +2323,7 @@ function get_real_interface($interface = "wan") {
case "openvpn":
$wanif = "openvpn";
break;
case "ipsec":
case "enc0":
$wanif = "enc0";
break;

24
etc/inc/rrd.inc
View File

@ -249,33 +249,15 @@ function enable_rrd_graphing() {
$rrdupdatesh .= "";
$i = 0;
$vfaces = array (
"vlan.?*",
"enc.?*"
);
$ifdescrs = get_interface_list(true, true, $vfaces);
$ifdescrs['enc0']['friendly'] = "ipsec";
$ifdescrs['enc0']['descr'] = "IPsec";
$ifdescrs['enc0']['up'] = true;
$ifdescrs = get_configured_interface_with_descr();
$ifdescrs['ipsec'] = "IPsec";
foreach ($ifdescrs as $realif => $ifdescr) {
$ifname = $ifdescr['friendly'];
$state = $ifdescr['up'];
foreach ($ifdescrs as $ifname => $ifdescr) {
$temp = get_real_interface($ifname);
if($temp <> "") {
$realif = $temp;
}
/* skip interfaces that do not have a friendly name */
if ("$ifname" == "") {
continue;
}
/* or are down */
if (!$state) {
continue;
}
/* TRAFFIC, set up the rrd file */
if (!file_exists("$rrddbpath$ifname$traffic")) {
$rrdcreate = "$rrdtool create $rrddbpath$ifname$traffic --step $rrdtrafficinterval ";