Merge branch 'master' into next

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

diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi
old mode 100755 (executable)
new mode 100644 (file)
index 52da9c8..1809abf
--- a/html/cgi-bin/netother.cgi
+++ b/html/cgi-bin/netother.cgi
@@ -44,7 +44,7 @@ $querry[1] = 'hour' unless defined $querry[1];
 if ( $querry[0] =~ "fwhits"){
        print "Content-type: image/png\n\n";
        binmode(STDOUT);
-       &Graphs::updatefwhitsgraph($querry[0],$querry[1]);
+       &Graphs::updatefwhitsgraph($querry[1]);
 }elsif ( $querry[0] ne ""){
        print "Content-type: image/png\n\n";
        binmode(STDOUT);
@@ -55,7 +55,7 @@ if ( $querry[0] =~ "fwhits"){
        &Header::openpage($Lang::tr{'network traffic graphs others'}, 1, '');
        &Header::openbigbox('100%', 'left');
        
-       my @pinggraphs = `ls -dA /var/log/rrd/collectd/localhost/ping/*`;
+       my @pinggraphs = `ls -dA /var/log/rrd/collectd/localhost/ping/ping-*`;
        foreach (@pinggraphs){
                $_ =~ /(.*)\/ping\/ping-(.*)\.rrd/;
                push(@pings,$2);
@@ -71,6 +71,20 @@ if ( $querry[0] =~ "fwhits"){
        &Graphs::makegraphbox("netother.cgi","fwhits","day");
        &Header::closebox();
 
+       my $output = '';
+       
+       &Header::openbox('100%', 'left', $Lang::tr{'routing table entries'});
+       $output = `/sbin/ip route show`;
+       $output = &Header::cleanhtml($output,"y");
+       print "<pre>$output</pre>\n";
+       &Header::closebox();
+
+       &Header::openbox('100%', 'left', $Lang::tr{'arp table entries'});
+       $output = `/sbin/ip neigh show`;
+       $output = &Header::cleanhtml($output,"y");
+       print "<pre>$output</pre>\n";
+       &Header::closebox();
+
        &Header::closebigbox();
        &Header::closepage();
 }