From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roman Mashak Subject: [PATCH iproute2 1/1] tc: return on invalid smac or dmac in ife action Date: Fri, 20 Apr 2018 09:52:18 -0400 Message-ID: <1524232338-10757-1-git-send-email-mrv@mojatatu.com> Cc: netdev@vger.kernel.org, kernel@mojatatu.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, Roman Mashak To: stephen@networkplumber.org Return-path: Received: from mail-it0-f67.google.com ([209.85.214.67]:52479 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754966AbeDTNw0 (ORCPT ); Fri, 20 Apr 2018 09:52:26 -0400 Received: by mail-it0-f67.google.com with SMTP id f6-v6so2661168ita.2 for ; Fri, 20 Apr 2018 06:52:25 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Return on invalid smac/dmac and use invarg consistently for invalid arguments report. Signed-off-by: Roman Mashak --- tc/m_ife.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tc/m_ife.c b/tc/m_ife.c index d7e61703f666..ed0913a379aa 100644 --- a/tc/m_ife.c +++ b/tc/m_ife.c @@ -94,9 +94,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p, } else if (matches(*argv, "tcindex") == 0) { ife_tcindex = IFE_META_TCINDEX; } else { - fprintf(stderr, "Illegal meta define <%s>\n", - *argv); - return -1; + invarg("Illegal meta define", *argv); } } else if (matches(*argv, "use") == 0) { NEXT_ARG(); @@ -116,9 +114,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p, invarg("ife tcindex val is invalid", *argv); } else { - fprintf(stderr, "Illegal meta use type <%s>\n", - *argv); - return -1; + invarg("Illegal meta use type", *argv); } } else if (matches(*argv, "type") == 0) { NEXT_ARG(); @@ -132,8 +128,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p, if (sscanf(daddr, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", dbuf, dbuf + 1, dbuf + 2, dbuf + 3, dbuf + 4, dbuf + 5) != 6) { - fprintf(stderr, "Invalid mac address %s\n", - daddr); + invarg("Invalid mac address", *argv); } fprintf(stderr, "dst MAC address <%s>\n", daddr); @@ -143,8 +138,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p, if (sscanf(saddr, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", sbuf, sbuf + 1, sbuf + 2, sbuf + 3, sbuf + 4, sbuf + 5) != 6) { - fprintf(stderr, "Invalid mac address %s\n", - saddr); + invarg("Invalid mac address", *argv); } fprintf(stderr, "src MAC address <%s>\n", saddr); } else if (matches(*argv, "help") == 0) { -- 2.7.4