Update various classifiers' help output for expected CLASSID syntax

update: Fix the spelling of "hexidecimal"

This updates the help output to specify that CLASSID should be hexidecimal.
This makes sure that a user entering "flowid 1:10" gets his flow put into
band 15 (0x10) and knows why.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>

diff --git a/doc/actions/actions-general b/doc/actions/actions-general
index 6561edac47a1cda24604682fc1a6ad50946cf89c..70f7cd6528f1c1ea3fc2df9b9516ccfcf7dee7f0 100644 (file)
--- a/doc/actions/actions-general
+++ b/doc/actions/actions-general
@@ -88,6 +88,9 @@ tc filter add dev lo parent ffff: protocol ip prio 8 u32 \
 match ip dst 127.0.0.8/32 flowid 1:12 \
 action ipt -j mark --set-mark 2
 
+NOTE: flowid 1:12 is parsed flowid 0x1:0x12.  Make sure if you want flowid
+decimal 12, then use flowid 1:c.
+
 3) A feature i call pipe
 The motivation is derived from Unix pipe mechanism but applied to packets.
 Essentially take a matching packet and pass it through 

diff --git a/tc/f_basic.c b/tc/f_basic.c
index 1d1a54008a72fc6aa25aa6a29a2c1cd0e6ed4354..ad41633311813c1c0d56122e66341d03376276a6 100644 (file)
--- a/tc/f_basic.c
+++ b/tc/f_basic.c
@@ -32,6 +32,7 @@ static void explain(void)
        fprintf(stderr, "\n");
        fprintf(stderr, "Where: SELECTOR := SAMPLE SAMPLE ...\n");
        fprintf(stderr, "       FILTERID := X:Y:Z\n");
+       fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n");
 }
 
 static int basic_parse_opt(struct filter_util *qu, char *handle,

diff --git a/tc/f_fw.c b/tc/f_fw.c
index 6d1490b46a16c00bda68ff92fcac7a919c386de3..b511735671f440f65709bf54a6f8523a9266b9e2 100644 (file)
--- a/tc/f_fw.c
+++ b/tc/f_fw.c
@@ -28,6 +28,7 @@ static void explain(void)
        fprintf(stderr, "Usage: ... fw [ classid CLASSID ] [ police POLICE_SPEC ]\n");
        fprintf(stderr, "       POLICE_SPEC := ... look at TBF\n");
        fprintf(stderr, "       CLASSID := X:Y\n");
+       fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n");
 }
 
 #define usage() return(-1)

diff --git a/tc/f_route.c b/tc/f_route.c
index a41b9d59c9bb7e5f771aaeb99d94e0284b03dedb..67dd49c0d8e262abe4c0548f4a53a9b2f1ccf4cb 100644 (file)
--- a/tc/f_route.c
+++ b/tc/f_route.c
@@ -31,6 +31,7 @@ static void explain(void)
        fprintf(stderr, "                [ flowid CLASSID ] [ police POLICE_SPEC ]\n");
        fprintf(stderr, "       POLICE_SPEC := ... look at TBF\n");
        fprintf(stderr, "       CLASSID := X:Y\n");
+       fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n");
 }
 
 #define usage() return(-1)

diff --git a/tc/f_rsvp.c b/tc/f_rsvp.c
index 13fcf9790680a49739821f3919a610b4cac3f1d6..7e1e6d92ec4723cb6a3f4b821f6b602f59996542 100644 (file)
--- a/tc/f_rsvp.c
+++ b/tc/f_rsvp.c
@@ -34,6 +34,7 @@ static void explain(void)
        fprintf(stderr, "                u{8|16|32} NUMBER mask MASK at OFFSET}\n");
        fprintf(stderr, "       POLICE_SPEC := ... look at TBF\n");
        fprintf(stderr, "       FILTERID := X:Y\n");
+       fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n");
 }
 
 #define usage() return(-1)

diff --git a/tc/f_u32.c b/tc/f_u32.c
index 91f2838b7b3710473728980fdf269d22861bbd0c..d75e76c26e39b44eccd8711e858e45e4181bdd5d 100644 (file)
--- a/tc/f_u32.c
+++ b/tc/f_u32.c
@@ -36,6 +36,7 @@ static void explain(void)
        fprintf(stderr, "Where: SELECTOR := SAMPLE SAMPLE ...\n");
        fprintf(stderr, "       SAMPLE := { ip | ip6 | udp | tcp | icmp | u{32|16|8} | mark } SAMPLE_ARGS [divisor DIVISOR]\n");
        fprintf(stderr, "       FILTERID := X:Y:Z\n");
+       fprintf(stderr, "\nNOTE: CLASSID is parsed at hexadecimal input.\n");
 }
 
 #define usage() return(-1)