diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-04-18 18:14:54 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-04-18 18:14:54 -0400 |
| commit | 4fa610928619a48ce2de1f0f18e4715f8590e333 (patch) | |
| tree | 5a366d6f3324c7f25b5c51d727dffbf50bacf789 /config/squid | |
| parent | 1198dc2d903e7eb684c3994bff9a17b4e8dbbfea (diff) | |
| download | pfsense-packages-4fa610928619a48ce2de1f0f18e4715f8590e333.tar.gz pfsense-packages-4fa610928619a48ce2de1f0f18e4715f8590e333.tar.bz2 pfsense-packages-4fa610928619a48ce2de1f0f18e4715f8590e333.zip | |
Correct checks for PPPoE and PPPTP
Diffstat (limited to 'config/squid')
| -rw-r--r-- | config/squid/squid.inc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc index ebbde873..2dd401f9 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -1244,17 +1244,13 @@ function squid_generate_rules($type) { $rules .= "rdr on $iface proto tcp from any to !($iface) port 80 -> 127.0.0.1 port 80\n"; } /* Handle PPPOE case */ - if($config['pppoe']['mode'] == "off") { + if($config['pppoe']['mode'] == "server") { $rules .= "rdr on \$pppoe proto tcp from any to !(\$pppoe) port 80 -> 127.0.0.1 port 80\n"; } /* Handle PPTP case */ -/* Disable PPTP Case until error is found -// if($config['pptpd']['mode'] != "off") { -// <mode> is not present in config.xml after disabling "redir" - if($config['pptpd']['mode'] == "server") { + if($config['pptpd']['mode'] == "server") { $rules .= "rdr on \$pptp proto tcp from any to !(\$pptp) port 80 -> 127.0.0.1 port 80\n"; } -*/ $rules .= "\n"; break; case 'filter': @@ -1264,16 +1260,12 @@ function squid_generate_rules($type) { $rules .= "pass in quick on $iface proto tcp from any to !($iface) port $port flags S/SA keep state\n"; $rules .= "\n"; }; - if($config['pppoe']['mode'] == "off") { + if($config['pppoe']['mode'] == "server") { $rules .= "pass in quick on \$pppoe proto tcp from any to !(\$pppoe) port $port flags S/SA keep state\n"; } -/* Disable PPTP Case until error is found -// if($config['pptpd']['mode'] != "off") { -// <mode> is not present in config.xml after disabling "redir" if($config['pptpd']['mode'] == "server") { $rules .= "pass in quick on \$pptp proto tcp from any to !(\$pptp) port $port flags S/SA keep state\n"; } -*/ break; default: break; @@ -1281,4 +1273,5 @@ function squid_generate_rules($type) { return $rules; } -?> + +?>
\ No newline at end of file |