From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephan Feddersen To: development@lists.ipfire.org Subject: [PATCH] wio-1.3.2-7: fixed bug with arp client import Date: Tue, 12 Nov 2019 21:34:00 +0100 Message-ID: <20191112203400.5264-1-sfeddersen@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0664727555607937453==" List-Id: --===============0664727555607937453== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable --- lfs/wio | 4 ++-- src/wio/wio.cgi | 61 ++++++++++++++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/lfs/wio b/lfs/wio index 58ab16620..5ed954676 100644 --- a/lfs/wio +++ b/lfs/wio @@ -1,6 +1,6 @@ ############################################################################= ### # IPFire.org - An Open Source Firewall Solution = # -# Copyright (C) 2007-2018 IPFire Team = # +# Copyright (C) 2007-2019 IPFire Team = # ############################################################################= ### =20 ############################################################################= ### @@ -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 6 +PAK_VER =3D 7 =20 ############################################################################= ### # Top-level Rules diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index 1645aa54e..1c380b1a5 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -3,7 +3,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2017-2018 Stephan Feddersen = # +# Copyright (C) 2017-2019 Stephan Feddersen = # # All Rights Reserved. = # # = # # This program is free software: you can redistribute it and/or modify = # @@ -21,14 +21,14 @@ # = # ############################################################################= ### # -# Version: 2018/02/27 16:54:23 +# Version: 2019/11/08 14:35:23 # # This wio.cgi 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 use strict; @@ -215,7 +215,7 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_save'}.'2' = ) { unless ( `ps -A | grep wio.pl` ) { while ( $count < $wiosettings{'COUNT'} ) { if ( defined($wiosettings{"USE$count"}) && $wiosettings{"USE$count"} eq '= on' ) { - $wiosettings{'CLIENTID'} =3D $wiosettings{'CLIENTID$count'}; + $wiosettings{'CLIENTID'} =3D $wiosettings{"CLIENTID$count"}; $wiosettings{'TIMESTAMP'} =3D $wiosettings{"TIMESTAMP$count"}; $wiosettings{'IPADR'} =3D $wiosettings{"IPADR$count"}; $wiosettings{'HOST'} =3D $wiosettings{"HOST$count"}; @@ -226,6 +226,7 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_save'}.'2' = ) { $wiosettings{'SENDEMAILOFF'} =3D $wiosettings{"SENDEMAILOFF$count"}; $wiosettings{'PINGMETHODE'} =3D $wiosettings{"PINGMETHODE$count"}; $wiosettings{'ONLINE'} =3D $wiosettings{"ONLINE$count"}; + $wiosettings{'WEBINTERFACE'} =3D $wiosettings{"WEBINTERFACE$count"}; =20 &validSave(); =20 @@ -281,39 +282,54 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_client_ad= d'} ) { ## show / hide arptable =20 if ( $wiosettings{'WIOGUISHOWARPTABLE'} eq 'arptable' ) { - if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { - $wiosettings{'WIOGUISHOWARPTABLE'} =3D 'off'; - $arpbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; + unless ( `ps -A | grep wio.pl` ) { + if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { + $wiosettings{'WIOGUISHOWARPTABLE'} =3D 'off'; + $arpbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; + } + else { + $wiosettings{'WIOGUISHOWARPTABLE'} =3D 'on'; + $arpbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; + } } else { - $wiosettings{'WIOGUISHOWARPTABLE'} =3D 'on'; - $arpbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; + $infomessage =3D "$Lang::tr{'wio_error_function'}"; } } =20 ## show / hide clientimporttable =20 if ( $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} eq 'clientimport' ) { - if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { - $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} =3D 'off'; - $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; + unless ( `ps -A | grep wio.pl` ) { + if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { + $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} =3D 'off'; + $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; + } + else { + $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} =3D 'on'; + $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; + } } else { - $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} =3D 'on'; - $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; + $infomessage =3D "$Lang::tr{'wio_error_function'}"; } } =20 ## show / hide networksearchtable =20 if ( $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} eq 'networksearch' ) { - if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { - $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} =3D 'off'; - $networksearchbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; + unless ( `ps -A | grep wio.pl` ) { + if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { + $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} =3D 'off'; + $networksearchbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; + } + else { + $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} =3D 'on'; + $networksearchbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; + } } else { - $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} =3D 'on'; - $networksearchbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; + $infomessage =3D "$Lang::tr{'wio_error_function'}"; } } =20 @@ -388,6 +404,8 @@ if ( defined($edc) || defined($edd) || defined($wmon) || = defined($wmoff) || defi =20 if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_refresh'} || $wiosettings{'ACT= ION'} eq $Lang::tr{'wio_sc_refresh'} ) { =20 +unless ( `ps -A | grep wio.pl` ) { + if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_sc_refresh'} ) { open(FILE, "> $onoffip"); print FILE @current[$wiosettings{'ID'}]; @@ -396,8 +414,6 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_refresh'} |= | $wiosettings{'ACTION' undef($wiosettings{'ID'}); } =20 -unless ( `ps -A | grep wio.pl` ) { - &Header::showhttpheaders(); &Header::openpage($Lang::tr{'wio'}, 1, $refreshbox); &Header::openbigbox('100%', 'left', ''); @@ -417,7 +433,7 @@ print" =20 while ( system("/usr/local/bin/wiohelper", "&") ) {} =20 -exit 0; =09 +exit 0; } else { $infomessage =3D "$Lang::tr{'wio_already_running'}"; @@ -662,7 +678,6 @@ foreach (@hosts) { $wiosettings{'HOST$count'} =3D gethostbyaddr(inet_aton($line[1]), AF_INET= ); if ($wiosettings{'HOST$count'} eq '') { $wiosettings{'HOST$count'} =3D $l= ine[1]; } $wiosettings{'REMARK$count'} =3D ''; - $wiosettings{'WEBINTERFACE$count'} =3D ''; } else { $wiosettings{'HOST$count'} =3D $line[7]; --=20 2.17.1 --===============0664727555607937453==--