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

Use ftpsesame instead of FTP proxy when we are not using outbound NAT.

Browse Source 
This makes routing mode and ftp play nice.

MFC: Needs more testing, works in production on releng_1
This commit is contained in:
Seth Mos 2007-02-22 12:09:44 +00:00
parent 186ed58dd0
commit a29beb23cd
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
etc/inc/filter.inc
View File

@ -748,9 +748,29 @@ function filter_nat_rules_generate() {
$interface_counter++;
continue;
}
if(stristr($ifname, "opt"))
if(!isset($config['interfaces'][$ifname]['enable']))
if(stristr($ifname, "opt")) {
if(!isset($config['interfaces'][$ifname]['enable'])) {
continue;
}
}
if(isset($config['nat']['advancedoutbound']['enable'])) {
$sourcenat = 0;
/* we are using advanced outbound nat, are we in routing mode? */
$realif = convert_friendly_interface_to_real_interface_name($ifname);
/* if the interface address lies within a outbound NAT source network we should skip */
if(! empty($config['nat']['advancedoutbound']['rule'])) {
foreach($config['nat']['advancedoutbound']['rule'] as $natnetwork) {
if(ip_in_subnet($config['interfaces'][$ifname]['ipaddr'], $natnetwork['source']['network'])) {
$sourcenat++;
}
}
}
if($sourcenat == 0) {
log_error("No source NAT rule found for interface {$ifname} - not using the FTP proxy");
$interface_counter++;
continue;
}
}
$tmp_port = 8021 + $interface_counter;
$tmp_interface = convert_friendly_interface_to_real_interface_name($ifname);
$ifname_lower = strtolower(convert_friendly_interface_to_friendly_descr($ifname));