diff options
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 7857985..95d2a84 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1745,7 +1745,7 @@ function system_start_ftp_helpers() { * keep processing interfaces. kill pftpx if already * running for this instance. */ - $helpers = exec("/bin/ps awux | grep \"/usr/local/sbin/pftpx {$shaper_queue} -c {$port}\" | grep -v grep | sed \"s/ */ /g\" | cut -f2 -d\" \""); + $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}"); $interface_counter++; @@ -1764,7 +1764,7 @@ function system_start_ftp_helpers() { if(ip_in_subnet($ip, $natnetwork['source']['network'])) { /* if the interface address is matched in the AON Rule we need the ftp proxy */ if(is_ipaddr($natnetwork['target']) && ($natnetwork['interface'] == "wan")) { - $pftpxsourceaddr = "-p {$natnetwork['target']}"; + $pftpxsourceaddr = "-a {$natnetwork['target']}"; if($g['debug']) log_error("Config: AON: using the external ip source {$pftpxsourceaddr} for the ftp proxy"); } @@ -1783,10 +1783,10 @@ function system_start_ftp_helpers() { log_error("Config: AON rule matched for interface {$ifname} - using FTP proxy"); } } - /* if pftpx is already running then do not launch it again */ - $helpers = exec("/bin/ps awux | grep \"/usr/local/sbin/pftpx {$shaper_queue} -c {$port}\" | grep -v grep | sed \"s/ */ /g\""); + /* if ftp-proxy is already running then do not launch it again */ + $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/pftpx {$shaper_queue} -c {$port} -g 8021 {$pftpxsourceaddr} {$ip}"); + mwexec("/usr/local/sbin/ftp-proxy {$shaper_queue} -p {$port} -P 8021 {$pftpxsourceaddr} {$ip}"); if(!$ip) mwexec("/usr/local/sbin/ftpsesame {$shaper_queue} -i $int"); $interface_counter++; |
