[PATCH] BUG 11487:solve problem with unexspected shutdown

[PATCH] BUG 11487:solve problem with unexspected shutdown

[sfeddersen]

[-- Attachment #1: Type: text/plain, Size: 2138 bytes --]

Solve problem with unexspected shutdown problem when checking a single client.
---
 lfs/wio             |  2 +-
 src/wio/main/wio.pl | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lfs/wio b/lfs/wio
index 7098dd9cf..92186efad 100644
--- 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 b846feafa..8e2fb8879 100644
--- 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( /\,/, $_ );
-- 
2.17.1

Re: [PATCH] BUG 11487:solve problem with unexspected shutdown

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2400 bytes --]

Hi,

Good patch. Merged!

-Michael

> On 4 Jun 2019, at 20:49, sfeddersen <sfeddersen(a)ipfire.org> wrote:
> 
> Solve problem with unexspected shutdown problem when checking a single client.
> ---
> lfs/wio             |  2 +-
> src/wio/main/wio.pl | 11 +++++------
> 2 files changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/lfs/wio b/lfs/wio
> index 7098dd9cf..92186efad 100644
> --- 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 b846feafa..8e2fb8879 100644
> --- 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

I suppose you just want to keep this :)

> #
> # 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( /\,/, $_ );
> -- 
> 2.17.1
>