aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorSergey Dvoriancev <dv_serg@mail.ru>2012-05-18 11:43:02 -0700
committerSergey Dvoriancev <dv_serg@mail.ru>2012-05-18 11:43:02 -0700
commit354c61c9d7474eb72a257c796080785e733bf24f (patch)
treee7d61ae83f436949fe5f1ed58a756a8388f0eb4e /config
parent963eed748e53f856d7c44d1da9e2083fd80862be (diff)
parentfdfb5c704a43b39ed0844ee0475c5c4c24328f0f (diff)
downloadpfsense-packages-354c61c9d7474eb72a257c796080785e733bf24f.tar.gz
pfsense-packages-354c61c9d7474eb72a257c796080785e733bf24f.tar.bz2
pfsense-packages-354c61c9d7474eb72a257c796080785e733bf24f.zip
Merge pull request #249 from dvserg/master
SQStat transparent fix
Diffstat (limited to 'config')
-rw-r--r--config/lightsquid/sqstat.php20
1 files changed, 7 insertions, 13 deletions
diff --git a/config/lightsquid/sqstat.php b/config/lightsquid/sqstat.php
index b61da811..a56b604a 100644
--- a/config/lightsquid/sqstat.php
+++ b/config/lightsquid/sqstat.php
@@ -377,20 +377,14 @@ function sqstat_loadconfig()
$squid_settings = $config['installedpackages']['squid']['config'][0];
if (!empty($squid_settings)) {
# squid interface IP & port
- if ($squid_settings['transparent_proxy'] == 'on') {
- $iface = '127.0.0.1';
- $iport = 80;
- }
- else {
- $realif = array();
- $iface = ($squid_settings['active_interface'] ? $squid_settings['active_interface'] : 'lan');
- $iface = explode(",", $iface);
- foreach ($iface as $i => $if) {
- $realif[] = sqstat_get_real_interface_address($if);
- $iface = $realif[$i][0] ? $realif[$i][0] : '127.0.0.1';
- }
- $iport = $squid_settings['proxy_port'] ? $squid_settings['proxy_port'] : 3128;
+ $realif = array();
+ $iface = ($squid_settings['active_interface'] ? $squid_settings['active_interface'] : 'lan');
+ $iface = explode(",", $iface);
+ foreach ($iface as $i => $if) {
+ $realif[] = sqstat_get_real_interface_address($if);
+ $iface = $realif[$i][0] ? $realif[$i][0] : '127.0.0.1';
}
+ $iport = $squid_settings['proxy_port'] ? $squid_settings['proxy_port'] : 3128;
}
$squidclass->squidhost = $iface;
$squidclass->squidport = $iport;