webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

IPsec: Show connected status for waiting connections that are active

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2018-08-23 17:34:50 +01:00
parent 366b40c740
commit aec1925bea
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/124/filelists/files
View File

@@ -6,6 +6,8 @@ etc/rc.d/init.d/localnet
etc/rc.d/init.d/partresize
srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/bin/install-bootloader
usr/local/bin/backupiso
var/ipfire/backup/exclude

7
html/cgi-bin/index.cgi
View File

@@ -465,6 +465,10 @@ END
my $activecolor = $Header::colourred;
my $activestatus = $Lang::tr{'capsclosed'};
if ($vpnconfig{$key}[33] eq "add") {
$activecolor = ${Header::colourorange};
$activestatus = $Lang::tr{'vpn wait'};
}
if ($vpnconfig{$key}[0] eq 'off') {
$activecolor = $Header::colourblue;
$activestatus = $Lang::tr{'capsclosed'};
@@ -479,9 +483,6 @@ END
} elsif ($line =~ /$vpnconfig{$key}[1]\{.*ROUTED/) {
$activecolor = $Header::colourorange;
$activestatus = $Lang::tr{'vpn on-demand'};
} elsif ($vpnconfig{$key}[33] eq "add") {
$activecolor = ${Header::colourorange};
$activestatus = $Lang::tr{'vpn wait'};
}
}
}

8
html/cgi-bin/vpnmain.cgi
View File

@@ -2844,8 +2844,11 @@ END
}
print "<td align='center' $col>$confighash{$key}[25]</td>";
my $col1="bgcolor='${Header::colourred}'";
# get real state
my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
if ($confighash{$key}[33] eq "add") {
$col1="bgcolor='${Header::colourorange}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>";
}
foreach my $line (@status) {
if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) {
@@ -2857,9 +2860,6 @@ END
} elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) {
$col1="bgcolor='${Header::colourorange}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>";
} elsif ($confighash{$key}[33] eq "add") {
$col1="bgcolor='${Header::colourorange}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>";
}
}
# move to blue if really down