| Message ID | 1514459579-20379-1-git-send-email-serhe.popovych@gmail.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
| Series | [iproute2] gre/tunnel: Print erspan_index using print_uint() | expand |
Hi Serhey, On Thu, Dec 28, 2017 at 3:12 AM, Serhey Popovych <serhe.popovych@gmail.com> wrote: > One is missing in JSON output because fprintf() > is used instead of print_uint(). > > Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> > --- > ip/link_gre.c | 3 ++- > ip/link_gre6.c | 4 +++- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/ip/link_gre.c b/ip/link_gre.c > index 896bb19..1e331c8 100644 > --- a/ip/link_gre.c > +++ b/ip/link_gre.c > @@ -476,7 +476,8 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) > if (tb[IFLA_GRE_ERSPAN_INDEX]) { > __u32 erspan_idx = rta_getattr_u32(tb[IFLA_GRE_ERSPAN_INDEX]); > > - fprintf(f, "erspan_index %u ", erspan_idx); > + print_uint(PRINT_ANY, > + "erspan_index", "erspan_index %u ", erspan_idx); > } > Did you pull the latest code from net-next branch? I think I already fix it. William
> Hi Serhey, Hi William, Yes, iproute2-next/net-next branch contains fix already: we probably do not need proposed change. Sorry for noise. I'm currently focused on bug fixing in stable which affects my work for iproute2-next. All my future work will be based on iproute2-next as it contains refactoring, optimization and cleanups, not fixes. Sorry again and thanks for feedback. > > On Thu, Dec 28, 2017 at 3:12 AM, Serhey Popovych > <serhe.popovych@gmail.com> wrote: >> One is missing in JSON output because fprintf() >> is used instead of print_uint(). >> >> Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> >> --- >> ip/link_gre.c | 3 ++- >> ip/link_gre6.c | 4 +++- >> 2 files changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/ip/link_gre.c b/ip/link_gre.c >> index 896bb19..1e331c8 100644 >> --- a/ip/link_gre.c >> +++ b/ip/link_gre.c >> @@ -476,7 +476,8 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) >> if (tb[IFLA_GRE_ERSPAN_INDEX]) { >> __u32 erspan_idx = rta_getattr_u32(tb[IFLA_GRE_ERSPAN_INDEX]); >> >> - fprintf(f, "erspan_index %u ", erspan_idx); >> + print_uint(PRINT_ANY, >> + "erspan_index", "erspan_index %u ", erspan_idx); >> } >> > > Did you pull the latest code from net-next branch? > I think I already fix it. > William >
diff --git a/ip/link_gre.c b/ip/link_gre.c index 896bb19..1e331c8 100644 --- a/ip/link_gre.c +++ b/ip/link_gre.c @@ -476,7 +476,8 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (tb[IFLA_GRE_ERSPAN_INDEX]) { __u32 erspan_idx = rta_getattr_u32(tb[IFLA_GRE_ERSPAN_INDEX]); - fprintf(f, "erspan_index %u ", erspan_idx); + print_uint(PRINT_ANY, + "erspan_index", "erspan_index %u ", erspan_idx); } if (tb[IFLA_GRE_ENCAP_TYPE] && diff --git a/ip/link_gre6.c b/ip/link_gre6.c index 7ae4b49..2687a62 100644 --- a/ip/link_gre6.c +++ b/ip/link_gre6.c @@ -532,7 +532,9 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (tb[IFLA_GRE_ERSPAN_INDEX]) { __u32 erspan_idx = rta_getattr_u32(tb[IFLA_GRE_ERSPAN_INDEX]); - fprintf(f, "erspan_index %u ", erspan_idx); + + print_uint(PRINT_ANY, + "erspan_index", "erspan_index %u ", erspan_idx); } if (tb[IFLA_GRE_ENCAP_TYPE] &&
One is missing in JSON output because fprintf() is used instead of print_uint(). Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> --- ip/link_gre.c | 3 ++- ip/link_gre6.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-)