Switch over to ftp-proxy from pftpx.

2 files changed, 8 insertions, 8 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++;
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 36b3211..83dda01 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -44,8 +44,8 @@ if($config['system']['shapertype'] <> "m0n0")
 
 /* holds the items that will be executed *AFTER* the filter is fully loaded */
 $after_filter_configure_run = array();
-/*  hold the ports being used by pftpx to install the behind the scenes rule that 
- *  forces traffic out the primary wan until multi-wan pftpx is all the rage.
+/*  hold the ports being used by ftp-prxy to install the behind the scenes rule that 
+ *  forces traffic out the primary wan until multi-wan ftp-proxy is all the rage.
  */
 $used_pftpx_ports = array();
 
@@ -1120,7 +1120,7 @@ function filter_nat_rules_generate() {
 						} else {
 							$shaper_queue = "";
 						}
-						$after_filter_configure_run[] = "/usr/local/sbin/pftpx {$shaper_queue}-f {$target} -b {$external_address} -c 21 -g 21";
+						$after_filter_configure_run[] = "/usr/local/sbin/ftp-proxy {$shaper_queue}-R {$target} -b {$external_address} -p 21 -P 21";
 					}
 					$dontinstallrdr = true;
 				}