X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Fwio%2Fwio.cgi;fp=src%2Fwio%2Fwio.cgi;h=1645aa54eb75dc63d0c4348abf56ed7765d18da5;hp=c51910f4db483863e58be6bf505815cedf2d08e4;hb=2f422374878c6923983de526e0146dc184422417;hpb=606efa9c2a1515fdb76e2f710b2237335d1584ce diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index c51910f4db..1645aa54eb 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -1504,7 +1504,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); $ic = "${_}"; foreach $interface (@devs_net) { - next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE')); + 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"."_NETADDRESS"}, $netsettings{"$ic"."_NETMASK"}) ) { print"$Lang::tr{$devs_alt[$in]}"; @@ -1558,7 +1558,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); } } - if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') { + if ( $netsettings{"RED_TYPE"} eq 'PPPOE' ) { my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"'; my @rednet = split ("/", $redipadr); chomp ($rednet[1]); @@ -1569,10 +1569,10 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); print"$Lang::tr{"; last SWITCH; } - else { + } + else { print"$Lang::tr{"; last SWITCH; - } } } @@ -1872,7 +1872,7 @@ SWITCH: { } } - if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') { + if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE' || $netsettings{"RED_TYPE"} eq 'STATIC') { my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"'; my @rednet = split ("/", $redipadr); chomp ($rednet[1]);