* [PATCH iproute2 v3 1/3] bridge: reorder cmd line arg parsing to let "-c" detected as "color" option
2021-08-17 17:28 [PATCH iproute2 v3 0/3] bridge: fixes regarding the colorized output Gokul Sivakumar
@ 2021-08-17 17:28 ` Gokul Sivakumar
2021-08-17 17:28 ` [PATCH iproute2 v3 2/3] bridge: fdb: don't colorize the "dev" & "dst" keywords in "bridge -c fdb" Gokul Sivakumar
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Gokul Sivakumar @ 2021-08-17 17:28 UTC (permalink / raw)
To: netdev, David Ahern, Stephen Hemminger; +Cc: Gokul Sivakumar
As per the man/man8/bridge.8 page, the shorthand cmd line arg "-c" can be
used to colorize the bridge cmd output. But while parsing the args in while
loop, matches() detects "-c" as "-compressedvlans" instead of "-color", so
fix this by doing the check for "-color" option first before checking for
"-compressedvlans".
Signed-off-by: Gokul Sivakumar <gokulkumar792@gmail.com>
---
bridge/bridge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bridge/bridge.c b/bridge/bridge.c
index f7bfe0b5..48b0e7f8 100644
--- a/bridge/bridge.c
+++ b/bridge/bridge.c
@@ -149,9 +149,9 @@ main(int argc, char **argv)
NEXT_ARG();
if (netns_switch(argv[1]))
exit(-1);
+ } else if (matches_color(opt, &color)) {
} else if (matches(opt, "-compressvlans") == 0) {
++compress_vlans;
- } else if (matches_color(opt, &color)) {
} else if (matches(opt, "-force") == 0) {
++force;
} else if (matches(opt, "-json") == 0) {
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH iproute2 v3 2/3] bridge: fdb: don't colorize the "dev" & "dst" keywords in "bridge -c fdb"
2021-08-17 17:28 [PATCH iproute2 v3 0/3] bridge: fixes regarding the colorized output Gokul Sivakumar
2021-08-17 17:28 ` [PATCH iproute2 v3 1/3] bridge: reorder cmd line arg parsing to let "-c" detected as "color" option Gokul Sivakumar
@ 2021-08-17 17:28 ` Gokul Sivakumar
2021-08-17 17:28 ` [PATCH iproute2 v3 3/3] man: bridge: fix the typo to change "-c[lor]" into "-c[olor]" in man page Gokul Sivakumar
2021-08-18 21:20 ` [PATCH iproute2 v3 0/3] bridge: fixes regarding the colorized output patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Gokul Sivakumar @ 2021-08-17 17:28 UTC (permalink / raw)
To: netdev, David Ahern, Stephen Hemminger; +Cc: Gokul Sivakumar
To be consistent with the colorized output of "ip" command and to increase
readability, stop highlighting the "dev" & "dst" keywords in the colorized
output of "bridge -c fdb" cmd.
Example: in the following "bridge -c fdb" entry, only "00:00:00:00:00:00",
"vxlan100" and "2001:db8:2::1" fields should be highlighted in color.
00:00:00:00:00:00 dev vxlan100 dst 2001:db8:2::1 self permanent
Signed-off-by: Gokul Sivakumar <gokulkumar792@gmail.com>
---
bridge/fdb.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/bridge/fdb.c b/bridge/fdb.c
index 37465e46..8912f092 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -192,10 +192,13 @@ int print_fdb(struct nlmsghdr *n, void *arg)
"mac", "%s ", lladdr);
}
- if (!filter_index && r->ndm_ifindex)
+ if (!filter_index && r->ndm_ifindex) {
+ print_string(PRINT_FP, NULL, "dev ", NULL);
+
print_color_string(PRINT_ANY, COLOR_IFNAME,
- "ifname", "dev %s ",
+ "ifname", "%s ",
ll_index_to_name(r->ndm_ifindex));
+ }
if (tb[NDA_DST]) {
int family = AF_INET;
@@ -208,9 +211,11 @@ int print_fdb(struct nlmsghdr *n, void *arg)
RTA_PAYLOAD(tb[NDA_DST]),
RTA_DATA(tb[NDA_DST]));
+ print_string(PRINT_FP, NULL, "dst ", NULL);
+
print_color_string(PRINT_ANY,
ifa_family_color(family),
- "dst", "dst %s ", dst);
+ "dst", "%s ", dst);
}
if (vid)
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH iproute2 v3 3/3] man: bridge: fix the typo to change "-c[lor]" into "-c[olor]" in man page
2021-08-17 17:28 [PATCH iproute2 v3 0/3] bridge: fixes regarding the colorized output Gokul Sivakumar
2021-08-17 17:28 ` [PATCH iproute2 v3 1/3] bridge: reorder cmd line arg parsing to let "-c" detected as "color" option Gokul Sivakumar
2021-08-17 17:28 ` [PATCH iproute2 v3 2/3] bridge: fdb: don't colorize the "dev" & "dst" keywords in "bridge -c fdb" Gokul Sivakumar
@ 2021-08-17 17:28 ` Gokul Sivakumar
2021-08-18 21:20 ` [PATCH iproute2 v3 0/3] bridge: fixes regarding the colorized output patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Gokul Sivakumar @ 2021-08-17 17:28 UTC (permalink / raw)
To: netdev, David Ahern, Stephen Hemminger; +Cc: Gokul Sivakumar
Fixes: 3a1ca9a5b ("bridge: update man page for new color and json changes")
Signed-off-by: Gokul Sivakumar <gokulkumar792@gmail.com>
---
man/man8/bridge.8 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index eec7df43..db83a2a6 100644
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -22,7 +22,7 @@ bridge \- show / manipulate bridge addresses and devices
\fB\-s\fR[\fItatistics\fR] |
\fB\-n\fR[\fIetns\fR] name |
\fB\-b\fR[\fIatch\fR] filename |
-\fB\-c\fR[\folor\fR] |
+\fB\-c\fR[\fIolor\fR] |
\fB\-p\fR[\fIretty\fR] |
\fB\-j\fR[\fIson\fR] |
\fB\-o\fR[\fIneline\fr] }
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH iproute2 v3 0/3] bridge: fixes regarding the colorized output
2021-08-17 17:28 [PATCH iproute2 v3 0/3] bridge: fixes regarding the colorized output Gokul Sivakumar
` (2 preceding siblings ...)
2021-08-17 17:28 ` [PATCH iproute2 v3 3/3] man: bridge: fix the typo to change "-c[lor]" into "-c[olor]" in man page Gokul Sivakumar
@ 2021-08-18 21:20 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-08-18 21:20 UTC (permalink / raw)
To: Gokul Sivakumar; +Cc: netdev, dsahern, stephen
Hello:
This series was applied to iproute2/iproute2.git (refs/heads/main):
On Tue, 17 Aug 2021 22:58:04 +0530 you wrote:
> v3:
> - Remove the unnecessary is_json_context() condition checks from patch 2/3
> as the print_string() call is used with the argument PRINT_FP.
>
> v2:
> - Replace the 2 newly introduced fprintf() func calls with print_string()
> to address Stephen's suggestion.
>
> [...]
Here is the summary with links:
- [iproute2,v3,1/3] bridge: reorder cmd line arg parsing to let "-c" detected as "color" option
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=82149efee939
- [iproute2,v3,2/3] bridge: fdb: don't colorize the "dev" & "dst" keywords in "bridge -c fdb"
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=057d3c6d378b
- [iproute2,v3,3/3] man: bridge: fix the typo to change "-c[lor]" into "-c[olor]" in man page
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=10ecd126900b
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread