diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2006-12-25 22:58:29 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2006-12-25 22:58:29 +0000 |
| commit | 809bd54dc1e2c335071981032bed072c15ab2ebf (patch) | |
| tree | 128140ec01a4f56f26a2d848cf7288183dc58784 /packages/squid | |
| parent | dac04f4e778373b420dbb5c320ff66885718dddb (diff) | |
| download | pfsense-packages-809bd54dc1e2c335071981032bed072c15ab2ebf.tar.gz pfsense-packages-809bd54dc1e2c335071981032bed072c15ab2ebf.tar.bz2 pfsense-packages-809bd54dc1e2c335071981032bed072c15ab2ebf.zip | |
Accept transparent proxy connections _and_ normal connections on the configured port.
Diffstat (limited to 'packages/squid')
| -rw-r--r-- | packages/squid/squid.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc index dffcf15d..df0798d2 100644 --- a/packages/squid/squid.inc +++ b/packages/squid/squid.inc @@ -379,9 +379,8 @@ function squid_resync_general() { if($real_ifaces[$i][0]) { if (($settings['transparent_proxy'] == 'on')) { $conf .= "http_port 127.0.0.1:80 transparent\n"; - } else { - $conf .= "http_port {$real_ifaces[$i][0]}:$port\n"; - } + } + $conf .= "http_port {$real_ifaces[$i][0]}:$port\n"; } } @@ -905,14 +904,15 @@ function squid_generate_rules($type) { switch($type) { case 'nat': foreach ($ifaces as $iface) - $rules .= "# Setup Squid transparent proxy redirect\n"; + $rules .= "# Setup Squid proxy redirect\n"; $rules .= "rdr on $iface proto tcp from any to !($iface) port 80 -> 127.0.0.1 port 80\n"; $rules .= "\n"; break; case 'filter': foreach ($ifaces as $iface) - $rules .= "# Setup squid pass rules for transparent proxy\n"; + $rules .= "# Setup squid pass rules for proxy\n"; $rules .= "pass in quick on $iface proto tcp from any to !($iface) port 80 flags S/SA keep state\n"; + $rules .= "pass in quick on $iface proto tcp from any to !($iface) port $port flags S/SA keep state\n"; $rules .= "\n"; break; default: |