Hello Stephan,
thanks for the patch. I just merged everything for Core Update 113 this
morning.
So including this patch, this will hopefully be the final version that
is going to be released.
Best,
-Michael
On Tue, 2017-08-15 at 15:17 +0200, Stephan Feddersen wrote:
> ---
> lfs/wio | 2 +-
> src/wio/lang/wio.de.pl | 1 +
> src/wio/lang/wio.en.pl | 1 +
> src/wio/wio.cgi | 19 +++++--------------
> 4 files changed, 8 insertions(+), 15 deletions(-)
>
> diff --git a/lfs/wio b/lfs/wio
> index a3c00d9..25726cd 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 = 1
> +PAK_VER = 2
>
> ####################################################################
> ###########
> # Top-level Rules
> diff --git a/src/wio/lang/wio.de.pl b/src/wio/lang/wio.de.pl
> index 430284e..fd82ff0 100644
> --- a/src/wio/lang/wio.de.pl
> +++ b/src/wio/lang/wio.de.pl
> @@ -97,6 +97,7 @@
> 'wio_iface' => 'Schnittstelle',
> 'wio_client_enable' => 'Client aktivieren?',
> 'wio_ping_send' => 'überprüfen per',
> +'wio_link_open' => 'Link öffnen per',
> 'enable disable client' => 'Client aktivieren oder deaktivieren',
> 'wio_client_on' => 'Überwachung aktiviert (klicken, um zu
> deaktivieren)',
> 'wio_client_off' => 'Überwachung deaktiviert (klicken, um zu
> aktivieren)',
> diff --git a/src/wio/lang/wio.en.pl b/src/wio/lang/wio.en.pl
> index 17312a7..52793b9 100644
> --- a/src/wio/lang/wio.en.pl
> +++ b/src/wio/lang/wio.en.pl
> @@ -97,6 +97,7 @@
> 'wio_iface' => 'Interface',
> 'wio_client_enable' => 'enable Host ?',
> 'wio_ping_send' => 'send ping to',
> +'wio_link_open' => 'open link via',
> 'enable disable client' => 'enable or disable client',
> 'wio_client_on' => 'Client enabled (click to disable)',
> 'wio_client_off' => 'Client disabled (click to enable)',
> diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi
> index 631e468..aa471e6 100644
> --- a/src/wio/wio.cgi
> +++ b/src/wio/wio.cgi
> @@ -47,6 +47,7 @@ use Fatal qw/ open /;
> use Net::Telnet;
>
> require '/var/ipfire/general-functions.pl';
> +require '/var/ipfire/network-functions.pl';
> require '/var/ipfire/lang.pl';
> require '/var/ipfire/header.pl';
> require '/usr/lib/wio/wio-lib.pl';
> @@ -166,18 +167,8 @@ if ( -e $wiofile ) { goto WIOSCAN; }
> ## get network ips
> foreach (@devs_color) {
> if ( $netsettings{"${_}_DEV"} ne '' ) {
> -
> - $wiosettings{"${_}_IPLOW"} = inet_ntoa pack q/N/,
> (unpack (q/N/, inet_aton ($netsettings{"${_}_NETADDRESS"}))+1);
> - my @addrarr =
> split(/\./,$netsettings{"${_}_ADDRESS"});
> - my $ipaddress = unpack( "N", pack( "C4",@addrarr )
> );
> -
> - my @maskarr =
> split(/\./,$netsettings{"${_}_NETMASK"});
> - my $netmask = unpack( "N", pack( "C4",@maskarr ) );
> -
> - my $bcast = ( $ipaddress & $netmask ) + ( ~ $netmask
> );
> - my @bcastarr = inet_ntoa pack q/N/, (unpack (q/N/,
> inet_aton ($bcast))-1);
> -
> - $wiosettings{"${_}_IPHIGH"} = join(".",@bcastarr);
> + $wiosettings{"${_}_IPLOW"} =
> &Network::find_next_ip_address($netsettings{"${_}_NETADDRESS"}, 1);
> + $wiosettings{"${_}_IPHIGH"} =
> &Network::find_next_ip_address($netsettings{"${_}_BROADCAST"}, -1);
> }
> }
>
> @@ -712,7 +703,7 @@ else {
> print"
>
>
> - | $Lang::tr{'wio_ping_send'}: |
> + $Lang::tr{'wio_link_open'}: |
>
> |
>
> - | $Lang::tr{'wio_ping_send'}: |
> + $Lang::tr{'wio_link_open'}: |
>
> |