diff options
| author | Ermal <eri@pfsense.org> | 2013-03-18 10:41:21 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-03-18 10:41:21 +0000 |
| commit | 1d66a364aa7d1cb7df171866e28a0a68624285c1 (patch) | |
| tree | c8d93a099c73c6cd3ad373092cf292c52d2a70c6 /etc/inc/interfaces.inc | |
| parent | 9072d260ddeee1d9bf8f62bb92290850c961df26 (diff) | |
| download | pfsense-1d66a364aa7d1cb7df171866e28a0a68624285c1.zip pfsense-1d66a364aa7d1cb7df171866e28a0a68624285c1.tar.gz | |
Handle _stf interface in convertion from real to friendly. Also do no cal lpfSense_module function if not used
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 2748626..9f3d42a 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -3708,6 +3708,9 @@ function convert_real_interface_to_friendly_interface_name($interface = "wan") { $ifdescrs = &$config['interfaces']; //$ifdescrs = get_configured_interface_list(false, true); + if (strstr($interface, "_stf")) + $interface = str_replace("_stf", "", $interface); + foreach ($ifdescrs as $if => $ifname) { if ($if == $interface || $config['interfaces'][$if]['if'] == $interface) return $if; @@ -3723,6 +3726,7 @@ function convert_real_interface_to_friendly_interface_name($interface = "wan") { return $ifname; */ } + return NULL; } @@ -4310,8 +4314,8 @@ function find_interface_ipv6($interface, $flush = false) /* Setup IP cache */ if (!isset($interface_ipv6_arr_cache[$interface]) or $flush) { - $ifinfo = pfSense_get_interface_addresses($interface); // FIXME: Add IPv6 support to the pfSense module + $ifinfo = array(); exec("/sbin/ifconfig {$interface} inet6", $output); foreach($output as $line) { if(preg_match("/inet6/", $line)) { |
