From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephan Feddersen To: development@lists.ipfire.org Subject: [PATCH] WIO - shutdown function removed, adjustments to IPsec status display Date: Sun, 28 Jun 2020 12:41:55 +0200 Message-ID: <20200628104155.28529-1-sfeddersen@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7257883055010646396==" List-Id: --===============7257883055010646396== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable --- src/wio/wio.cgi | 316 ++++++++++++++++++++++++------------------------ 1 file changed, 160 insertions(+), 156 deletions(-) diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index 3094ec30c..a92a44473 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -21,14 +21,14 @@ # = # ############################################################################= ### # -# Version: 2020/26/04 19:35:23 +# Version: 2020/06/01 13:29:23 # -# This wio.cgi is based on the Code from the IPCop WIO Addon +# 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 (for some Code for the IPCop WIO Addon) +# Co-Autor: Frank Mainz (for some code for the IPCop WIO Addon) # =20 use strict; @@ -55,7 +55,7 @@ require '/usr/lib/wio/wio-graphs.pl'; =20 my $logdir =3D "/var/log/wio"; =20 -my ( %mainsettings, %mailsettings, %wiosettings, %cgiparams, %netsettings, %= ipshash, +my ( %mainsettings, %mailsettings, %wiosettings, %cgiparams, %netsettings, %= ipshash, %vpnsettings, %vpnconfighash, %ovpnconfighash, %ovpnccdconfhash, %ovpnsettings, %checked= , %selected, %color ) =3D (); =20 &General::readhash('/var/ipfire/main/settings', \%mainsettings); @@ -67,6 +67,7 @@ my ( %mainsettings, %mailsettings, %wiosettings, %cgiparams= , %netsettings, %ipsh &General::readhash('/var/ipfire/ovpn/settings', \%ovpnsettings); &General::readhasharray('/var/ipfire/ovpn/ccd.conf', \%ovpnccdconfhash); &General::readhasharray('/var/ipfire/vpn/config', \%vpnconfighash); +&General::readhash('/var/ipfire/vpn/settings', \%vpnsettings); =20 my $ipadrfile =3D "$logdir/wioips"; my $onoffip =3D "$logdir/wioscip"; @@ -112,7 +113,7 @@ my $networksearchbuttontext =3D "$Lang::tr{'wio_show_tabl= e_on'}"; my ( $message, $infomessage, $errormessage, $importmessage ) =3D ''; =20 my ( $buttontext, $host, $timestamp, $ipadr, $on, $remark, $dyndns, $dyndnsi= p, $sendemailon, $net, $dev, $iprange, $output, $write, $webinterface, - $sendemailoff, $pingmethode, $online, $color, $bgcolor, $exitcode, $id, $l= ine, $interface, $counter, $vpnn2nip, $vpnn2nmask, $ddns, $edc, + $sendemailoff, $pingmethode, $online, $color, $bgcolor, $exitcode, $id, $l= ine, $interface, $counter, $vpnn2nip, $vpnn2nmask, $edc, $edd, $wmon, $wmoff, $ipfqdn, $http, $wioscan, $statustxt, $status, $key, = $ic, $text, $image ) =3D ();=20 =20 my ( @temp, @dates, @ipaddresses, @names, @remark, @sendemailon, @sendemailo= ff, @current, @ddns, @match, @webinterface, @arpcache, @arpadd, @line, @@ -127,6 +128,10 @@ my @devs_alt =3D ('green','blue','orange','red'); =20 my %ifacecolor =3D ( GREEN =3D> 'wio_run_green', BLUE =3D> 'wio_run_blue', O= RANGE =3D> 'wio_run_orange'); =20 +#if ( $netsettings{'RED_TYPE'} eq 'STATIC' || $netsettings{'RED_TYPE'} eq 'D= HCP' ) { +# %ifacecolor =3D ( %ifacecolor, RED =3D> 'wio_run_red' ); +#} + &loadips(); =20 ## some wio settings @@ -156,7 +161,6 @@ $wiosettings{'LOGGING'} =3D 'off'; $wiosettings{'MAILREMARK'} =3D 'off'; $wiosettings{'MAILSTYLE'} =3D 'email'; $wiosettings{'OVPNRWMAIL'} =3D 'off'; -$wiosettings{'SHUTDOWN'} =3D 'off'; $wiosettings{'WIOGUISHOWARPTABLE'} =3D ''; $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} =3D ''; $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} =3D ''; @@ -194,7 +198,6 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_save'}.'1' = ) { $cgiparams{'MAILREMARK'} =3D $wiosettings{'MAILREMARK'}; $cgiparams{'MAILSTYLE'} =3D $wiosettings{'MAILSTYLE'}; $cgiparams{'OVPNRWMAIL'} =3D $wiosettings{'OVPNRWMAIL'}; - $cgiparams{'SHUTDOWN'} =3D $wiosettings{'SHUTDOWN'}; =20 &General::writehash($wiosettings, \%cgiparams); &General::readhash($wiosettings, \%wiosettings); @@ -535,6 +538,7 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_back'} ) { =20 if ( $wiosettings{'ACTION'} eq 'wio_run_green' || $wiosettings{'ACTION'} eq 'wio_run_blue' || + $wiosettings{'ACTION'} eq 'wio_run_red' || $wiosettings{'ACTION'} eq 'wio_run_orange') { $wioscan =3D 'on'; } =20 if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_import'}.'1' || @@ -599,13 +603,14 @@ elsif ( $wioscan eq 'on' ) { =20 if ( $_ eq 'GREEN' ) { $color =3D "$Header::colourgreen"; $net =3D $Lang:= :tr{'wio_msg_green'}; } elsif ( $_ eq 'BLUE' ) { $color =3D "$Header::colourblue"; $net =3D $Lang= ::tr{'wio_msg_blue'}; } + elsif ( $_ eq 'RED' ) { $color =3D "$Header::colourred"; $net =3D $Lang::= tr{'wio_msg_red'}; } else { $color =3D "$Header::colourorange"; $net =3D $Lang::tr{'wio_msg_or= ange'}; } } } =20 &Header::openbox('100%', 'left', $Lang::tr{'wio_info'}); print" - +
$Lang::tr{'wio_msg_left'} = $net $Lang::tr{'wi= o_msg_center'} $dev $Lang::tr{'wio_msg_right'} $Lang::tr{'wio_msg_hint'}
$Lang::tr{'wio_msg_left'} = $net $Lang::tr{'wi= o_msg_center'} $Lang::tr{'wio_msg_right'} $Lang::tr{'wi= o_msg_hint'}
 
"; @@ -884,9 +889,6 @@ $checked{'MAILREMARK'}{$wiosettings{'MAILREMARK'}} =3D "c= hecked=3D'checked'"; $checked{'OVPNRWMAIL'}{'off'} =3D $checked{'OVPNRWMAIL'}{'on'} =3D ''; $checked{'OVPNRWMAIL'}{$wiosettings{'OVPNRWMAIL'}} =3D "checked=3D'checked'"; =20 -$checked{'SHUTDOWN'}{'off'} =3D $checked{'SHUTDOWN'}{'on'} =3D ''; -$checked{'SHUTDOWN'}{$wiosettings{'SHUTDOWN'}} =3D "checked=3D'checked'"; - $checked{'MAILSTYLE'}{'smail'} =3D $checked{'MAILSTYLE'}{'email'} =3D ''; $checked{'MAILSTYLE'}{$wiosettings{'MAILSTYLE'}} =3D "checked=3D'checked'"; =20 @@ -942,15 +944,14 @@ print"
- - - + + - - + + + - "; @@ -966,12 +967,6 @@ else { print" - - - - - - @@ -1133,16 +1128,16 @@ print" - + - + - @@ -1155,22 +1150,25 @@ open(FILE, "< $dyndnsconfig"); @ddns =3D ; close (FILE); =20 -$ddns =3D @ddns; -$bgcolor =3D "blue"; - foreach (@ddns) { chomp; - + =09 @temp =3D split (/\,/, $_); =20 - if ( $temp[7] eq "on" ) { $bgcolor =3D ( &General::DyndnsServiceSync (&Gen= eral::GetDyndnsRedIP,$temp[1],$temp[2]) ? "$Header::colourgreen" : "$Header::= colourred" ); } - + if ( $temp[7] eq "on" ) { + $bgcolor =3D ( &General::DyndnsServiceSync (&General::GetDyndnsRedIP,$tem= p[1],$temp[2]) ? "$Header::colourgreen" : "$Header::colourred" ); + } + else { + $bgcolor =3D "blue"; + } + =09 print"$temp[1].$temp[2]"; - - if ( $iddyndns++ ne ($ddns-1) ) { print", "; } + if ( $iddyndns++ ne (@ddns-1) ) { print"
\n"; } } } -else { print" - "; } +else { + print"-"; +} =20 print" @@ -1217,19 +1215,23 @@ print" =20 foreach $key (sort SortByTunnelName (keys(%vpnconfighash))) { =20 -my ( $vpncheck, $vpntime, $vpnclient ) =3D ''; - -if ( -e '/var/log/wio/.vpncache' ) { - $vpncheck =3D strftime("%d.%m.%Y - %H:%M:%S",localtime(((stat('/var/log/wio= /.vpncache'))[9]))); -} +my ( $vpnclient, $vpnclientip, $vpnrwnet, $vpnn2nnet, $vpntime, $vpncheck ) = =3D ''; =20 $status =3D "bgcolor=3D'${Header::colourred}'"; $statustxt =3D "$Lang::tr{'capsclosed'}"; $vpnclient =3D $vpnconfighash{$key}[1]; =20 +my ($ip,$sub) =3D split(/\//,$vpnsettings{'RW_NET'}); +my @ip =3D split( /\./, $ip); +$vpnrwnet =3D join( '.', ( $ip[0], $ip[1], $ip[2], ) ); + if ($vpnconfighash{$key}[0] eq 'off') { $status =3D "bgcolor=3D'${Header::colourblue}'"; $statustxt =3D "$Lang::tr{'capsclosed'}"; + $vpnn2nnet =3D '-'; + } + else { + $vpnn2nnet =3D $vpnconfighash{$key}[11]; } =20 foreach (@vpnstatus) { @@ -1238,6 +1240,8 @@ $vpnclient =3D $vpnconfighash{$key}[1]; $statustxt =3D "$Lang::tr{'capsopen'}"; $vpntime =3D `/usr/local/bin/ipsecctrl I | grep $vpnclient.*ESTABLISHED |= sed 's/^[ \t]*//' | cut -d " " -f 3-4`; $vpntime =3D &WIO::contime($vpntime, "ipsec"); + $vpnclientip =3D `/usr/local/bin/ipsecctrl I | grep $vpnclient.*$vpnrwnet= | sed 's/^[ \t]*//' | cut -d " " -f 6 | cut -d "/" -f 1`; + $vpncheck =3D strftime("%d.%m.%Y - %H:%M:%S",localtime); last; } } @@ -1248,10 +1252,10 @@ $vpnclient =3D $vpnconfighash{$key}[1]; =20 printf ("", $vpnnr); =20 - print" + print" - + - + "; =20 -if ($vpnconfighash{$key}[25] && $wiosettings{'CLIENTREMARK'} eq 'on') { - print""; +if ($wiosettings{'CLIENTREMARK'} eq 'on') { + print""; } - print""; - $idvpn++ + +print""; +$idvpn++ } =20 print"
 $Lang::tr{'wio_settings_msg'}  $Lang::tr{'wio_settings= _msg_hint'} 
 
$Lang::tr{'wio_settings_msg_hint'}   
 
$Lang::tr{'wio enabled'}
 
$Lang::tr{'wio_shutdown'} 
 
$Lang::tr{'wio cron'}  
$Lang::tr{'wio_id'} $Lang::tr{'wio ipadress'}$Lang::tr{'wio network'}$Lang::tr{'wio network'} $Lang::tr{'wio_lanname'} $Lang::tr{'wio_wanname'}$Lang::tr{'wio_dyndns_hosts'}$Lang::tr{'wio_dyndns_hosts'} $Lang::tr{'wio image'} $Lang::tr{'wio_connected'}
01$redip + $redip =3D'$Lang::tr{'internet'}' ".$mainsettings{'= HOSTNAME'}.".".$mainsettings{'DOMAINNAME'}." ".( $redip ne '-' ?= (gethostbyaddr(pack("C4", split (/\./, $redip)), 2))[0] : '-' )."%02d$vpncheck".($vpncheck ne '' ? "$vpncheck" : "-")." $vpnclient 3D'$Lang::tr{'wio_rw'}'".($vpnconfighash{$key}[2] eq '%auth-dn' ? "$vpncon= fighash{$key}[9]" : ($vpnconfighash{$key}[4] eq 'cert' ? "$vpnconfighash{$key= }[2]" : ($vpnconfighash{$key}[8] ne '' ? "$vpnconfighash{$key}[10]" : " = ")))."".($vpnconfighash{$key}[3] eq 'host' ? (defined($vp= nclientip) ? "$vpnclientip" : "-") : $vpnconfighash{$key}[3] eq 'net' ? "$vpn= n2nnet" : "-")." @@ -1259,15 +1263,16 @@ $vpnclient =3D $vpnconfighash{$key}[1];
".(defined($vpntime)? "$vpntime" : "-= ")."".($vpntime ne '' ? "$vpntime" : "-")= ."
 $vpnconfighash{$key}[25]
 ".($vpnconfighash{$key}[25] ne '' ? "$vpnconfighash{$key}[25]" : "-")."
"; @@ -1292,117 +1297,117 @@ print" $Lang::tr{'wio_id'} $Lang::tr{'wio checked'} - $Lang::tr{'wio ipadress'} + $Lang::tr{'name'} $Lang::tr{'type'} - $Lang::tr{'common name'} + $Lang::tr{'wio_common_name'} $Lang::tr{'wio image'} $Lang::tr{'wio_connected'} "; =20 - foreach $key (keys %ovpnconfighash) { +foreach $key (keys %ovpnconfighash) { =20 - my ( $ovpnclt, $ovpntime, $ovpnrwip, $ovpncheck ) =3D ''; + my ( $ovpncheck, $ovpntime, $ovpnclt, $ovpnrwip ) =3D ''; =20 - if ( -e '/var/log/wio/.ovpncache' ) { - $ovpncheck =3D strftime("%d.%m.%Y - %H:%M:%S",localtime(((stat('/var/log/= wio/.ovpncache'))[9]))); - } + print""; =20 - print""; + my $ovpnnr =3D $idovpn+1; =20 - my $ovpnnr =3D $idovpn+1; + printf (" %02d", $ovpnnr); =20 - printf (" %02d", $ovpnnr); + if ($ovpnconfighash{$key}[3] eq 'net') { + $image =3D "$imgstatic/ovpnn2n.png"; + $text =3D "$Lang::tr{'wio_n2n'}"; + } + else { + $image =3D "$imgstatic/ovpnrw.png"; + $text =3D "$Lang::tr{'wio_rw'}"; + } =20 + if ( $ovpnconfighash{$key}[0] eq 'off' ) { + $status =3D "${Header::colourblue}"; + $statustxt =3D "$Lang::tr{'capsclosed'}"; + $ovpncheck =3D "-"; + } + else { if ($ovpnconfighash{$key}[3] eq 'net') { - $image =3D "$imgstatic/ovpnn2n.png"; - $text =3D "$Lang::tr{'wio_n2n'}"; - } - else { - $image =3D "$imgstatic/ovpnrw.png"; - $text =3D "$Lang::tr{'wio_rw'}"; - } - - if ( $ovpnconfighash{$key}[0] eq 'off' ) { - $status =3D "${Header::colourblue}"; - $statustxt =3D "$Lang::tr{'capsclosed'}"; - } - else { - if ($ovpnconfighash{$key}[3] eq 'net') { - if (-e "/var/run/$ovpnconfighash{$key}[1]n2n.pid") { - my @output =3D ""; - my @tustate =3D ""; - my $tport =3D $ovpnconfighash{$key}[22]; - my $tnet =3D new Net::Telnet ( Timeout=3D>5, Errmode=3D>'return', Port= =3D>$tport);=20 - if ($tport ne '') { - $tnet->open('127.0.0.1'); - @output =3D $tnet->cmd(String =3D> 'state', Prompt =3D> '/(END.*\n|ERR= OR:.*\n)/'); - @tustate =3D split(/\,/, $output[1]); - $ovpntime =3D &WIO::contime(scalar localtime($tustate[0]), "ovpn"); - =09 - if (($tustate[1] eq 'CONNECTED')) { - $status =3D "${Header::colourgreen}"; - $statustxt =3D "$Lang::tr{'capsopen'}"; - }else { - $status =3D "${Header::colourred}"; - $statustxt =3D "$tustate[1]"; - } + if (-e "/var/run/$ovpnconfighash{$key}[1]n2n.pid") { + my ( @output, @tustate ) =3D ''; + my $tport =3D $ovpnconfighash{$key}[22]; + my $tnet =3D new Net::Telnet ( Timeout=3D>5, Errmode=3D>'return', Port= =3D>$tport);=20 + if ($tport ne '') { + $tnet->open('127.0.0.1'); + @output =3D $tnet->cmd(String =3D> 'state', Prompt =3D> '/(END.*\n|ERRO= R:.*\n)/'); + @tustate =3D split(/\,/, $output[1]); + $ovpntime =3D &WIO::contime(scalar localtime($tustate[0]), "ovpn"); + $ovpncheck =3D strftime("%d.%m.%Y - %H:%M:%S", localtime); + + if (($tustate[1] eq 'CONNECTED')) { + $status =3D "${Header::colourgreen}"; + $statustxt =3D "$Lang::tr{'capsopen'}"; + $ovpnrwip =3D $ovpnconfighash{$key}[11]; + } + else { + $status =3D "${Header::colourred}"; + $statustxt =3D "$tustate[1]"; } } } - else { - foreach (@ovpnstatus) { - if ( $_ =3D~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/ ) { - @match =3D split (m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/,= $_); - $match[1] =3D~ s/[_]/ /g; - } + } + else { + foreach (@ovpnstatus) { + if ( $_ =3D~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/ ) { + @match =3D split (m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, = $_); + $match[1] =3D~ s/[_]/ /g; + } =20 - if ( $match[1] ne "Common Name" && ($match[1] eq $ovpnconfighash{$key}[= 2]) ) { - $ovpnclt =3D $match[1]; - $ovpntime =3D &WIO::contime($match[5], "ovpn"); - } + if ( $match[1] ne "Common Name" && ($match[1] eq $ovpnconfighash{$key}[2= ]) ) { + $ovpnclt =3D $match[1]; + $ovpntime =3D &WIO::contime($match[5], "ovpn"); + } =20 - if ( $_ =3D~ /^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)= / ) { - @match =3D split(m/^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+= ),(.+)/, $_); - } + if ( $_ =3D~ /^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/= ) { + @match =3D split(m/^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+)= ,(.+)/, $_); + } =20 - if ( $match[1] ne "Virtual Address" && $match[2] eq $ovpnclt ) { - $ovpnrwip =3D $match[1]; - $ovpncheck =3D &WIO::statustime($match[4]); - } + if ( $match[1] ne "Virtual Address" && $match[2] eq $ovpnclt ) { + $ovpnrwip =3D $match[1]; + $ovpncheck =3D &WIO::statustime($match[4]); + } =20 - if ( $ovpnclt eq $ovpnconfighash{$key}[2] ) { - $status =3D "${Header::colourgreen}"; - $statustxt =3D "$Lang::tr{'capsopen'}"; - } - else { - $status =3D "${Header::colourred}"; - $statustxt =3D "$Lang::tr{'capsclosed'}"; - } + if ( $ovpnclt eq $ovpnconfighash{$key}[2] ) { + $status =3D "${Header::colourgreen}"; + $statustxt =3D "$Lang::tr{'capsopen'}"; + } + else { + $status =3D "${Header::colourred}"; + $statustxt =3D "$Lang::tr{'capsclosed'}"; } } -} + } + } =20 - print" - ".(defined($ovpncheck)? "$ovpncheck" : "-")." - ".(defined($ovpnrwip)? "$ovpnrwip" : "-")." +print" + ".(defined($ovpncheck) ? "$ovpncheck" : "-")." + ".($ovpnconfighash{$key}[2] eq '%auth-dn' ? "$ovpnconf= ighash{$key}[9]" : ($ovpnconfighash{$key}[4] eq 'cert' ? "$ovpnconfighash{$ke= y}[1]": "-"))." 3D'$text' - ".($ovpnconfighash{$key}[2] eq '%auth-dn' ? "$ovpnconf= ighash{$key}[9]" : ($ovpnconfighash{$key}[4] eq 'cert' ? "$ovpnconfighash{$ke= y}[2]": " "))." + ".($ovpnrwip ne '' ? "$ovpnrwip" : "-")."
$statustxt
- ".(defined($ovpntime)? "$ovpntime" : "-")." + ".(defined($ovpntime) ? "$ovpntime" : "-")." "; - if ($ovpnconfighash{$key}[25] && $wiosettings{'CLIENTREMARK'} eq 'on') { - print" $ovpnconfighash{$key}[25]"; - } =20 - print""; - $idovpn++ - } - print""; - &hrline(); +if ($wiosettings{'CLIENTREMARK'} eq 'on') { + print" ".($ovpnconfighash{$key}[25] ne '' ? "$ovpnconfighash{$key}[25]" : "-")."= "; +} + +print""; +$idovpn++ +} + +print""; +&hrline(); } -#} =20 ## client status =20 @@ -1424,9 +1429,9 @@ print" $Lang::tr{'wio_webinterface'} $Lang::tr{'wio ipadress'} $Lang::tr{'wio network'} - = $Lang::tr{'wio name'} - $Lang::tr{'wio image'} - + = $Lang::tr{'wio name'} + $Lang::tr{'wio image'} +
$Lang::tr{'wio_dyndns'}<= /b> $Lang::tr{'action'}=
@@ -1525,8 +1530,14 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipadd= resses[$a],'.'); next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && $netsettings{"RED_TYPE"= } eq 'PPPOE'); if ( $netsettings{"$ic"."_DEV"} eq $interface ) { if ( &General::IpInSubnet($ipaddresses[$a], $netsettings{"$ic"."_NETADD= RESS"}, $netsettings{"$ic"."_NETMASK"}) ) { - print"3D'$Lang::tr{$devs_alt[$in]}'"; - last SWITCH; + if ( $netsettings{"$ic"."_DEV"} eq 'red0' ) { + print"3D'$Lang::tr{'wio_red_lan'}'"; + } + else { + print"3D'$Lang::tr{$devs_alt[$in]}'"; + =09 + } + last SWITCH; } } $in++; @@ -1545,7 +1556,7 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipaddr= esses[$a],'.'); $vpnn2nmask =3D length($net[1]) - rindex($net[1],'.'); =20 if (substr($ipaddresses[$a],0,length($ipaddresses[$a])-$dotip) eq subst= r($vpnn2nip,0,length($vpnn2nip)-$vpnn2nmask)) { - print"3D'IPSec'"; + print"3D'IPsec'"; last SWITCH; } } @@ -1584,7 +1595,7 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipaddr= esses[$a],'.'); my $red_netaddress =3D Network::get_netaddress("$rednet[0]/$red_netmask"); =20 if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netmask= ) ) { - print"3D'$Lang::tr{'wio_red_lan'}'"; + print"3D'$Lang::tr{'internet'}'"; last SWITCH; } } @@ -1671,8 +1682,8 @@ print" "; =20 -if ($remark[$a] && $wiosettings{'CLIENTREMARK'} eq 'on') { - print" $= remark[$a]"; +if ($wiosettings{'CLIENTREMARK'} eq 'on') { + print" "= .($remark[$a] ne '' ? "$remark[$a]" : "-").""; } print""; } @@ -1898,7 +1909,7 @@ SWITCH: { my $red_netaddress =3D Network::get_netaddress("$rednet[0]/$red_netmask"); =20 if ( &General::IpInSubnet($line[1], $red_netaddress, $red_netmask) ) { - print"3D'$Lang::tr{'wio_red_lan'}'"; + print"3D'$Lang::tr{'internet'}'"; last SWITCH; } else { @@ -1949,32 +1960,32 @@ print"  
- $Lang::tr{'wio_import_csv'}  + $Lang::tr{'wio_import_csv'}  - +
 
- $Lang::tr{'wio_import_hosts'}  + $Lang::tr{'wio_import_hosts'}    - +
 
- $Lang::tr{'wio_import_fixleases'}  + $Lang::tr{'wio_import_fixleases'}    - +
"; } =20 -&hrline; +&hrline(); =20 print" @@ -1997,6 +2008,7 @@ print" foreach (keys(%ifacecolor)) { if ( $_ eq 'GREEN' ) { $color =3D "$Header::colourgreen"; $net =3D $Lang::t= r{'wio_net_scan_green'}; } elsif ( $_ eq 'BLUE' ) { $color =3D "$Header::colourblue"; $net =3D $Lang::= tr{'wio_net_scan_blue'}; } + elsif ( $_ eq 'RED' ) { $color =3D "$Header::colourred"; $net =3D $Lang::tr= {'wio_net_scan_red'}; } else { $color =3D "$Header::colourorange"; $net =3D $Lang::tr{'wio_net_scan= _orange'}; } =20 if ( $netsettings{"${_}_DEV"} eq 'disabled' || $netsettings{"${_}_DEV"} eq = '' || $netsettings{"${_}_ADDRESS"} eq '' ) { next; } @@ -2004,9 +2016,9 @@ foreach (keys(%ifacecolor)) { print < - + - + @@ -2149,14 +2161,6 @@ print"
$Lang::tr{'wio_net_scan_vl'} <= font color=3D'$color'>$net $Lang::tr{'wio_net_scan_l'} $netsettings{"${_}_DEV"} $Lang::tr{'wio_net_scan= _r'}
$Lang::tr{'wio_net_scan_l'} $net $Lang::tr{'wio_net_scan_r'} -
 
=20 ############################################################################= ################################################ =20 -sub back { - -print"
3D'$Lang::tr{'wio_back'}' 
"; - -} - -############################################################################= ################################################ - sub loadips { =20 &General::readhasharray($ipadrfile, \%ipshash); --=20 2.17.1 --===============7257883055010646396==--