diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-06-18 21:05:08 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-06-18 21:05:08 +0000 |
| commit | b7684e1d9430b687b2ba028de4540f5fd1ae9f8e (patch) | |
| tree | e0ab8d76c4478e9dd96f9f406e3e9932fcba313e /etc | |
| parent | d6a25d972a3b474013c9fd514012d236ac8b8b49 (diff) | |
| download | pfsense-b7684e1d9430b687b2ba028de4540f5fd1ae9f8e.zip pfsense-b7684e1d9430b687b2ba028de4540f5fd1ae9f8e.tar.gz | |
Use the new way of enumerating interfaces.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/config.inc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 6ac373c..2a632d2 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1886,23 +1886,21 @@ function system_start_ftp_helpers() { mwexec("/usr/bin/killall ftpsesame"); - /* build an array of interfaces to work with */ - $iflist = array("lan" => "lan"); - for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) - $iflist['opt' . $i] = "opt{$i}"; + /* if list */ + $iflist = get_configured_interface_list(); /* loop through all interfaces and handle ftp-proxy */ $interface_counter = 0; foreach ($iflist as $ifent => $ifname) { + /* XXX: needed?! */ + if ($ifent == "wan") + continue; + /* if the ftp proxy is disabled for this interface then kill ftp-proxy * instance and continue. note that the helpers for port forwards are * launched in a different sequence so we are filtering them out * here by not including -c {$port} -g 8021 first. */ - /* only install a ftp helper for enabled interfaces. wan and lan are always enabled. */ - if(stristr($ifname, "opt") <> false) - if(!isset($config['interfaces'][strtolower($ifname)]['enable'])) - continue; /* Get the ftp queue for this interface */ if (isset($config['shaper'][$ifname]['ftpqueue'])) |
