BUG 11487:solve problem with unexspected shutdown

Solve problem with unexspected shutdown problem when checking a single client.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/wio b/lfs/wio
index 7098dd9cf560dbc62f0881bb4cf6efa9fdcd1c80..92186efadea469f7471945a1c31bb375b4ed68de 100644 (file)
--- a/lfs/wio
+++ b/lfs/wio
@@ -15,7 +15,7 @@ THISAPP    = wio-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = wio
-PAK_VER    = 3
+PAK_VER    = 4
 
 ###############################################################################
 # Top-level Rules

diff --git a/src/wio/main/wio.pl b/src/wio/main/wio.pl
index b846feafa6147c72da67608426d23a8d0daea709..8e2fb8879f062c45afcac8b734cd809831ce82a3 100644 (file)
--- a/src/wio/main/wio.pl
+++ b/src/wio/main/wio.pl
@@ -21,7 +21,7 @@
 #                                                                             #
 ###############################################################################
 #
-# Version: 2017/08/04 18:55:23
+# Version: 2019/06/04 21:12:23
 #
 # This wio.pl is based on the Code from the IPCop WIO Addon
 # and is extremly adapted to work with IPFire.
@@ -86,9 +86,9 @@ my $redip      = $hostname;
 my $vpnpid     = ( -e "/var/run/charon.pid" ? `awk '{print $1}' /var/run/charon.pid`: '');
 my $ovpnpid    = ( -e  "/var/run/openvpn.pid" ? `awk '{print $1}' /var/run/openvpn.pid`: '');
 
-my $steptime = $wiosettings{'CRON'} *= 60;
-my $i_ping   = 'icmp';
-my $t_ping   = 'tcp';
+my $steptime   = $wiosettings{'CRON'} *= 60;
+my $i_ping     = 'icmp';
+my $t_ping     = 'tcp';
 
 my $nr = 1;
 my $poweroff = 0;
@@ -101,7 +101,6 @@ my ( $ping_i, $ping_t, $ping_ib, $ping_tb, $ping_iv, $ping_tv, $pingmode ) = '';
 my ( @tmp, @arptmp, @myarray, @status, @arpclients ) = '';
 my @ifaces = ('GREEN','BLUE','ORANGE');
 
-
 if ( $mailsettings{'USEMAIL'} eq 'on' ) { $mailen = 'on'; }
 else { $mailen = 'off'; }
 
@@ -299,7 +298,7 @@ if ($debug) {
 
 if ( $smailtxt ne '' ) { &WIO::mailsender($Lang::tr{'wio_sub'}, $smailtxt); }
 
-if ($shutdown eq 'on') {
+if ($shutdown eq 'on' && ! -e $onoffip) {
        foreach (@status) {
                chomp;
                @tmp = split( /\,/, $_ );