Squidupdate und QoS-Fix.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / netstatus.cgi

diff --git a/html/cgi-bin/netstatus.cgi b/html/cgi-bin/netstatus.cgi
index 577e2ccd9be644937b797808a474d54117d4579b..f5aba5051005ad8b36f3f4c9282d8fd38dcc861a 100644 (file)
--- a/html/cgi-bin/netstatus.cgi
+++ b/html/cgi-bin/netstatus.cgi
@@ -6,8 +6,6 @@
 #
 # (c) The SmoothWall Team
 #
-# $Id: netstatus.cgi,v 1.9.2.20 2005/11/05 15:46:25 gespinasse Exp $
-#
 
 use strict;
 
@@ -15,7 +13,7 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -33,25 +31,8 @@ my $output='';
 
 &Header::openbigbox('100%', 'left');
 
-print "<table width='100%' cellspacing='0' cellpadding='5'border='0'>\n";
-print "<tr><td style='background-color: #EAE9EE;' align='left'>\n";
-print "<a href='#interfaces'>$Lang::tr{'interfaces'}</a> |\n";
-if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/  && $netsettings{'RED_TYPE'} eq "DHCP") {
-    print "<a href='#reddhcp'>RED  $Lang::tr{'dhcp configuration'}</a> |\n";
-}
-if ($dhcpsettings{'ENABLE_GREEN'} eq 'on' || $dhcpsettings{'ENABLE_BLUE'} eq 'on') {
-    print "<a href='#leases'>$Lang::tr{'current dynamic leases'}</a> |\n";
-}
-if ($pppsettings{'TYPE'} =~ /^(bewanadsl|alcatelusbk|conexantpciadsl|eagleusbadsl)$/) {
-    print "<a href='#adsl'>$Lang::tr{'adsl settings'}</a> |\n";
-}
-print "<a href='#routing'>$Lang::tr{'routing table entries'}</a> |\n";
-print "<a href='#arp'> $Lang::tr{'arp table entries'}</a>\n";
-print "</td></tr></table>\n";
-
-print "<a name='interfaces'/>\n";
 &Header::openbox('100%', 'left', $Lang::tr{'interfaces'});
-$output = `/sbin/ifconfig -a`;
+$output = `/sbin/ip addr show`;
 $output = &Header::cleanhtml($output,"y");
 
 my @itfs = ('ORANGE','BLUE','GREEN');
@@ -162,57 +143,14 @@ if ($dhcpsettings{'ENABLE_GREEN'} eq 'on' || $dhcpsettings{'ENABLE_BLUE'} eq 'on
        &Header::PrintActualLeases;
 }
 
-if ( $netsettings{'CONFIG_TYPE'} =~ /^(0|1|4|5)$/  && (exists($pppsettings{'TYPE'})) ) {
-
-my $output1='';
-my $output2='';
-if ($pppsettings{'TYPE'} eq 'bewanadsl') {
-       print "<a name='adsl'/>\n";
-       &Header::openbox('100%', 'left', $Lang::tr{'adsl settings'});
-       $output1 = `/usr/bin/unicorn_status`;
-       $output1 = &Header::cleanhtml($output1,"y");
-       $output2 = `/bin/cat /proc/net/atm/UNICORN:*`;
-       $output2 = &Header::cleanhtml($output2,"y");
-       print "<pre>$output1$output2</pre>\n";
-       &Header::closebox();
-}
-if ($pppsettings{'TYPE'} eq 'alcatelusbk') {
-       print "<a name='adsl'/>\n";
-       &Header::openbox('100%', 'left', $Lang::tr{'adsl settings'});
-       $output = `/bin/cat /proc/net/atm/speedtch:*`;
-       $output = &Header::cleanhtml($output,"y");
-       print "<pre>$output</pre>\n";
-       &Header::closebox();
-}
-if ($pppsettings{'TYPE'} eq 'conexantpciadsl') {
-       print "<a name='adsl'/>\n";
-       &Header::openbox('100%', 'left', $Lang::tr{'adsl settings'});
-       $output = `/bin/cat /proc/net/atm/CnxAdsl:*`;
-       $output = &Header::cleanhtml($output,"y");
-       print "<pre>$output</pre>\n";
-       &Header::closebox();
-}
-if ($pppsettings{'TYPE'} eq 'eagleusbadsl') {
-       print "<a name='adsl'/>\n";
-       &Header::openbox('100%', 'left', $Lang::tr{'adsl settings'});
-       $output = `/usr/sbin/eaglestat`;
-       $output = &Header::cleanhtml($output,"y");
-       print "<pre>$output</pre>\n";
-       &Header::closebox();
-}
-
-}
-
-print "<a name='routing'/>\n";
 &Header::openbox('100%', 'left', $Lang::tr{'routing table entries'});
-$output = `/sbin/route -n`;
+$output = `/sbin/ip show show`;
 $output = &Header::cleanhtml($output,"y");
 print "<pre>$output</pre>\n";
 &Header::closebox();
 
-print "<a name='arp'/>\n";
 &Header::openbox('100%', 'left', $Lang::tr{'arp table entries'});
-$output = `/sbin/arp -n`;
+$output = `/sbin/ip neigh show`;
 $output = &Header::cleanhtml($output,"y");
 print "<pre>$output</pre>\n";
 &Header::closebox();