From: Stephen Hemminger Date: Tue, 26 Sep 2006 00:08:40 +0000 (-0700) Subject: More TC patches from Jamal. X-Git-Tag: v2.6.19-061214~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=302d3fb720d920ca15b7bfb979532cc0e5d7f20f;p=thirdparty%2Fiproute2.git More TC patches from Jamal. Signed-off-by: Stephen Hemminger --- diff --git a/tc/m_action.c b/tc/m_action.c index e11d2f3bd..3808a860a 100644 --- a/tc/m_action.c +++ b/tc/m_action.c @@ -43,21 +43,22 @@ void act_usage(void) * with any action .so from the old days. But if someone really * does that, they would know how to fix this .. * - */ + */ fprintf (stderr, "usage: tc actions *\n"); fprintf(stderr, "Where: \tACTSPECOP := ACR | GD | FL\n" - "\tACR := add | change | replace * \n" - "\tGD := get | delete | *\n" - "\tFL := ls | list | flush | \n" - "\tACTNAMESPEC := action \n" - "\tACTISPEC := \n" - "\tACTSPEC := action [INDEXSPEC]\n" - "\tINDEXSPEC := index <32 bit indexvalue>\n" - "\tACTDETAIL := \n" - "\t\tExample ACTNAME is gact, mirred etc\n" - "\t\tEach action has its own parameters (ACTPARAMS)\n" - "\n"); + "\tACR := add | change | replace * \n" + "\tGD := get | delete | *\n" + "\tFL := ls | list | flush | \n" + "\tACTNAMESPEC := action \n" + "\tACTISPEC := \n" + "\tACTSPEC := action [INDEXSPEC]\n" + "\tINDEXSPEC := index <32 bit indexvalue>\n" + "\tACTDETAIL := \n" + "\t\tExample ACTNAME is gact, mirred etc\n" + "\t\tEach action has its own parameters (ACTPARAMS)\n" + "\n"); + exit(-1); } diff --git a/tc/m_gact.c b/tc/m_gact.c index ae75933bd..cfbaf874d 100644 --- a/tc/m_gact.c +++ b/tc/m_gact.c @@ -50,16 +50,17 @@ explain(void) "\tRANDTYPE := netrand | determ\n" "\tVAL : = value not exceeding 10000\n" "\tINDEX := index value used\n" - "\n"); + "\n"); #else fprintf(stderr, "Usage: ... gact [INDEX]\n"); fprintf(stderr, - "Where: \tACTION := reclassify | drop | continue | pass \n" + "Where: \tACTION := reclassify | drop | continue | pass \n" "\tINDEX := index value used\n" "\n"); #endif } + static void usage(void) { @@ -67,7 +68,6 @@ usage(void) exit(-1); } - int get_act(char ***argv_p) { @@ -180,7 +180,7 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struc argv++; ok++; } else if (matches(*argv, "help") == 0) { - usage(); + usage(); } } diff --git a/tc/tc_class.c b/tc/tc_class.c index 8d93b5a8f..049584e13 100644 --- a/tc/tc_class.c +++ b/tc/tc_class.c @@ -29,7 +29,7 @@ static void usage(void); static void usage(void) { - fprintf(stderr, "Usage: tc class [ add | del | change | replace ] dev STRING\n"); + fprintf(stderr, "Usage: tc class [ add | del | change | get ] dev STRING\n"); fprintf(stderr, " [ classid CLASSID ] [ root | parent CLASSID ]\n"); fprintf(stderr, " [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n"); fprintf(stderr, "\n"); diff --git a/tc/tc_filter.c b/tc/tc_filter.c index f3319d552..3341b13ff 100644 --- a/tc/tc_filter.c +++ b/tc/tc_filter.c @@ -32,7 +32,7 @@ static void usage(void); static void usage(void) { - fprintf(stderr, "Usage: tc filter [ add | del | change | replace ] dev STRING\n"); + fprintf(stderr, "Usage: tc filter [ add | del | change | get ] dev STRING\n"); fprintf(stderr, " [ pref PRIO ] [ protocol PROTO ]\n"); fprintf(stderr, " [ estimator INTERVAL TIME_CONSTANT ]\n"); fprintf(stderr, " [ root | classid CLASSID ] [ handle FILTERID ]\n"); diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c index 50b264976..76c78f2ef 100644 --- a/tc/tc_qdisc.c +++ b/tc/tc_qdisc.c @@ -29,7 +29,7 @@ static int usage(void); static int usage(void) { - fprintf(stderr, "Usage: tc qdisc [ add | del | replace | change ] dev STRING\n"); + fprintf(stderr, "Usage: tc qdisc [ add | del | replace | change | get ] dev STRING\n"); fprintf(stderr, " [ handle QHANDLE ] [ root | ingress | parent CLASSID ]\n"); fprintf(stderr, " [ estimator INTERVAL TIME_CONSTANT ]\n"); fprintf(stderr, " [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n");