netdev - Re: [PATCH iproute2-next master v2] bridge: fdb show: fix fdb entry state output (+ add json support)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <2d7775f8-e500-f68a-3c2b-be574515f80b@gmail.com>
Date:   Tue, 28 Jul 2020 15:08:33 -0600
From:   David Ahern <dsahern@...il.com>
To:     Julien Fortin <julien@...ulusnetworks.com>,
        Stephen Hemminger <stephen@...workplumber.org>
Cc:     netdev@...r.kernel.org, Roopa Prabhu <roopa@...ulusnetworks.com>
Subject: Re: [PATCH iproute2-next master v2] bridge: fdb show: fix fdb entry
 state output (+ add json support)

On 7/27/20 5:25 PM, Julien Fortin wrote:
> On Mon, Jul 27, 2020 at 6:30 PM Stephen Hemminger
> <stephen@...workplumber.org> wrote:
>>
>> On Mon, 27 Jul 2020 18:20:09 +0200
>> Julien Fortin <julien@...ulusnetworks.com> wrote:
>>
>>> diff --git a/bridge/fdb.c b/bridge/fdb.c
>>> index d1f8afbe..765f4e51 100644
>>> --- a/bridge/fdb.c
>>> +++ b/bridge/fdb.c
>>> @@ -62,7 +62,10 @@ static const char *state_n2a(unsigned int s)
>>>       if (s & NUD_REACHABLE)
>>>               return "";
>>>
>>> -     sprintf(buf, "state=%#x", s);
>>> +     if (is_json_context())
>>> +             sprintf(buf, "%#x", s);
>>> +     else
>>> +             sprintf(buf, "state %#x", s)
>>
>> Please keep the "state=%#x" for the non JSON case.
>> No need to change output format.
> 
> My v1 patch (see below) kept the "state=" but you asked me to remove
> it and re-submit.
> 
> diff --git a/bridge/fdb.c b/bridge/fdb.c
> index d2247e80..198c51d1 100644
> --- a/bridge/fdb.c
> +++ b/bridge/fdb.c
> @@ -62,7 +62,10 @@ static const char *state_n2a(unsigned int s)
>         if (s & NUD_REACHABLE)
>                 return "";
> 
> -       sprintf(buf, "state=%#x", s);
> +       if (is_json_context())
> +               sprintf(buf, "%#x", s);
> +       else
> +               sprintf(buf, "state=%#x", s);
>         return buf;
>  }
> 

the v1 patch looks correct to me. Resubmit, but this should go to main
branch since it is a bug fix.