From d624332941e7dce96abba8ab33e827fd02cc13b6 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 20 Mar 2007 01:16:51 +0000
Subject: [PATCH] More TC fixes

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5589 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 New/Shorewall/Tc.pm | 19 ++++++++++++-------
 New/compiler.pl     |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/New/Shorewall/Tc.pm b/New/Shorewall/Tc.pm
index 949dc2e00..a5d8e03c6 100644
--- a/New/Shorewall/Tc.pm
+++ b/New/Shorewall/Tc.pm
@@ -296,7 +296,7 @@ sub rate_to_kbit( $ ) {
 }
 
 sub calculate_quantum( $ ) {
-    my $rate = $_[0];
+    my $rate = rate_to_kbit $_[0];
     
     eval "int( ( $rate * 128 ) / $r2q )";
 }    
@@ -307,9 +307,12 @@ sub validate_tc_device( $$$ ) {
     fatal_error "Duplicate device ( $device ) in tcdevice \"$line\""    if $tcdevices{$device};
     fatal_error "Invalid device name ( $device ) in tcdevice \"$line\"" if $device =~ /[:+]/;
 
+    rate_to_kbit $inband;
+    rate_to_kbit $outband;
+
     $tcdevices{$device} = {};
-    $tcdevices{$device}{in_bandwidth}  = rate_to_kbit $inband;
-    $tcdevices{$device}{out_bandwidth} = rate_to_kbit $outband;
+    $tcdevices{$device}{in_bandwidth}  = $inband;
+    $tcdevices{$device}{out_bandwidth} = $outband;
     
     push @tcdevices, $device;
 }
@@ -319,7 +322,9 @@ sub convert_rate( $$ ) {
 
     $rate =~ s/\bfull\b/$full/g;
 
-    eval "int( $rate )";
+    $rate = eval "int( $rate )";
+
+    "${rate}kbit";
 }
 
 sub validate_tc_class( $$$$$$ ) {
@@ -333,7 +338,7 @@ sub validate_tc_class( $$$$$$ ) {
     
     my $devref = $tcdevices{$device};
     fatal_error "Unknown Device ( $device ) in tcclass \"$line\"" unless $devref;
-    my $full  = $devref->{out_bandwidth};
+    my $full  = rate_to_kbit $devref->{out_bandwidth};
 
     $tcclasses{$device} = {} unless $tcclasses{$device};
     my $tcref = $tcclasses{$device};
@@ -435,13 +440,13 @@ sub setup_traffic_shaping() {
 	emit "qt tc qdisc del dev $device root";
 	emit "qt tc qdisc del dev $device ingress";
 	emit "${dev}_mtu=\$(get_device_mtu $device)";
-	emit qq(run_tc "class add dev $device parent $devnum: classid $devnum:1 htb rate $devref->{out_bandwidth} mtu \$${dev}_mtu");
+	emit "run_tc class add dev $device parent $devnum: classid $devnum:1 htb rate $devref->{out_bandwidth} mtu \$${dev}_mtu";
 	
 	my $inband = rate_to_kbit $devref->{in_bandwidth};
 
 	if ( $inband ) {
 	    emit "run_tc add dev $device handle ffff: ingress";
-	    emit "run_tc filter add dev $device parent ffff: protocol ip prio 50 u32 match ip src 0.0.0.0/0 police rate $inband burst 10k drop flowid :1";
+	    emit "run_tc filter add dev $device parent ffff: protocol ip prio 50 u32 match ip src 0.0.0.0/0 police rate ${inband} burst 10k drop flowid :1";
 	}
 
 	$devref->{number} = $devnum++; 
diff --git a/New/compiler.pl b/New/compiler.pl
index 8df30d9e7..17468f932 100755
--- a/New/compiler.pl
+++ b/New/compiler.pl
@@ -482,7 +482,7 @@ sub generate_script_2 () {
     for my $interface ( @{find_interfaces_by_option 'norfc1918'} ) {
 	emit "addr=\$(ip -f inet addr show $interface 2> /dev/null | grep 'inet\ ' | head -n1)";
 	emit 'if [ -n "$addr" ]; then';
-	emit "    addr=\$(echo \$addr | sed 's/inet //;s/\/.*//;s/ peer.*//')";
+	emit q(    addr=$(echo $addr | sed 's/inet //;s/\/.*//;s/ peer.*//'));
 	emit '    for network in 10.0.0.0/8 176.16.0.0/12 192.168.0.0/16; do';
         emit '        if in_network $addr $network; then';
         emit "            startup_error \"The 'norfc1918' option has been specified on an interface with an RFC 1918 address. Interface:$interface\"";