diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2007-03-27 23:25:40 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2007-03-27 23:25:40 +0000 |
| commit | 5ca505e256167a6cb38e1ac54fef3c5714ad38d0 (patch) | |
| tree | b49e12a9a51097d856c4af344c418c1b07de6199 /etc/inc/config.inc | |
| parent | 9b2040c6555bf23543f38c75281e6fc604bda332 (diff) | |
| download | pfsense-5ca505e256167a6cb38e1ac54fef3c5714ad38d0.zip pfsense-5ca505e256167a6cb38e1ac54fef3c5714ad38d0.tar.gz | |
Pass along the correct queue names to ftpseasme and pftpx.
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 5590f20..fb872ca 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1581,12 +1581,22 @@ function system_start_ftp_helpers() { log_error("Config: AON rule matched for interface {$ifname} - using FTP proxy"); } } + if(isset($config['shaper']['enable'])) { + if($config['ezshaper']['step5']['p2pcatchall']) { + $shaper_queue = "-q qP2PUp "; + } else { + $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); + $shaper_queue = "-q {$downq}def "; + } + } else { + $shaper_queue = ""; + } /* if pftpx is already running then do not launch it again */ $helpers = exec("/bin/ps awux | grep \"/usr/local/sbin/pftpx -c {$port}\" | grep -v grep | sed \"s/ */ /g\""); if(!$helpers && $ip) - mwexec("/usr/local/sbin/pftpx -c {$port} -g 8021 {$ip}"); + mwexec("/usr/local/sbin/pftpx {$shaper_queue}-c {$port} -g 8021 {$ip}"); if(!$ip) - mwexec("/usr/local/sbin/ftpsesame -i $int"); + mwexec("/usr/local/sbin/ftpsesame {$shaper_queue}-i $int"); $interface_counter++; } } @@ -1594,7 +1604,7 @@ function system_start_ftp_helpers() { $num_bridges = find_number_of_created_bridges(); $num_bridges++; for($x=0; $x<$num_bridges; $x++) { - mwexec("/usr/local/sbin/ftpsesame -i bridge{$x}"); + mwexec("/usr/local/sbin/ftpsesame {$shaper_queue}-i bridge{$x}"); } } |
