Merge branch 'next' into fifteen

[people/teissler/ipfire-2.x.git] / config / cfgroot / general-functions.pl

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 6709c2b8548f0fc4b6b0fbd3188e8707549014dd..48d68a2cd9acbb497f2a8f53cd298978e3bbc823 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -21,8 +21,8 @@ use Net::SSLeay;
 use Net::IPv4Addr qw(:all);
 $|=1; # line buffering
 
-$General::version = '2.11';
-$General::swroot = '/var/ipfire';
+$General::version = 'VERSION';
+$General::swroot = 'CONFIG_ROOT';
 $General::noipprefix = 'noipg-';
 $General::adminmanualurl = 'http://wiki.ipfire.org';
 
@@ -54,8 +54,8 @@ sub setup_default_networks
        $defaultNetworks->{$Lang::tr{'green'}}{'NAME'} = "GREEN";
 
        if ($netsettings{'RED_DEV'} ne ''){
-               $defaultNetworks->{$Lang::tr{'red'}}{'IPT'} = "$netsettings{'RED_NETADDRESS'}/$netsettings{'RED_NETMASK'}";
-               $defaultNetworks->{$Lang::tr{'red'}}{'NAME'} = "RED";
+               $defaultNetworks->{$Lang::tr{'fwdfw red'}}{'IPT'} = "$netsettings{'RED_NETADDRESS'}/$netsettings{'RED_NETMASK'}";
+               $defaultNetworks->{$Lang::tr{'fwdfw red'}}{'NAME'} = "RED";
        }
        if ($netsettings{'ORANGE_DEV'} ne ''){
                $defaultNetworks->{$Lang::tr{'orange'}}{'IPT'} = "$netsettings{'ORANGE_NETADDRESS'}/$netsettings{'ORANGE_NETMASK'}";
@@ -66,6 +66,9 @@ sub setup_default_networks
                $defaultNetworks->{$Lang::tr{'blue'}}{'IPT'} = "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}";
                $defaultNetworks->{$Lang::tr{'blue'}}{'NAME'} = "BLUE";
        }
+       
+       #IPFire himself
+       $defaultNetworks->{'IPFire'}{'NAME'} = "IPFire";
 
        # OpenVPN
        if(-e "${General::swroot}/ovpn/settings")
@@ -79,8 +82,8 @@ sub setup_default_networks
                        my ($ip,$sub) = split(/\//,$ovpnSettings{'DOVPN_SUBNET'});
                        $sub=&General::iporsubtocidr($sub);
                        my @tempovpnsubnet = split("\/", $ovpnSettings{'DOVPN_SUBNET'});
-                       $defaultNetworks->{'OpenVPN ' .$ip."/".$sub}{'ADR'} = $tempovpnsubnet[0];
-                       $defaultNetworks->{'OpenVPN ' .$ip."/".$sub}{'NAME'} = "OpenVPN-Dyn";
+                       $defaultNetworks->{'OpenVPN ' ."($ip/$sub)"}{'ADR'} = $tempovpnsubnet[0];
+                       $defaultNetworks->{'OpenVPN ' ."($ip/$sub)"}{'NAME'} = "OpenVPN-Dyn";
                }
        } # end OpenVPN
        # IPsec RW NET
@@ -97,22 +100,6 @@ sub setup_default_networks
                        $defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'NAME'} = "IPsec RW";
                }
        }
-       #open(FILE, "${General::swroot}/ethernet/aliases") or die 'Unable to open aliases file.';
-       #my @current = <FILE>;
-       #close(FILE);
-       #my $ctr = 0;
-       #foreach my $line (@current)
-       #{
-               #if ($line ne ''){
-                       #chomp($line);
-                       #my @temp = split(/\,/,$line);
-                       #if ($temp[2] eq '') {
-                               #$temp[2] = "Alias $ctr : $temp[0]";
-                       #}
-                       #$defaultNetworks->{$temp[2]}{'IPT'} = "$temp[0]";
-                       #$ctr++;
-               #}
-       #}
 }
 sub get_aliases
 {
@@ -1150,4 +1137,23 @@ sub write_file_utf8 ($) {
        return; 
 }
 
+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";
+       close FILE;
+}
+
+sub firewall_needs_reload() {
+       if (-e "$FIREWALL_RELOAD_INDICATOR") {
+               return 1;
+       }
+
+       return 0;
+}
+
+sub firewall_reload() {
+       system("/usr/local/bin/firewallctrl");
+}
+
 1;