From: PJ Waskiewicz Date: Wed, 13 Feb 2008 11:49:09 +0000 (-0800) Subject: Update various classifiers' help output for expected CLASSID syntax X-Git-Tag: v2.6.25~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9acc2420c561a6f875d188de1028facbd09c5a8;p=thirdparty%2Fiproute2.git 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 Signed-off-by: Stephen Hemminger --- diff --git a/doc/actions/actions-general b/doc/actions/actions-general index 6561edac4..70f7cd652 100644 --- 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 1d1a54008..ad4163331 100644 --- 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 6d1490b46..b51173567 100644 --- 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 a41b9d59c..67dd49c0d 100644 --- 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 13fcf9790..7e1e6d92e 100644 --- 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 91f2838b7..d75e76c26 100644 --- 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)