general-functions.pl: Do not check IPsec subnets for VTI/GRE connections

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

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 6ddad28d0dbfec849cc66da5c789ed0f080b4170..5de4fb84bb006b6605f3be08fb92f3ba28788356 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -529,7 +529,7 @@ sub checksubnets
        if($ownnet ne 'ipsec'){
                &General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf);
                foreach my $key (keys %ipsecconf){
-                       if ($ipsecconf{$key}[11] ne ''){
+                       if ($ipsecconf{$key}[11] ne '' && $ipsecconf{$key}[36] eq ""){
                                foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) {
                                        my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
                                        $ipsecsub=&iporsubtodec($ipsecsub);
@@ -1288,6 +1288,10 @@ sub formatBytes {
 
 # Cloud Stuff
 
+sub running_in_cloud() {
+       return &running_on_ec2() || &running_on_gcp();
+}
+
 sub running_on_ec2() {
        if (-e "/var/run/aws-instance-id") {
                return 1;
@@ -1296,4 +1300,12 @@ sub running_on_ec2() {
        return 0;
 }
 
+sub running_on_gcp() {
+       if (-e "/var/run/gcp-instance-id") {
+               return 1;
+       }
+
+       return 0;
+}
+
 1;