mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the AON FTP logic a bit more verbose.

Browse Source 
Add comments.
This commit is contained in:
Seth Mos 2007-03-06 10:12:53 +00:00
parent 68f346509f
commit 9ba08fba64
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etc/inc/config.inc
View File

@ -1567,15 +1567,18 @@ function system_start_ftp_helpers() {
if(! empty($config['nat']['advancedoutbound']['rule'])) {
foreach($config['nat']['advancedoutbound']['rule'] as $natnetwork) {
if(ip_in_subnet($ip, $natnetwork['source']['network'])) {
/* if the interface address is matched in the AON Rule we need the ftp proxy */
$sourcenat++;
}
}
}
if($sourcenat == 0) {
log_error("No source NAT rule found for interface {$ifname} - installing ftpsesame");
log_error("Config: No AON rule matched for interface {$ifname} - not using FTP proxy");
mwexec("/usr/local/sbin/ftpsesame -i $int");
$interface_counter++;
continue;
} else {
log_error("Config: AON rule matched for interface {$ifname} - using FTP proxy");
}
}
/* if pftpx is already running then do not launch it again */
@ -1740,4 +1743,4 @@ function set_device_perms() {
if($g['booting']) echo ".";
$config = parse_config();
?>
?>

7
etc/inc/filter.inc
View File

@ -746,7 +746,7 @@ function filter_nat_rules_generate() {
$realif = convert_friendly_interface_to_real_interface_name(strtolower($ifname));
$int_ip = find_interface_ip($realif);
if(isset($config['interfaces'][strtolower($ifname)]['disableftpproxy'])) {
log_error("FTP proxy disabled for interface {$ifname} - ignoring.");
log_error("Filter: FTP proxy disabled for interface {$ifname} - ignoring.");
$interface_counter++;
continue;
}
@ -765,14 +765,17 @@ function filter_nat_rules_generate() {
if(! empty($config['nat']['advancedoutbound']['rule'])) {
foreach($config['nat']['advancedoutbound']['rule'] as $natnetwork) {
if(ip_in_subnet($int_ip, $natnetwork['source']['network'])) {
/* if the interface address is matched in the AON Rule we need the ftp proxy */
$sourcenat++;
}
}
}
if($sourcenat == 0) {
log_error("No source NAT rule found for interface {$ifname} - not using the FTP proxy");
log_error("Filter: No AON rule matched for interface {$ifname} - not using the FTP proxy");
$interface_counter++;
continue;
} else {
log_error("Filter: AON Rule matched for interface {$ifname} - using FTP proxy");
}
}
$tmp_port = 8021 + $interface_counter;