From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephan Feddersen <sfeddersen@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH] WIO - shutdown function removed, adjustments to IPsec status display
Date: Sun, 28 Jun 2020 12:44:18 +0200
Message-ID: <20200628104418.28598-1-sfeddersen@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8753504570930746732=="
List-Id: <development.lists.ipfire.org>

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

---
 src/wio/main/wio.pl | 56 ++++++++++++---------------------------------
 1 file changed, 15 insertions(+), 41 deletions(-)

diff --git a/src/wio/main/wio.pl b/src/wio/main/wio.pl
index 8e2fb8879..91c6c1494 100644
--- a/src/wio/main/wio.pl
+++ b/src/wio/main/wio.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,14 +21,14 @@
 #                                                                           =
  #
 ############################################################################=
###
 #
-# Version: 2019/06/04 21:12:23
+# Version: 2020/06/01 13:29:23
 #
-# This wio.pl is based on the Code from the IPCop WIO Addon
+# This wio.pl is based on the code from the IPCop WIO Addon
 # and is extremly adapted to work with IPFire.
 #
 # Autor: Stephan Feddersen
 # Co-Autor: Alexander Marx
-# Co-Autor: Frank Mainz
+# Co-Autor: Frank Mainz (for some code for the IPCop WIO Addon)
 #
=20
 # enable only the following on debugging purpose
@@ -46,10 +46,9 @@ require '/var/ipfire/lang.pl';
 require '/usr/lib/wio/wio-lib.pl';
=20
 my ( $debug, $i, $t, $ib, $tb, $ivpn, $tvpn ) =3D '';
-my $logdir    =3D "/var/log/wio";
 my $owner     =3D getpwnam "nobody";
 my $group     =3D getgrnam "nobody";
-my $ipadrfile =3D "$logdir/wioips";
+my $ipadrfile =3D "/var/log/wio/wioips";
=20
 unless ( -e $ipadrfile ) { print ( "The file $ipadrfile doesn't exist!\n" );=
 exit; }
=20
@@ -70,9 +69,8 @@ my $logging    =3D $wiosettings{'LOGGING'};
 my $mailstyle  =3D $wiosettings{'MAILSTYLE'};
 my $mailremark =3D $wiosettings{'MAILREMARK'};
 my $timeout    =3D $wiosettings{'TIMEOUT'};
-my $shutdown   =3D $wiosettings{'SHUTDOWN'};
 my $rrddir     =3D "/var/log/rrd/wio";
-my $onoffip    =3D "$logdir/wioscip";
+my $onoffip    =3D "/var/log/wio/wioscip";
 my $hostname   =3D "$mainsettings{'HOSTNAME'}.$mainsettings{'DOMAINNAME'}";
 my $redactive  =3D "/var/ipfire/red/active";
 my $rediface   =3D "/var/ipfire/red/iface";
@@ -91,7 +89,6 @@ my $i_ping     =3D 'icmp';
 my $t_ping     =3D 'tcp';
=20
 my $nr =3D 1;
-my $poweroff =3D 0;
=20
 my ( $togglestat, $arp, $time, $start, $timestamp ) =3D 0;
 my ( $id, $ipadr, $ipadrnew, $host, $hostnew, $enable, $remark, $dyndns, $dy=
ndnsip ) =3D '';
@@ -101,6 +98,10 @@ my ( $ping_i, $ping_t, $ping_ib, $ping_tb, $ping_iv, $pin=
g_tv, $pingmode ) =3D '';
 my ( @tmp, @arptmp, @myarray, @status, @arpclients ) =3D '';
 my @ifaces =3D ('GREEN','BLUE','ORANGE');
=20
+if ( $netsettings{'RED_TYPE'} eq 'STATIC' || $netsettings{'RED_TYPE'} eq 'DH=
CP' ) {
+	push (@ifaces, "RED");
+}
+
 if ( $mailsettings{'USEMAIL'} eq 'on' ) { $mailen =3D 'on'; }
 else { $mailen =3D 'off'; }
=20
@@ -279,7 +280,7 @@ foreach (@myarray) {
 	}
 }
=20
-# write adressfile new
+# write ipadressfile new
=20
 if ( !-e $onoffip ) {
 	open( FILE, "> $ipadrfile" );
@@ -298,33 +299,6 @@ if ($debug) {
=20
 if ( $smailtxt ne '' ) { &WIO::mailsender($Lang::tr{'wio_sub'}, $smailtxt); }
=20
-if ($shutdown eq 'on' && ! -e $onoffip) {
-	foreach (@status) {
-		chomp;
-		@tmp =3D split( /\,/, $_ );
-
-		($id,$timestamp,$ipadr,$host,$enable,$remark,$dyndns,$mailon,$mailoff,$pin=
g,$on,$httphost) =3D @tmp;
-	=09
-		if ( $on eq 'on' ) {
-			$poweroff =3D 0;
-			last;
-		}
-		else {
-			$poweroff =3D 1;
-			next;
-		}
-	}
-
-	if ($poweroff =3D=3D 1) {
-		if ($debug) {
-			printf "$Lang::tr{'shutting down ipfire'}!\n\n";
-		}
-
-		&General::log("wio","$Lang::tr{'shutting down ipfire'}!");
-		system '/usr/local/bin/ipfirereboot down';
-	}
-}
-
 undef (@tmp);
 undef (@myarray);
 undef (@status);
@@ -355,7 +329,6 @@ sub updatewiodata {
 }
=20
 sub startdebug {
-
 printf "
 HOSTNAME    : $hostname
 TIMEOUT     : $timeout $Lang::tr{'age ssecond'}
@@ -363,10 +336,11 @@ MAILSTYLE   : $mailstyle
 RED TYPE    : $netsettings{'RED_TYPE'}
 RED DEVICE  : $reddev
 RED ADDRESS : $redip
-SHUTDOWN    : $shutdown
 ";
-	if ($ovpnpid) {printf "OVPN PID    : $ovpnpid"}
-	if ($vpnpid) {printf "VPN PID     : $vpnpid"}
+
+if ($ovpnpid) {printf "OpenVPN PID : $ovpnpid"}
+if ($vpnpid) {printf "IPsec PID   : $vpnpid"}
+
 printf  "
 $Lang::tr{'wio_search'}
=20
--=20
2.17.1


--===============8753504570930746732==--