From e956fa4071b05e427b260ee3332ac06afc91dde4 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 6 Feb 2008 12:04:55 -0800
Subject: rename dsfield to dscp

And add more help text.
---
 scripts/VyattaQosMatch.pm                                           | 2 +-
 scripts/vyatta-qos-util.pl                                          | 5 +++--
 .../node.tag/class/node.tag/match/node.tag/ip/dscp/node.def         | 6 ++++++
 .../node.tag/class/node.tag/match/node.tag/ip/dsfield/node.def      | 3 ---
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
 delete mode 100644 templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dsfield/node.def

diff --git a/scripts/VyattaQosMatch.pm b/scripts/VyattaQosMatch.pm
index 31ddf36..4b2e3fe 100644
--- a/scripts/VyattaQosMatch.pm
+++ b/scripts/VyattaQosMatch.pm
@@ -36,7 +36,7 @@ sub _define {
     if ($config->exists("ip")) {
 	my %ip;
 
-	$ip{dsfield} = VyattaQosUtil::getDsfield( $config->returnValue("ip dsfield"));
+	$ip{dsfield} = VyattaQosUtil::getDsfield( $config->returnValue("ip dscp"));
 	$ip{protocol} = VyattaQosUtil::getProtocol($config->returnValue("ip protocol"));
 	$ip{src} = $config->returnValue("ip source address");
 	$ip{dst} = $config->returnValue("ip destination address");
diff --git a/scripts/vyatta-qos-util.pl b/scripts/vyatta-qos-util.pl
index 5dd869f..6ea1155 100755
--- a/scripts/vyatta-qos-util.pl
+++ b/scripts/vyatta-qos-util.pl
@@ -12,7 +12,8 @@ GetOptions(
     "rate=s"     => \$rate,
     "burst=s"    => \$burst,
     "protocol=s" => \$protocol,
-    "dsfield=s"  => \$dsfield,
+    "dscp=s"	 => \$dsfield,
+    "tos=s"	 => \$dsfield,
 );
 
 if ( defined $rate ) {
@@ -39,6 +40,6 @@ print <<EOF;
 usage: vyatta-qos-util.pl --rate rate
        vyatta-qos-util.pl --burst size
        vyatta-qos-util.pl --protocol protocol
-       vyatta-qos-util.pl --dsfield tos|dsfield
+       vyatta-qos-util.pl --dscp tos|dsfield
 EOF
 exit 1;
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
new file mode 100644
index 0000000..cdd4260
--- /dev/null
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
@@ -0,0 +1,6 @@
+type: txt
+help: Match DSCP (formerly known as TOS) value
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp \"$VAR(@)\""
+comp_help: Differentiated Services Condepoint (DSCP) value
+    <number>   decimal number (or 0x for hex)
+or  <name>     standard name from /etc/iproute2/rt_dsfield 
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dsfield/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dsfield/node.def
deleted file mode 100644
index 38160f7..0000000
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dsfield/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Match dsfield/TOS: either hexadecimal number (0x10) or identifier
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dsfield \"$VAR(@)\""
-- 
cgit v1.2.3