| Message ID | 1536674690-15756-1-git-send-email-liuhangbin@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
| Series | [PATCHv3,iproute2] bridge/mdb: fix missing new line when show bridge mdb | expand |
On Tue, 11 Sep 2018 22:04:50 +0800 Hangbin Liu <liuhangbin@gmail.com> wrote: > The bridge mdb show is broken on current iproute2. e.g. > ]# bridge mdb show > 34: br0 veth0_br 224.1.1.2 temp 34: br0 veth0_br 224.1.1.1 temp > > After fix: > ]# bridge mdb show > 34: br0 veth0_br 224.1.1.2 temp > 34: br0 veth0_br 224.1.1.1 temp > > v2: Use json print lib as Stephen suggested. > v3: No need to use is_json_context() as Phil pointed out. > > Reported-by: Ying Xu <yinxu@redhat.com> > Fixes: c7c1a1ef51aea ("bridge: colorize output and use JSON print library") > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> > --- > bridge/mdb.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/bridge/mdb.c b/bridge/mdb.c > index f38dc67..2f24b01 100644 > --- a/bridge/mdb.c > +++ b/bridge/mdb.c > @@ -107,6 +107,10 @@ static void br_print_router_ports(FILE *f, struct rtattr *attr, > fprintf(f, "%s ", port_ifname); > } > } > + > + if (!show_stats) > + print_string(PRINT_FP, NULL, "\n", NULL); > + > close_json_array(PRINT_JSON, NULL); > } > > @@ -164,6 +168,8 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e, > print_string(PRINT_ANY, "timer", " %s", > format_timer(timer)); > } > + > + print_string(PRINT_FP, NULL, "\n", NULL); This can now just be: print_nl(); The problem with print_string(PRINT_FP, NULL, "\n", NULL) is that it doesn't handle oneline mode correctly.
diff --git a/bridge/mdb.c b/bridge/mdb.c index f38dc67..2f24b01 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -107,6 +107,10 @@ static void br_print_router_ports(FILE *f, struct rtattr *attr, fprintf(f, "%s ", port_ifname); } } + + if (!show_stats) + print_string(PRINT_FP, NULL, "\n", NULL); + close_json_array(PRINT_JSON, NULL); } @@ -164,6 +168,8 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e, print_string(PRINT_ANY, "timer", " %s", format_timer(timer)); } + + print_string(PRINT_FP, NULL, "\n", NULL); close_json_object(); }
The bridge mdb show is broken on current iproute2. e.g. ]# bridge mdb show 34: br0 veth0_br 224.1.1.2 temp 34: br0 veth0_br 224.1.1.1 temp After fix: ]# bridge mdb show 34: br0 veth0_br 224.1.1.2 temp 34: br0 veth0_br 224.1.1.1 temp v2: Use json print lib as Stephen suggested. v3: No need to use is_json_context() as Phil pointed out. Reported-by: Ying Xu <yinxu@redhat.com> Fixes: c7c1a1ef51aea ("bridge: colorize output and use JSON print library") Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> --- bridge/mdb.c | 6 ++++++ 1 file changed, 6 insertions(+)