From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] BUG 11487:solve problem with unexspected shutdown
Date: Wed, 05 Jun 2019 09:12:22 +0100
Message-ID: <B035E9EA-F048-4FF7-8A02-3C4518882B76@ipfire.org>
In-Reply-To: <20190604194922.6042-1-sfeddersen@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3345619180160660990=="
List-Id: <development.lists.ipfire.org>

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

Hi,

Good patch. Merged!

-Michael

> On 4 Jun 2019, at 20:49, sfeddersen <sfeddersen(a)ipfire.org> wrote:
>=20
> Solve problem with unexspected shutdown problem when checking a single clie=
nt.
> ---
> lfs/wio             |  2 +-
> src/wio/main/wio.pl | 11 +++++------
> 2 files changed, 6 insertions(+), 7 deletions(-)
>=20
> diff --git a/lfs/wio b/lfs/wio
> index 7098dd9cf..92186efad 100644
> --- a/lfs/wio
> +++ b/lfs/wio
> @@ -15,7 +15,7 @@ THISAPP    =3D wio-$(VER)
> DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
> TARGET     =3D $(DIR_INFO)/$(THISAPP)
> PROG       =3D wio
> -PAK_VER    =3D 3
> +PAK_VER    =3D 4
>=20
> ###########################################################################=
####
> # 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      =3D $hostname;
> my $vpnpid     =3D ( -e "/var/run/charon.pid" ? `awk '{print $1}' /var/run/=
charon.pid`: '');
> my $ovpnpid    =3D ( -e  "/var/run/openvpn.pid" ? `awk '{print $1}' /var/ru=
n/openvpn.pid`: '');
>=20
> -my $steptime =3D $wiosettings{'CRON'} *=3D 60;
> -my $i_ping   =3D 'icmp';
> -my $t_ping   =3D 'tcp';
> +my $steptime   =3D $wiosettings{'CRON'} *=3D 60;
> +my $i_ping     =3D 'icmp';
> +my $t_ping     =3D 'tcp';
>=20
> my $nr =3D 1;
> my $poweroff =3D 0;
> @@ -101,7 +101,6 @@ my ( $ping_i, $ping_t, $ping_ib, $ping_tb, $ping_iv, $p=
ing_tv, $pingmode ) =3D '';
> my ( @tmp, @arptmp, @myarray, @status, @arpclients ) =3D '';
> my @ifaces =3D ('GREEN','BLUE','ORANGE');
>=20
> -
> if ( $mailsettings{'USEMAIL'} eq 'on' ) { $mailen =3D 'on'; }
> else { $mailen =3D 'off'; }
>=20
> @@ -299,7 +298,7 @@ if ($debug) {
>=20
> if ( $smailtxt ne '' ) { &WIO::mailsender($Lang::tr{'wio_sub'}, $smailtxt);=
 }
>=20
> -if ($shutdown eq 'on') {
> +if ($shutdown eq 'on' && ! -e $onoffip) {
> 	foreach (@status) {
> 		chomp;
> 		@tmp =3D split( /\,/, $_ );
> --=20
> 2.17.1
>=20


--===============3345619180160660990==--