X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fcfgroot%2Fgeneral-functions.pl;h=9d9ee5d900cd9f6833caa87c501405f6b53f7427;hp=8236f07ab0dd1d25a6fc7443c5c1c8d6aaade688;hb=6ee9053548341eceba9e0126a8e903872384a961;hpb=0e43079789de38841b822b591dbff3be8cd37228

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 8236f07ab..9d9ee5d90 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -51,19 +51,23 @@ sub setup_default_networks
 	$defaultNetworks->{$Lang::tr{'fwhost any'}}{'NAME'} = "ALL";
 		
 	$defaultNetworks->{$Lang::tr{'green'}}{'IPT'} = "$netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'}";
+	$defaultNetworks->{$Lang::tr{'green'}}{'NET'} = "$netsettings{'GREEN_ADDRESS'}";
 	$defaultNetworks->{$Lang::tr{'green'}}{'NAME'} = "GREEN";
 
 	if ($netsettings{'RED_DEV'} ne ''){
 		$defaultNetworks->{$Lang::tr{'fwdfw red'}}{'IPT'} = "$netsettings{'RED_NETADDRESS'}/$netsettings{'RED_NETMASK'}";
+		$defaultNetworks->{$Lang::tr{'fwdfw red'}}{'NET'} = "$netsettings{'RED_ADDRESS'}";
 		$defaultNetworks->{$Lang::tr{'fwdfw red'}}{'NAME'} = "RED";
 	}
 	if ($netsettings{'ORANGE_DEV'} ne ''){
 		$defaultNetworks->{$Lang::tr{'orange'}}{'IPT'} = "$netsettings{'ORANGE_NETADDRESS'}/$netsettings{'ORANGE_NETMASK'}";
+		$defaultNetworks->{$Lang::tr{'orange'}}{'NET'} = "$netsettings{'ORANGE_ADDRESS'}";
 		$defaultNetworks->{$Lang::tr{'orange'}}{'NAME'} = "ORANGE";
 	}
 
 	if ($netsettings{'BLUE_DEV'} ne ''){
 		$defaultNetworks->{$Lang::tr{'blue'}}{'IPT'} = "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}";
+		$defaultNetworks->{$Lang::tr{'blue'}}{'NET'} = "$netsettings{'BLUE_ADDRESS'}";
 		$defaultNetworks->{$Lang::tr{'blue'}}{'NAME'} = "BLUE";
 	}
 	
@@ -96,8 +100,9 @@ sub setup_default_networks
 			my ($ip,$sub) = split(/\//,$ipsecsettings{'RW_NET'});
 			$sub=&General::iporsubtocidr($sub);
 			my @tempipsecsubnet = split("\/", $ipsecsettings{'RW_NET'});
-			$defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'ADR'} = $tempipsecsubnet[0];
-			$defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'NAME'} = "IPsec RW";
+			$defaultNetworks->{'IPsec RW (' .$ip."/".$sub.")"}{'ADR'} = $tempipsecsubnet[0];
+			$defaultNetworks->{'IPsec RW (' .$ip."/".$sub.")"}{'NAME'} = "IPsec RW";
+			$defaultNetworks->{'IPsec RW (' .$ip."/".$sub.")"}{'NET'} = &getnextip($ip);
 		}
 	}
 }
@@ -118,6 +123,7 @@ sub get_aliases
 				$temp[2] = "Alias $ctr : $temp[0]";
 			}
 			$defaultNetworks->{$temp[2]}{'IPT'} = "$temp[0]";
+			$defaultNetworks->{$temp[2]}{'NET'} = "$temp[0]";
 			
 			$ctr++;
 		}
@@ -1137,7 +1143,7 @@ sub write_file_utf8 ($) {
 	return; 
 }
 
-my $FIREWALL_RELOAD_INDICATOR = "${General::swroot}/forward/reread";
+my $FIREWALL_RELOAD_INDICATOR = "${General::swroot}/firewall/reread";
 
 sub firewall_config_changed() {
 	open FILE, ">$FIREWALL_RELOAD_INDICATOR" or die "Could not open $FIREWALL_RELOAD_INDICATOR";
@@ -1153,7 +1159,7 @@ sub firewall_needs_reload() {
 }
 
 sub firewall_reload() {
-	system("/usr/local/bin/forwardfwctrl");
+	system("/usr/local/bin/firewallctrl");
 }
 
 1;