diff options
| author | Ermal <eri@pfsense.org> | 2012-03-08 20:01:51 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-03-08 20:02:18 +0000 |
| commit | d9adca3bcbaad9d96344e8968bffb9c22ac207df (patch) | |
| tree | a45b86dea67bbba304ff5628024049450e4a381b | |
| parent | f37ab0b1b8d488a016ae4587c71508beddc8bba1 (diff) | |
| download | pfsense-d9adca3bcbaad9d96344e8968bffb9c22ac207df.zip pfsense-d9adca3bcbaad9d96344e8968bffb9c22ac207df.tar.gz | |
Use the latest functions from pfSense module for getting interface list
| -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 44fb0a4..b328986 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -63,7 +63,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 7dfdf8d..dcc6e44 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -820,10 +820,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/'; @@ -834,7 +834,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 */ |
