From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephan Feddersen To: development@lists.ipfire.org Subject: [PATCH] WIO: wio.cgi - Patch Bug 12284 - IPSec Connected since information was added Date: Tue, 28 Apr 2020 17:57:42 +0200 Message-ID: <20200428155742.8252-1-sfeddersen@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6017075256255668098==" List-Id: --===============6017075256255668098== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable --- src/wio/wio.cgi | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index 1c380b1a5..3094ec30c 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -3,7 +3,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2017-2019 Stephan Feddersen = # +# Copyright (C) 2017-2020 Stephan Feddersen = # # All Rights Reserved. = # # = # # This program is free software: you can redistribute it and/or modify = # @@ -21,7 +21,7 @@ # = # ############################################################################= ### # -# Version: 2019/11/08 14:35:23 +# Version: 2020/26/04 19:35:23 # # This wio.cgi is based on the Code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. @@ -1217,7 +1217,7 @@ print" =20 foreach $key (sort SortByTunnelName (keys(%vpnconfighash))) { =20 -my $vpncheck =3D ''; +my ( $vpncheck, $vpntime, $vpnclient ) =3D ''; =20 if ( -e '/var/log/wio/.vpncache' ) { $vpncheck =3D strftime("%d.%m.%Y - %H:%M:%S",localtime(((stat('/var/log/wio= /.vpncache'))[9]))); @@ -1225,6 +1225,7 @@ if ( -e '/var/log/wio/.vpncache' ) { =20 $status =3D "bgcolor=3D'${Header::colourred}'"; $statustxt =3D "$Lang::tr{'capsclosed'}"; +$vpnclient =3D $vpnconfighash{$key}[1]; =20 if ($vpnconfighash{$key}[0] eq 'off') { $status =3D "bgcolor=3D'${Header::colourblue}'"; @@ -1232,9 +1233,11 @@ $statustxt =3D "$Lang::tr{'capsclosed'}"; } =20 foreach (@vpnstatus) { - if ($_ =3D~ /$vpnconfighash{$key}[1]\{.*INSTALLED/) { + if ($_ =3D~ /$vpnclient.*ESTABLISHED/) { $status =3D "bgcolor=3D'${Header::colourgreen}'"; $statustxt =3D "$Lang::tr{'capsopen'}"; + $vpntime =3D `/usr/local/bin/ipsecctrl I | grep $vpnclient.*ESTABLISHED |= sed 's/^[ \t]*//' | cut -d " " -f 3-4`; + $vpntime =3D &WIO::contime($vpntime, "ipsec"); last; } } @@ -1243,11 +1246,11 @@ $statustxt =3D "$Lang::tr{'capsclosed'}"; =20 my $vpnnr =3D $idvpn+1; =20 - printf (" %02d", $vpnnr); + printf ("%02d", $vpnnr); =20 print"$vpncheck - $vpnconfighash{$key}[1] - 3D'$Lang::tr{'wio_rw'}' + $vpnclient + 3D'$Lang::tr{'wio_rw'}' ".($vpnconfighash{$key}[2] eq '%auth-dn' ? "$vpncon= fighash{$key}[9]" : ($vpnconfighash{$key}[4] eq 'cert' ? "$vpnconfighash{$key= }[2]" : ($vpnconfighash{$key}[8] ne '' ? "$vpnconfighash{$key}[10]" : " = ")))." @@ -1256,7 +1259,7 @@ $statustxt =3D "$Lang::tr{'capsclosed'}";
-   + ".(defined($vpntime)? "$vpntime" : "-= ")." "; =20 @@ -1335,7 +1338,7 @@ print" $tnet->open('127.0.0.1'); @output =3D $tnet->cmd(String =3D> 'state', Prompt =3D> '/(END.*\n|ERR= OR:.*\n)/'); @tustate =3D split(/\,/, $output[1]); - $ovpntime =3D &WIO::contime(scalar localtime($tustate[0])); + $ovpntime =3D &WIO::contime(scalar localtime($tustate[0]), "ovpn"); =09 if (($tustate[1] eq 'CONNECTED')) { $status =3D "${Header::colourgreen}"; @@ -1356,7 +1359,7 @@ print" =20 if ( $match[1] ne "Common Name" && ($match[1] eq $ovpnconfighash{$key}[= 2]) ) { $ovpnclt =3D $match[1]; - $ovpntime =3D &WIO::contime($match[5]); + $ovpntime =3D &WIO::contime($match[5], "ovpn"); } =20 if ( $_ =3D~ /^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)= / ) { @@ -1381,12 +1384,12 @@ print" } =20 print" - $ovpncheck - ".( defined($ovpnrwip)? "$ovpnrwip" : " ")." + ".(defined($ovpncheck)? "$ovpncheck" : "-")." + ".(defined($ovpnrwip)? "$ovpnrwip" : "-")." 3D'$text' ".($ovpnconfighash{$key}[2] eq '%auth-dn' ? "$ovpnconf= ighash{$key}[9]" : ($ovpnconfighash{$key}[4] eq 'cert' ? "$ovpnconfighash{$ke= y}[2]": " "))."
$statustxt
- ".(defined($ovpntime)? "$ovpntime" : " ")." + ".(defined($ovpntime)? "$ovpntime" : "-")." "; if ($ovpnconfighash{$key}[25] && $wiosettings{'CLIENTREMARK'} eq 'on') { --=20 2.17.1 --===============6017075256255668098==--