diff options
| author | Ermal <eri@pfsense.org> | 2012-03-08 20:01:51 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-03-08 20:01:51 +0000 |
| commit | f92b0dc9e2de336b86e3fbef7dc8e1c1b471bba2 (patch) | |
| tree | 5a61c131cd795116b53476cb09b32bf48a701165 /etc | |
| parent | 44e1e4ae7091cd1274639107a2b3aa85a191c223 (diff) | |
| download | pfsense-f92b0dc9e2de336b86e3fbef7dc8e1c1b471bba2.zip pfsense-f92b0dc9e2de336b86e3fbef7dc8e1c1b471bba2.tar.gz | |
Use the latest functions from pfSense module for getting interface list
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/interfaces.inc | 2 | ||||
| -rw-r--r-- | etc/inc/util.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 72baa3a..54155de 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -62,7 +62,7 @@ function get_interface_arr($flush = false) { /* If the cache doesn't exist, build it */ if (!isset($interface_arr_cache) or $flush) - $interface_arr_cache = explode(" ", trim(`/sbin/ifconfig -l`)); + $interface_arr_cache = pfSense_interface_listget(); return $interface_arr_cache; } diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 46f8387..9dca5af 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -712,10 +712,10 @@ function get_interface_list($mode = "active", $keyby = "physical", $vfaces = "") } switch($mode) { case "active": - $upints = explode(" ", trim(shell_exec("/sbin/ifconfig -lu"))); + $upints = pfSense_interface_listget(IFF_UP); break; case "media": - $intlist = explode(" ", trim(shell_exec("/sbin/ifconfig -l"))); + $intlist = pfSense_interface_listget(); $ifconfig = ""; exec("/sbin/ifconfig -a", $ifconfig); $regexp = '/(' . implode('|', $intlist) . '):\s/'; @@ -726,7 +726,7 @@ function get_interface_list($mode = "active", $keyby = "physical", $vfaces = "") } break; default: - $upints = explode(" ", trim(shell_exec("/sbin/ifconfig -l"))); + $upints = pfSense_interface_listget(); break; } /* build interface list with netstat */ |
