From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephan Feddersen <sfeddersen@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] WIO: wio-lib.pl - Patch Bug 12284 - IPSec Connected since
 information was added
Date: Tue, 28 Apr 2020 18:04:33 +0200
Message-ID: <20200428160433.8398-1-sfeddersen@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0000519672689334504=="
List-Id: <development.lists.ipfire.org>

--===============0000519672689334504==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

---
 src/wio/wio-lib.pl | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/wio/wio-lib.pl b/src/wio/wio-lib.pl
index bbaf0bf4a..1ff7cfacc 100644
--- a/src/wio/wio-lib.pl
+++ b/src/wio/wio-lib.pl
@@ -3,7 +3,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2017-2018 Stephan Feddersen <sfeddersen(a)ipfire.org>       =
    #
+# Copyright (C) 2017-2020 Stephan Feddersen <sfeddersen(a)ipfire.org>       =
    #
 # All Rights Reserved.                                                      =
  #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
@@ -21,7 +21,7 @@
 #                                                                           =
  #
 ############################################################################=
###
 #
-# Version: 2017/07/11 21:32:23
+# Version: 2020/26/04 19:35:23
 #
 # This wio-lib.pl is based on the Code from the IPCop WIO Addon
 # and is extremly adapted to work with IPFire.
@@ -47,10 +47,8 @@ require '/var/ipfire/lang.pl';
=20
 my $mailfile =3D "${General::swroot}/dma/mail.conf";
 my %mail =3D ();
-&General::readhash($mailfile, \%mail);
=20
-my $redactive =3D "/var/ipfire/red/active";
-my $msg =3D '';
+&General::readhash($mailfile, \%mail);
=20
 ############################################################################=
################################################
=20
@@ -59,7 +57,7 @@ sub getdyndnsip {
 	my $host =3D $_[1];
 	my @fetchip =3D ();
=20
-	if ( -e $redactive ) {
+	if ( -e "/var/ipfire/red/active" ) {
 		@fetchip =3D gethostbyname($host);
=20
 		if ( defined($fetchip[0]) ) {
@@ -75,17 +73,37 @@ sub getdyndnsip {
 ############################################################################=
################################################
=20
 sub contime {
-	my $str =3D $_[0];
+	chomp(my $str =3D $_[0]);
+	chomp(my $vpn =3D $_[1]);
+
 	my %m =3D ();
 	@m{qw/Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec/} =3D (0 .. 11);
=20
-	if ( $str =3D~ /^\w{3}\ ([a-zA-Z]+)\ (\d{1,2})\ (\d{2})\:(\d{2})\:(\d{2}) (=
\d{4})$/ ||
-		 $str =3D~ /^\w{3}\ ([a-zA-Z]+)\  (\d{1})\ (\d{2})\:(\d{2})\:(\d{2}) (\d{4=
})$/ )=20
-	{
-		my $past =3D timelocal($5, $4, $3, $2, $m{$1}, $6);
-		my $now  =3D time;
+	my $totalsecs =3D '';
+
+	if ( $vpn eq 'ipsec' ) {
+		my @temp =3D split (/ /, $str);
+
+		if ( $temp[1] eq 'seconds' ) {
+			$totalsecs =3D $temp[0];
+		}
+
+		if ( $temp[1] eq 'minutes' ) {
+			$totalsecs =3D $temp[0] * 60;
+		}
+	}
=20
-		my $totalsecs =3D $now - $past;
+	if ( $vpn eq 'ovpn' ) {
+		if ( $str =3D~ /^\w{3}\ ([a-zA-Z]+)\ (\d{1,2})\ (\d{2})\:(\d{2})\:(\d{2}) =
(\d{4})$/ ||
+			 $str =3D~ /^\w{3}\ ([a-zA-Z]+)\  (\d{1})\ (\d{2})\:(\d{2})\:(\d{2}) (\d{=
4})$/ )
+		{
+			my $past =3D timelocal($5, $4, $3, $2, $m{$1}, $6);
+			my $now  =3D time;
+			$totalsecs =3D $now - $past;
+		}
+	}
+
+	if ( $totalsecs ne '' )  {
 		my $days =3D int($totalsecs / 86400);
 		my $totalhours =3D int($totalsecs / 3600);
 		my $hours =3D $totalhours % 24;
@@ -126,6 +144,8 @@ sub statustime {
 ############################################################################=
################################################
=20
 sub mailsender {
+	my $msg =3D '';
+
 	$msg =3D MIME::Lite->new(
 		From	=3D> $mail{'SENDER'},
 		To		=3D> $mail{'RECIPIENT'},
--=20
2.17.1


--===============0000519672689334504==--