X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fspeed.cgi;h=b714d679cf4fa0fea72d6e0ad881499d5100af03;hp=3436dd3b3a7e455677f8279bfbea1109a18bfcc4;hb=f63935b14af95fdeb2ae0324f4e8ddecd9c495c1;hpb=16f6c28c8950259587f18d8c93729dcd2fdd0c46

diff --git a/html/cgi-bin/speed.cgi b/html/cgi-bin/speed.cgi
index 3436dd3b3a..b714d679cf 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 my $data_last = $ENV{'QUERY_STRING'};
 my $rxb_last = 0;
@@ -24,7 +36,9 @@ foreach $field (@fields) {
 	}
 }
 
-my @data_now = `ip -s link show red0`;
+
+my $interface = `cat /var/ipfire/red/iface`;
+my @data_now = `ip -s link show $interface`;
 
 my $lastline;
 my $rxb_now = 0;
@@ -46,19 +60,20 @@ 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
 {
 	$rx_kbs = $rxb_diff / 1024;
-	$rx_kbs = $rx_kbs / 2.2;
+	$rx_kbs = $rx_kbs / 3.2;
 	$rx_kbs = int($rx_kbs);
 	$tx_kbs = $txb_diff / 1024;
-	$tx_kbs = $tx_kbs / 2.2;
+	$tx_kbs = $tx_kbs / 3.2;
 	$tx_kbs = int($tx_kbs);
 }
 
+print "pragma: no-cache\n";
 print "Content-type: text/xml\n\n";
 print "<?xml version=\"1.0\"?>\n";
 print <<END