netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andreas Henriksson <andreas@fatal.se>
To: shemminger@linux-foundation.org
Cc: netdev@vger.kernel.org, Lionel Elie Mamane <lionel@mamane.lu>,
	Andreas Henriksson <andreas@fatal.se>
Subject: [PATCH 08/12] Fix ematch cmp and nbyte syntax help text.
Date: Fri, 12 Oct 2007 10:56:43 +0200	[thread overview]
Message-ID: <1192179407-22461-8-git-send-email-andreas@fatal.se> (raw)
In-Reply-To: <1192179407-22461-7-git-send-email-andreas@fatal.se>

From: Lionel Elie Mamane <lionel@mamane.lu>

The help/usage screen of ematch cmp and nbyte say recognised symbolic
values for "layer FOO" are link, header and next-header, but the code
does _not_ implement that: it will recognise "next-header" as what is
supposed to be "header" and will not recognise "header". The right
symbolic values seem to be link, network, transport. Here is a patch
that changes the help/usage screen to match the code.
(http://bugs.debian.org/438653)

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
---
 tc/em_cmp.c   |    4 ++--
 tc/em_nbyte.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tc/em_cmp.c b/tc/em_cmp.c
index b8f9b46..ce72a42 100644
--- a/tc/em_cmp.c
+++ b/tc/em_cmp.c
@@ -1,5 +1,5 @@
 /*
- * em_cmp.c		Simle coparison Ematch
+ * em_cmp.c		Simple comparison Ematch
  *
  *		This program is free software; you can distribute it and/or
  *		modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@ static void cmp_print_usage(FILE *fd)
 	    "Usage: cmp(ALIGN at OFFSET [ ATTRS ] { eq | lt | gt } VALUE)\n" \
 	    "where: ALIGN  := { u8 | u16 | u32 }\n" \
 	    "       ATTRS  := [ layer LAYER ] [ mask MASK ] [ trans ]\n" \
-	    "       LAYER  := { link | header | next-header | 0..%d }\n" \
+	    "       LAYER  := { link | network | transport | 0..%d }\n" \
 	    "\n" \
 	    "Example: cmp(u16 at 3 layer 2 mask 0xff00 gt 20)\n",
 	    TCF_LAYER_MAX);
diff --git a/tc/em_nbyte.c b/tc/em_nbyte.c
index 98f9883..242c361 100644
--- a/tc/em_nbyte.c
+++ b/tc/em_nbyte.c
@@ -32,7 +32,7 @@ static void nbyte_print_usage(FILE *fd)
 	    "Usage: nbyte(NEEDLE at OFFSET [layer LAYER])\n" \
 	    "where: NEEDLE := { string | \"c-escape-sequence\" }\n" \
 	    "       OFFSET := int\n" \
-	    "       LAYER  := { link | header | next-header | 0..%d }\n" \
+	    "       LAYER  := { link | network | transport | 0..%d }\n" \
 	    "\n" \
 	    "Example: nbyte(\"ababa\" at 12 layer 1)\n",
 	    TCF_LAYER_MAX);
-- 
1.5.3.4


  reply	other threads:[~2007-10-12  8:57 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-12  8:56 [PATCH 01/12] Fix various typos and nitpicks Andreas Henriksson
2007-10-12  8:56 ` [PATCH 02/12] Add parameters to usage help text Andreas Henriksson
2007-10-12  8:56   ` [PATCH 03/12] Prevent renaming interfaces to empty string Andreas Henriksson
2007-10-12  8:56     ` [PATCH 04/12] Fix up various problems in netbug script Andreas Henriksson
2007-10-12  8:56       ` [PATCH 05/12] Fix typo in tunnel code (o_key vs. i_key) Andreas Henriksson
2007-10-12  8:56         ` [PATCH 06/12] Remove bogus reference to tc-filters(8) from tc(8) manpage Andreas Henriksson
2007-10-12  8:56           ` [PATCH 07/12] Fix corruption when using batch files with comments and broken lines Andreas Henriksson
2007-10-12  8:56             ` Andreas Henriksson [this message]
2007-10-12  8:56               ` [PATCH 09/12] Add new rtacct/nstat manpages and additional symlinks Andreas Henriksson
2007-10-12  8:56                 ` [PATCH 10/12] Fix off-by-one in print of wrandom algo Andreas Henriksson
2007-10-12  8:56                   ` [PATCH 11/12] Fix overflow in time2tick / tick2time Andreas Henriksson
2007-10-12  8:56                     ` [PATCH 12/12] Drop bogus reference to tc-filters and add lartc.org link to manpage Andreas Henriksson
2007-10-12 21:50                       ` Stephen Hemminger
2007-10-12 22:49                         ` Patrick McHardy
2007-10-17 16:50                         ` Andreas Henriksson
2007-10-17 17:05                           ` Stephen Hemminger
2007-10-17 17:58                             ` Andreas Henriksson
2007-10-17 18:02                               ` Stephen Hemminger
2007-10-18  8:13                                 ` Andreas Henriksson
2007-10-12 21:39                   ` [PATCH 10/12] Fix off-by-one in print of wrandom algo Stephen Hemminger
2007-10-12 17:14       ` [PATCH 04/12] Fix up various problems in netbug script Stephen Hemminger
2007-10-12 17:39         ` Andreas Henriksson
2007-10-12 12:01     ` [PATCH 03/12] Prevent renaming interfaces to empty string Patrick McHardy
2007-10-12 17:07     ` Stephen Hemminger
2007-10-12 17:45       ` Andreas Henriksson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1192179407-22461-8-git-send-email-andreas@fatal.se \
    --to=andreas@fatal.se \
    --cc=lionel@mamane.lu \
    --cc=netdev@vger.kernel.org \
    --cc=shemminger@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).