Merge branch 'glendale' of git:/git/vyatta-cfg-qos into glendale

5 files changed, 101 insertions, 89 deletions

diff --git a/scripts/VyattaQosUtil.pm b/scripts/VyattaQosUtil.pm
index e6bef5c..145a627 100644
--- a/scripts/VyattaQosUtil.pm
+++ b/scripts/VyattaQosUtil.pm
@@ -16,18 +16,19 @@
 # **** End License ****
 
 package VyattaQosUtil;
-use POSIX;
 require Exporter;
-@EXPORT	= qw/getRate getSize getProtocol getDsfield getIfIndex interfaceRate/;
+@EXPORT	= qw/getRate getBurstSize getProtocol getDsfield getIfIndex interfaceRate/;
 use strict;
 
 sub get_num  {
+    use POSIX qw(strtod);
     my ($str) = @_;
-    
-    # clear errno
+    $str =~s/^\s+//;
+    $str =~s/\s+$//;
+
     $! = 0;
-    my ($num, $unparsed) = POSIX::strtod($str);
-    if (($str eq '') || $!) {
+    my ($num, $unparsed) = strtod($str);
+    if (($unparsed == length($str)) || $!) {
 	return;	# undefined (bad input)
     }
 
@@ -38,68 +39,80 @@ sub get_num  {
 ## get_rate("10mbit")
 # convert rate specification to number
 # from tc/tc_util.c
+
+my %rates = (
+    'bit'	=> 1,
+    'kibit'	=> 1024,
+    'kbit'	=> 1000.,
+    'mibit'	=> 1048576.,
+    'mbit'	=> 1000000.,
+    'gibit'	=> 1073741824.,
+    'gbit'	=> 1000000000.,
+    'tibit'	=> 1099511627776.,
+    'tbit'	=> 1000000000000.,
+    'bps'	=> 8.,
+    'kibps'	=> 8192.,
+    'kbps'	=> 8000.,
+    'mibps'	=> 8388608.,
+    'mbps'	=> 8000000.,
+    'gibps'	=> 8589934592.,
+    'gbps'	=> 8000000000.,
+    'tibps'	=> 8796093022208.,
+    'tbps'	=> 8000000000000.,
+);
+
 sub getRate {
     my $rate = shift;
     my ($num, $suffix) = get_num($rate);
 
-    defined $num or die "Invald bandwith string: $rate\n";
+    defined $num
+	or die "$rate is not a valid bandwidth (not a number)\n";
+    ($num >= 0)
+	or die "$rate is not a valid bandwidth (negative value)\n";
 
     if (defined $suffix) {
-      SWITCH: {
-	  ($suffix eq 'bit')	&& do { last SWITCH; };
-	  ($suffix eq 'kibit')	&& do { $num *= 1024.; last SWITCH };
-	  ($suffix eq 'kbit')	&& do { $num *= 1000.,; last SWITCH; };
-	  ($suffix eq 'mibit')	&& do { $num *= 1048576.,; last SWITCH; };
-	  ($suffix eq 'mbit')	&& do { $num *= 1000000.,; last SWITCH; };
-	  ($suffix eq 'gibit')	&& do { $num *= 1073741824.,; last SWITCH; };
-	  ($suffix eq 'gbit')	&& do { $num *= 1000000000.,; last SWITCH; };
-	  ($suffix eq 'tibit')	&& do { $num *= 1099511627776.,; last SWITCH; };
-	  ($suffix eq 'tbit')	&& do { $num *= 1000000000000.,; last SWITCH; };
-	  ($suffix eq 'bps')	&& do { $num *= 8.,; last SWITCH; };
-	  ($suffix eq 'kibps')	&& do { $num *= 8192.,; last SWITCH; };
-	  ($suffix eq 'kbps')	&& do { $num *= 8000.,; last SWITCH; };
-	  ($suffix eq 'mibps')	&& do { $num *= 8388608.,; last SWITCH; };
-	  ($suffix eq 'mbps')	&& do { $num *= 8000000.,; last SWITCH; };
-	  ($suffix eq 'gibps')	&& do { $num *= 8589934592.,; last SWITCH; };
-	  ($suffix eq 'gbps')	&& do { $num *= 8000000000.,; last SWITCH; };
-	  ($suffix eq 'tibps')	&& do { $num *= 8796093022208.,; last SWITCH; };
-	  ($suffix eq 'tbps')	&& do { $num *= 8000000000000.,; last SWITCH; };
-
-	  die "Unknown bandwidth suffix \"$suffix\"\n";
+	my $scale = $rates{lc $suffix};
+
+	if (defined $scale) {
+	    return $num * $scale;
 	}
+
+	die "$rate is not a valid bandwidth (unknown scale suffix)\n";
     } else {
 	# No suffix implies Kbps just as IOS
-	$num *= 1000;
+	return $num * 1000;
     }
-    
-    ($num >= 0) or die "Negative bandwidth not allowed\n";
-    return $num;
 }
 
-sub getSize {
+my %scales = (
+    'b'		=> 1,
+    'k'		=> 1024,
+    'kb'	=> 1024,
+    'kbit'	=> 1024/8,
+    'm'		=> 1024*1024,
+    'mb'	=> 1024*1024,
+    'mbit'	=> 1024*1024/8,
+    'g'		=> 1024*1024*1024, 
+    'gb'	=> 1024*1024*1024,
+);
+
+sub getBurstSize {
     my $size = shift;
     my ($num, $suffix) = get_num($size);
 
-    defined $num or die "Invald size string: $size\n";
+    defined $num 
+	or die "$size is not a valid burst size (not a number)\n";
+
+    ($num >= 0)
+	or die "$size is not a valid burst size (negative value)\n";
 
     if (defined $suffix) {
-      SWITCH: {
-	  ($suffix eq 'b')		&& do { $num *= 1.,; last SWITCH; };
-	  ($suffix eq 'k')		&& do { $num *= 1024.,; last SWITCH; };
-	  ($suffix eq 'kb')		&& do { $num *= 1024.,; last SWITCH; };
-	  ($suffix eq 'kbit')	&& do { $num *= 128.,; last SWITCH; };
-	  ($suffix eq 'm')		&& do { $num *= 1048576.,; last SWITCH; };
-	  ($suffix eq 'mb')		&& do { $num *= 1048576.,; last SWITCH; };
-	  ($suffix eq 'mbit')	&& do { $num *= 131072.,; last SWITCH; };
-	  ($suffix eq 'g')		&& do { $num *= 1073741824.,; last SWITCH; };
-	  ($suffix eq 'gb')		&& do { $num *= 1073741824.,; last SWITCH; };
-	  ($suffix eq 'gbit')	&& do { $num *= 134217728.,; last SWITCH; };
-	  
-	  die "Unknown suffix suffix \"$suffix\"\n";
-	}
+	my $scale = $scales{lc $suffix};
+	defined $scale or
+	    die "$size is not a valid burst size (unknown scale suffix)\n";
+	$num *= $scale;
     }
-    
-    $num >= 0 or  die "Negative size not allowed\n";
+
     return $num;
 }
 
@@ -131,7 +144,7 @@ sub getDsfield {
     # match number (or hex)
     if ($str =~ /^([0-9]+)|(0x[0-9a-fA-F]+)$/) {
 	if ($str < 0 || $str > 63) {
-	    die "$str is not a valid dscp value\n";
+	    die "$str is not a valid DSCP value\n";
 	}
 	# convert DSCP value to header value used by iproute
 	return $str << 2;
@@ -149,7 +162,7 @@ sub getDsfield {
     }
     close($ds) or die "read $dsFileName error\n";
     
-    (defined $match) or die "\"$str\" unknown dsfield value\n";
+    (defined $match) or die "\"$str\" unknown DSCP value\n";
     return $match;
 }
 
@@ -185,11 +198,10 @@ sub interfaceRate {
 ## ethtoolRate("eth0")
 # Fetch actual rate using ethtool and format to valid tc rate
 sub ethtoolRate {
-    my ($dev) = @_;
+    my $dev = shift;
     my $rate = undef;
 
-    open my $ethtool, "-|" 
-	or exec 'sudo', 'ethtool', $dev
+    open(my $ethtool, "/usr/sbin/ethtool $dev 2>&1 |")
  	or die "ethtool failed: $!\n";
 
     # ethtool produces:
diff --git a/scripts/vyatta-qos-util.pl b/scripts/vyatta-qos-util.pl
index 36d8a17..545e766 100755
--- a/scripts/vyatta-qos-util.pl
+++ b/scripts/vyatta-qos-util.pl
@@ -36,7 +36,7 @@ if ( defined $rate ) {
 }
 
 if ( defined $burst ) {
-    my $b = VyattaQosUtil::getSize($burst);
+    my $b = VyattaQosUtil::getBurstSize($burst);
     exit 0;
 }
 
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
index b470e0e..0f7ae00 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
@@ -5,14 +5,14 @@ allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
 comp_help: <0-63> Differentiated Services Codepoint (DSCP) value
-    default  	match dscp (000000)
-    reliability	match dscp (000001)
-    throughput	match dscp (000010)
-    lowdelay	match dscp (000100)
-    priority	match dscp (001000)
-    immediate	match dscp (010000)
-    flash       match dscp (011000)
-    flash-override match dscp (100000)
-    critical 	match dscp (101000)
-    internet	match dscp (110000)
-    network	match dscp (111000)
+    default  	match DSCP (000000)
+    reliability	match DSCP (000001)
+    throughput	match DSCP (000010)
+    lowdelay	match DSCP (000100)
+    priority	match DSCP (001000)
+    immediate	match DSCP (010000)
+    flash       match DSCP (011000)
+    flash-override match DSCP (100000)
+    critical 	match DSCP (101000)
+    internet	match DSCP (110000)
+    network	match DSCP (111000)
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/set-dscp/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/set-dscp/node.def
index 9fcc608..66951ea 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/set-dscp/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/set-dscp/node.def
@@ -5,14 +5,14 @@ allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
 comp_help: <0-63> Differentiated Services Codepoint (DSCP) value
-    default  	set dscp to (000000)
-    reliability	set dscp to (000001)
-    throughput	set dscp to (000010)
-    lowdelay	set dscp to (000100)
-    priority	set dscp to (001000)
-    immediate	set dscp to (010000)
-    flash       set dscp to (011000)
-    flash-override set dscp to  (100000)
-    critical 	set dscp to (101000)
-    internet	set dscp to (110000)
-    network	set dscp to (111000)
+    default  	set DSCP to (000000)
+    reliability	set DSCP to (000001)
+    throughput	set DSCP to (000010)
+    lowdelay	set DSCP to (000100)
+    priority	set DSCP to (001000)
+    immediate	set DSCP to (010000)
+    flash       set DSCP to (011000)
+    flash-override set DSCP to  (100000)
+    critical 	set DSCP to (101000)
+    internet	set DSCP to (110000)
+    network	set DSCP to (111000)
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def
index 9fcc608..66951ea 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def
@@ -5,14 +5,14 @@ allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
 comp_help: <0-63> Differentiated Services Codepoint (DSCP) value
-    default  	set dscp to (000000)
-    reliability	set dscp to (000001)
-    throughput	set dscp to (000010)
-    lowdelay	set dscp to (000100)
-    priority	set dscp to (001000)
-    immediate	set dscp to (010000)
-    flash       set dscp to (011000)
-    flash-override set dscp to  (100000)
-    critical 	set dscp to (101000)
-    internet	set dscp to (110000)
-    network	set dscp to (111000)
+    default  	set DSCP to (000000)
+    reliability	set DSCP to (000001)
+    throughput	set DSCP to (000010)
+    lowdelay	set DSCP to (000100)
+    priority	set DSCP to (001000)
+    immediate	set DSCP to (010000)
+    flash       set DSCP to (011000)
+    flash-override set DSCP to  (100000)
+    critical 	set DSCP to (101000)
+    internet	set DSCP to (110000)
+    network	set DSCP to (111000)