]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
ipsec: change check if a ikev2 tunnel is up.
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 26 Jun 2011 21:16:41 +0000 (23:16 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 26 Jun 2011 21:16:41 +0000 (23:16 +0200)
html/cgi-bin/index.cgi
html/cgi-bin/vpnmain.cgi

index 32ae7ff388531c638e8306faa84e1cd8b23ed2e8..eec3f9bf361f6a1d463c4e616e16e504c05b3f0a 100644 (file)
@@ -370,7 +370,7 @@ END
                        } else {
                            foreach my $line (@status) {
                                if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
                        } else {
                            foreach my $line (@status) {
                                if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
-                                   ($line =~/ $confighash{$key}[1]\[.*ESTABLISHED/ ))
+                                   ($line =~/ $confighash{$key}[1]\{.*INSTALLED/ ))
                                    {
                                    $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
                                }
                                    {
                                    $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
                                }
index 3d5a360f132330f3a84981a021295db95e88418f..3785b90a5d6954003584c6f2dcff8171d356dac4 100644 (file)
@@ -2540,7 +2540,7 @@ END
        my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
        foreach my $line (@status) {
            if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
        my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
        foreach my $line (@status) {
            if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
-              ($line =~ / $confighash{$key}[1]\[.*ESTABLISHED/))
+              ($line =~ / $confighash{$key}[1]\{.*INSTALLED/))
            {
                $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
            }
            {
                $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
            }