summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@xs4all.nl>2008-09-10 19:16:07 +0000
committerSeth Mos <seth.mos@xs4all.nl>2008-09-10 19:16:07 +0000
commit75a56c02d6a14403fb68cb1878216949720c5a2e (patch)
tree77bbb7f8cdbfe5dc8d0078f5d27c18a0f9e1f2c1
parentc8664b2abb5fc2cceb2d24a66b924e25f47d14ad (diff)
downloadpfsense-75a56c02d6a14403fb68cb1878216949720c5a2e.zip
pfsense-75a56c02d6a14403fb68cb1878216949720c5a2e.tar.gz
Increment interface counter for wan too.
-rw-r--r--etc/inc/config.inc12
1 files changed, 9 insertions, 3 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 58c138b..f214996 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -2598,10 +2598,11 @@ function system_start_ftp_helpers() {
/* loop through all interfaces and handle ftp-proxy */
$interface_counter = 0;
foreach ($iflist as $ifent => $ifname) {
- /* XXX: needed?! */
- if ($ifent == "wan")
- continue;
+ if(interface_has_gateway($ifname) {
+ $interface_counter++;
+ 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
@@ -2618,6 +2619,9 @@ function system_start_ftp_helpers() {
* keep processing interfaces. kill ftp-proxy if already
* running for this instance.
*/
+ if($g['debug'])
+ log_error("Config: FTP proxy disabled for interface {$ifent}");
+
$helpers = exec("/bin/ps awux | grep \"/usr/local/sbin/ftp-proxy {$shaper_queue} -p {$port}\" | grep -v grep | sed \"s/ */ /g\" | cut -f2 -d\" \"");
if($helpers)
mwexec("/bin/kill {$helpers}");
@@ -2657,6 +2661,8 @@ function system_start_ftp_helpers() {
}
}
/* if ftp-proxy is already running then do not launch it again */
+ if($g['debug'])
+ log_error("Config: FTP proxy port ($port) enabled for interface {$ifname}");
$helpers = exec("/bin/ps awux | grep \"/usr/local/sbin/ftp-proxy {$shaper_queue} -p {$port}\" | grep -v grep | sed \"s/ */ /g\"");
if(!$helpers && $ip)
mwexec("/usr/local/sbin/ftp-proxy {$shaper_queue} -p {$port} {$pftpxsourceaddr} {$ip}");
OpenPOWER on IntegriCloud