| Message ID | 20190315105026.67892-1-ldir@darbyshire-bryant.me.uk |
|---|---|
| State | Accepted |
| Delegated to: | stephen hemminger |
| Headers | show |
| Series | [iproute2-next] tc: m_connmark: fix action error messages | expand |
On Fri, 15 Mar 2019 10:50:45 +0000 Kevin 'ldir' Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> wrote: > action m_connmark returns error messages identifying itself as the > 'simple' action instead of 'connmark' action. e.g. > > tc filter add dev eth0 protocol all u32 match u32 0 0 flowid 1:1 \ > action connmark index wrong > simple: Illegal "index" > bad action parsing > parse_action: bad value (3:connmark)! > Illegal "action" > > In what is most likely a copy/paste error from the simple action example > code, fix connmark error messages to identify themselves as coming from > connmark. > > tc filter add dev eth0 protocol all u32 match u32 0 0 flowid 1:1 \ > action connmark index wrong > connmark: Illegal "index" > bad action parsing > parse_action: bad value (3:connmark)! > Illegal "action" > > While we're here also fixup the 'Illegal "Zone"' error code to say > 'Illegal "zone"' instead of 'Illegal "index"' > > Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Applied (just before tagging 5.0).
diff --git a/tc/m_connmark.c b/tc/m_connmark.c index 45e2d05f..13543d33 100644 --- a/tc/m_connmark.c +++ b/tc/m_connmark.c @@ -73,7 +73,7 @@ parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, if (matches(*argv, "zone") == 0) { NEXT_ARG(); if (get_u16(&sel.zone, *argv, 10)) { - fprintf(stderr, "simple: Illegal \"index\"\n"); + fprintf(stderr, "connmark: Illegal \"zone\"\n"); return -1; } argc--; @@ -87,7 +87,7 @@ parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, if (matches(*argv, "index") == 0) { NEXT_ARG(); if (get_u32(&sel.index, *argv, 10)) { - fprintf(stderr, "simple: Illegal \"index\"\n"); + fprintf(stderr, "connmark: Illegal \"index\"\n"); return -1; } argc--;
action m_connmark returns error messages identifying itself as the 'simple' action instead of 'connmark' action. e.g. tc filter add dev eth0 protocol all u32 match u32 0 0 flowid 1:1 \ action connmark index wrong simple: Illegal "index" bad action parsing parse_action: bad value (3:connmark)! Illegal "action" In what is most likely a copy/paste error from the simple action example code, fix connmark error messages to identify themselves as coming from connmark. tc filter add dev eth0 protocol all u32 match u32 0 0 flowid 1:1 \ action connmark index wrong connmark: Illegal "index" bad action parsing parse_action: bad value (3:connmark)! Illegal "action" While we're here also fixup the 'Illegal "Zone"' error code to say 'Illegal "zone"' instead of 'Illegal "index"' Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> --- tc/m_connmark.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)