From 56e1d16eba68ed0809cc9e026c120e9daabe56c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=E7i?= Date: Sat, 28 Feb 2009 19:30:27 +0000 Subject: [PATCH] Correctly show actions such as Connect/Disconnect on Status Interfaces page. --- etc/inc/pfsense-utils.inc | 8 +++++--- usr/local/www/status_interfaces.php | 5 ++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 900e6541f9..a5dbd4a4cd 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -3002,12 +3002,14 @@ function get_interface_info($ifdescr) { unset($linkinfo); exec("/usr/bin/netstat -I " . $ifinfo['if'] . " -nWb -f link", $linkinfo); + $linkinfo = preg_split("/\s+/", $linkinfo[1]); - if (preg_match("/\*$/", $linkinfo[0])) { + if (preg_match("/{$ifinfo['if']}\*/", $linkinfo[0])) { $ifinfo['status'] = "down"; - } else { + } else if (preg_match("/{$ifinfo['if']}/", $linkinfo[0])) { $ifinfo['status'] = "up"; - } + } else + $ifinfo['status'] = "down"; if (preg_match("/^enc|^tun|^ppp|^pptp|^ovpn/i", $ifinfo['if'])) { $ifinfo['inpkts'] = $linkinfo[3]; diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php index 29d0e3ad76..cb749d3ce4 100755 --- a/usr/local/www/status_interfaces.php +++ b/usr/local/www/status_interfaces.php @@ -48,10 +48,9 @@ if ($_GET['if']) { interface_bring_down($interface); } else if ($_GET['action'] == "Connect" || $_GET['action'] == "Renew") { interface_configure($interface); - } else { - header("Location: status_interfaces.php"); - exit; } + header("Location: status_interfaces.php"); + exit; } $pgtitle = array("Status","Interfaces");