Please see now our new Bugtracker system: JIRA

Modified: sources/branches/efw2.2/firewall/efw-proxy/src/html/proxy.pac
==============================================================================
--- sources/branches/efw2.2/firewall/efw-proxy/src/html/proxy.pac	(original)
+++ sources/branches/efw2.2/firewall/efw-proxy/src/html/proxy.pac	Thu Nov 20 12:43:09 2008
@@ -38,7 +38,7 @@
 my $swroot = "/var/efw/";
 
 my $proxydir = $swroot."proxy/";
-my $PROXY_ENABLED  = $swroot."proxy/enable_";
+my $PROXY_DEFAULT_SETTINGS = $swroot."proxy/default/settings";
 my $PROXY_SETTINGS = $swroot."proxy/settings";
 my $ETHER_SETTINGS = $swroot."ethernet/settings";
 my %net_conf;
 @@ -58,48 +58,6 @@
 ;
 }
 
-sub printpac($$$) {
-    my $ip = shift;
-    my $port = shift;
-    my $zone_nets = shift;
-
-    print <<END
-function FindProxyForURL(url, host)
-{
-        if (isPlainHostName(host) ||
-                shExpMatch( url, "*$ip*" ) )
-                return "DIRECT";
-        else if (host == "127.0.0.1")
-                return "DIRECT";
-END
-;
-
-	foreach my $net (split(/,/, $zone_nets)) {
-	    my ($netaddr, $netmask) = ipv4_network($net);
-	    $netmask = ipv4_cidr2msk($netmask);
-	    print <<END
-        else if (isInNet(host, "$netaddr", "$netmask"))
-                return "DIRECT";
-END
-;
-        }
-
-    print <<END
-
-        else
-END
-;
-    if ($ip eq '' || $port eq '') {
-	print '                return "DIRECT";';
-    } else {
-        print <<END
-            return "PROXY $ip:$port; DIRECT;";
-END
-;
-    }
-    print "\n}";
-}
-
 sub readhash($$) {
 my $filename = shift;
 my $hash = shift;
 @@ -124,6 +82,9 @@
 close FILE;
 }
 
+readhash($PROXY_DEFAULT_SETTINGS, \%conf);
+readhash($PROXY_SETTINGS, \%conf);
+readhash($ETHER_SETTINGS, \%net_conf);
 
 sub get_zone($) {
 my $ip = shift;
 @@ -146,9 +107,7 @@
 
 sub get_port($) {
 my $zone = shift;
-    my %conf;
 $zone = uc($zone);
-    readhash($PROXY_SETTINGS, \%conf);
 if ($conf{"PROXY_$zone"} =~ /^enabled|auth|transparent$/) {
 return $conf{'PROXY_PORT'};
 }
 @@ -203,7 +162,47 @@
 return get_zone($gw); 
 }
 
-readhash($ETHER_SETTINGS, \%net_conf);
+sub printpac($$$) {
+    my $ip = shift;
+    my $port = shift;
+    my $zone_nets = shift;
+
+    print <<END
+function FindProxyForURL(url, host)
+{
+        if (isPlainHostName(host) ||
+                shExpMatch( url, "*$ip*" ) )
+                return "DIRECT";
+        else if (host == "127.0.0.1")
+                return "DIRECT";
+END
+;
+
+	foreach my $net (split(/,/, $zone_nets)) {
+	    my ($netaddr, $netmask) = ipv4_network($net);
+	    $netmask = ipv4_cidr2msk($netmask);
+	    print <<END
+        else if (isInNet(host, "$netaddr", "$netmask"))
+                return "DIRECT";
+END
+;
+        }
+
+    print <<END
+
+        else
+END
+;
+    if ($ip eq '' || $port eq '') {
+	print '                return "DIRECT";';
+    } else {
+        print <<END
+            return "PROXY $ip:$port; DIRECT;";
+END
+;
+    }
+    print "\n}";
+}
 
 my $zone = calculate_zone($ENV{'REMOTE_ADDR'});
 showhttpheaders();