X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fspeed.cgi;h=4468abd900804ba60d0388124cb877b6b07a3025;hp=951fe843d07d60e3165449e13a71fbe34fd77340;hb=b128fe7e69304ee26a293d508e31bd7f63c12f2d;hpb=3ef6c343e00a6e186e1bcedad9b8bb6d3f324df9
diff --git a/html/cgi-bin/speed.cgi b/html/cgi-bin/speed.cgi
index 951fe843d..4468abd90 100644
--- a/html/cgi-bin/speed.cgi
+++ b/html/cgi-bin/speed.cgi
@@ -1,11 +1,23 @@
#!/usr/bin/perl
-#
-# IPFire CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The IPFire Team
-#
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see . #
+# #
+###############################################################################
my $data_last = $ENV{'QUERY_STRING'};
my $rxb_last = 0;
@@ -24,7 +36,8 @@ foreach $field (@fields) {
}
}
-my @data_now = `ip -s link show red0`;
+my $interface = `cat /var/ipfire/red/iface 2>/dev/null`;
+my @data_now = `ip -s link show $interface 2>/dev/null`;
my $lastline;
my $rxb_now = 0;
@@ -46,8 +59,8 @@ my $txb_diff = $txb_now - $txb_last;
if(( $rxb_diff == $rxb_now ) && ( $txb_diff == $txb_now ))
{
- $rx_kbs = "0.00";
- $tx_kbs = "0.00";
+ $rx_kbs = "0";
+ $tx_kbs = "0";
}
else
{
@@ -59,6 +72,7 @@ else
$tx_kbs = int($tx_kbs);
}
+print "pragma: no-cache\n";
print "Content-type: text/xml\n\n";
print "\n";
print <