wio.cgi: Change status extraction due to OpenVPN-2.7 change
Commit Message
- With OpenVPN-2.7 the format of the RW status log changed. This was updated in
the ovpnmain.cgi file but was missed for the wio.cgi file
- This patch corrects that.
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
html/cgi-bin/wio.cgi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
mode change 100644 => 100755 html/cgi-bin/wio.cgi
old mode 100644
new mode 100755
@@ -1364,8 +1364,8 @@ foreach $key (keys %ovpnconfighash) {
}
else {
foreach (@ovpnstatus) {
- if ( $_ =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/ ) {
- @match = split (m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $_);
+ if ( $_ =~ /^(.+),(.+\:\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/ ) {
+ @match = split (m/^(.+),(.+\:\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $_);
$match[1] =~ s/[_]/ /g;
}
@@ -1374,8 +1374,8 @@ foreach $key (keys %ovpnconfighash) {
$ovpntime = &WIO::contime($match[5], "ovpn");
}
- if ( $_ =~ /^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/ ) {
- @match = split(m/^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/, $_);
+ if ( $_ =~ /^(\d+\.\d+\.\d+\.\d+),(.+),('+\:\d+\.\d+\.\d+\.\d+\:\d+),(.+)/ ) {
+ @match = split(m/^(\d+\.\d+\.\d+\.\d+),(.+),(.+\:\d+\.\d+\.\d+\.\d+\:\d+),(.+)/, $_);
}
if ( $match[1] ne "Virtual Address" && $match[2] eq $ovpnclt ) {