From: Nikolay Aleksandrov <razor@blackwall.org>
To: netdev@vger.kernel.org
Cc: roopa@nvidia.com, dsahern@gmail.com, stephen@networkplumber.org,
Joachim Wiberg <troglobit@gmail.com>,
Nikolay Aleksandrov <nikolay@nvidia.com>
Subject: [PATCH iproute2-next v2 02/19] bridge: vlan: factor out vlan option printing
Date: Sat, 28 Aug 2021 14:07:48 +0300 [thread overview]
Message-ID: <20210828110805.463429-3-razor@blackwall.org> (raw)
In-Reply-To: <20210828110805.463429-1-razor@blackwall.org>
From: Nikolay Aleksandrov <nikolay@nvidia.com>
Factor out the code which prints current per-vlan options from
print_vlan_rtm without any changes, later we'll filter based on the vlan
attribute and add support for global vlan option printing.
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
---
v2: new patch (split off of previous patch 02)
bridge/vlan.c | 110 ++++++++++++++++++++++++++------------------------
1 file changed, 58 insertions(+), 52 deletions(-)
diff --git a/bridge/vlan.c b/bridge/vlan.c
index 9b6511f189ff..b9d928010cb4 100644
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -621,11 +621,67 @@ static int print_vlan_stats(struct nlmsghdr *n, void *arg)
return 0;
}
+static void print_vlan_opts(struct rtattr *a)
+{
+ struct rtattr *vtb[BRIDGE_VLANDB_ENTRY_MAX + 1];
+ struct bridge_vlan_xstats vstats;
+ struct bridge_vlan_info *vinfo;
+ __u16 vrange = 0;
+ __u8 state = 0;
+
+ parse_rtattr_flags(vtb, BRIDGE_VLANDB_ENTRY_MAX, RTA_DATA(a),
+ RTA_PAYLOAD(a), NLA_F_NESTED);
+ vinfo = RTA_DATA(vtb[BRIDGE_VLANDB_ENTRY_INFO]);
+
+ memset(&vstats, 0, sizeof(vstats));
+ if (vtb[BRIDGE_VLANDB_ENTRY_RANGE])
+ vrange = rta_getattr_u16(vtb[BRIDGE_VLANDB_ENTRY_RANGE]);
+ else
+ vrange = vinfo->vid;
+
+ if (vtb[BRIDGE_VLANDB_ENTRY_STATE])
+ state = rta_getattr_u8(vtb[BRIDGE_VLANDB_ENTRY_STATE]);
+
+ if (vtb[BRIDGE_VLANDB_ENTRY_STATS]) {
+ struct rtattr *stb[BRIDGE_VLANDB_STATS_MAX+1];
+ struct rtattr *attr;
+
+ attr = vtb[BRIDGE_VLANDB_ENTRY_STATS];
+ parse_rtattr(stb, BRIDGE_VLANDB_STATS_MAX, RTA_DATA(attr),
+ RTA_PAYLOAD(attr));
+
+ if (stb[BRIDGE_VLANDB_STATS_RX_BYTES]) {
+ attr = stb[BRIDGE_VLANDB_STATS_RX_BYTES];
+ vstats.rx_bytes = rta_getattr_u64(attr);
+ }
+ if (stb[BRIDGE_VLANDB_STATS_RX_PACKETS]) {
+ attr = stb[BRIDGE_VLANDB_STATS_RX_PACKETS];
+ vstats.rx_packets = rta_getattr_u64(attr);
+ }
+ if (stb[BRIDGE_VLANDB_STATS_TX_PACKETS]) {
+ attr = stb[BRIDGE_VLANDB_STATS_TX_PACKETS];
+ vstats.tx_packets = rta_getattr_u64(attr);
+ }
+ if (stb[BRIDGE_VLANDB_STATS_TX_BYTES]) {
+ attr = stb[BRIDGE_VLANDB_STATS_TX_BYTES];
+ vstats.tx_bytes = rta_getattr_u64(attr);
+ }
+ }
+ print_range("vlan", vinfo->vid, vrange);
+ print_vlan_flags(vinfo->flags);
+ print_nl();
+ print_string(PRINT_FP, NULL, "%-" __stringify(IFNAMSIZ) "s ", "");
+ print_stp_state(state);
+ print_nl();
+ if (show_stats)
+ __print_one_vlan_stats(&vstats);
+}
+
int print_vlan_rtm(struct nlmsghdr *n, void *arg, bool monitor)
{
- struct rtattr *vtb[BRIDGE_VLANDB_ENTRY_MAX + 1], *a;
struct br_vlan_msg *bvm = NLMSG_DATA(n);
int len = n->nlmsg_len;
+ struct rtattr *a;
int rem;
if (n->nlmsg_type != RTM_NEWVLAN && n->nlmsg_type != RTM_DELVLAN &&
@@ -660,49 +716,6 @@ int print_vlan_rtm(struct nlmsghdr *n, void *arg, bool monitor)
rem = len;
for (a = BRVLAN_RTA(bvm); RTA_OK(a, rem); a = RTA_NEXT(a, rem)) {
- struct bridge_vlan_xstats vstats;
- struct bridge_vlan_info *vinfo;
- __u32 vrange = 0;
- __u8 state = 0;
-
- parse_rtattr_flags(vtb, BRIDGE_VLANDB_ENTRY_MAX, RTA_DATA(a),
- RTA_PAYLOAD(a), NLA_F_NESTED);
- vinfo = RTA_DATA(vtb[BRIDGE_VLANDB_ENTRY_INFO]);
-
- memset(&vstats, 0, sizeof(vstats));
- if (vtb[BRIDGE_VLANDB_ENTRY_RANGE])
- vrange = rta_getattr_u16(vtb[BRIDGE_VLANDB_ENTRY_RANGE]);
- else
- vrange = vinfo->vid;
-
- if (vtb[BRIDGE_VLANDB_ENTRY_STATE])
- state = rta_getattr_u8(vtb[BRIDGE_VLANDB_ENTRY_STATE]);
-
- if (vtb[BRIDGE_VLANDB_ENTRY_STATS]) {
- struct rtattr *stb[BRIDGE_VLANDB_STATS_MAX+1];
- struct rtattr *attr;
-
- attr = vtb[BRIDGE_VLANDB_ENTRY_STATS];
- parse_rtattr(stb, BRIDGE_VLANDB_STATS_MAX, RTA_DATA(attr),
- RTA_PAYLOAD(attr));
-
- if (stb[BRIDGE_VLANDB_STATS_RX_BYTES]) {
- attr = stb[BRIDGE_VLANDB_STATS_RX_BYTES];
- vstats.rx_bytes = rta_getattr_u64(attr);
- }
- if (stb[BRIDGE_VLANDB_STATS_RX_PACKETS]) {
- attr = stb[BRIDGE_VLANDB_STATS_RX_PACKETS];
- vstats.rx_packets = rta_getattr_u64(attr);
- }
- if (stb[BRIDGE_VLANDB_STATS_TX_PACKETS]) {
- attr = stb[BRIDGE_VLANDB_STATS_TX_PACKETS];
- vstats.tx_packets = rta_getattr_u64(attr);
- }
- if (stb[BRIDGE_VLANDB_STATS_TX_BYTES]) {
- attr = stb[BRIDGE_VLANDB_STATS_TX_BYTES];
- vstats.tx_bytes = rta_getattr_u64(attr);
- }
- }
if (vlan_rtm_cur_ifidx != bvm->ifindex) {
open_vlan_port(bvm->ifindex, VLAN_SHOW_VLAN);
open_json_object(NULL);
@@ -711,14 +724,7 @@ int print_vlan_rtm(struct nlmsghdr *n, void *arg, bool monitor)
open_json_object(NULL);
print_string(PRINT_FP, NULL, "%-" __stringify(IFNAMSIZ) "s ", "");
}
- print_range("vlan", vinfo->vid, vrange);
- print_vlan_flags(vinfo->flags);
- print_nl();
- print_string(PRINT_FP, NULL, "%-" __stringify(IFNAMSIZ) "s ", "");
- print_stp_state(state);
- print_nl();
- if (show_stats)
- __print_one_vlan_stats(&vstats);
+ print_vlan_opts(a);
close_json_object();
}
--
2.31.1
next prev parent reply other threads:[~2021-08-28 11:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-28 11:07 [PATCH iproute2-next v2 00/19] bridge: vlan: add global multicast options Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 01/19] ip: bridge: add support for mcast_vlan_snooping Nikolay Aleksandrov
2021-08-28 11:07 ` Nikolay Aleksandrov [this message]
2021-08-28 11:07 ` [PATCH iproute2-next v2 03/19] bridge: vlan: skip unknown attributes when printing options Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 04/19] bridge: vlan: add support to show global vlan options Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 05/19] bridge: vlan: add support for vlan filtering when dumping options Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 06/19] bridge: vlan: add support to set global vlan options Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 07/19] bridge: vlan: add global mcast_snooping option Nikolay Aleksandrov
2021-09-01 3:36 ` David Ahern
2021-09-01 8:07 ` Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 08/19] bridge: vlan: add global mcast_igmp_version option Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 09/19] bridge: vlan: add global mcast_mld_version option Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 10/19] bridge: vlan: add global mcast_last_member_count option Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 11/19] bridge: vlan: add global mcast_startup_query_count option Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 12/19] bridge: vlan: add global mcast_last_member_interval option Nikolay Aleksandrov
2021-08-28 11:07 ` [PATCH iproute2-next v2 13/19] bridge: vlan: add global mcast_membership_interval option Nikolay Aleksandrov
2021-08-28 11:08 ` [PATCH iproute2-next v2 14/19] bridge: vlan: add global mcast_querier_interval option Nikolay Aleksandrov
2021-08-28 11:08 ` [PATCH iproute2-next v2 15/19] bridge: vlan: add global mcast_query_interval option Nikolay Aleksandrov
2021-08-28 11:08 ` [PATCH iproute2-next v2 16/19] bridge: vlan: add global mcast_query_response_interval option Nikolay Aleksandrov
2021-08-28 11:08 ` [PATCH iproute2-next v2 17/19] bridge: vlan: add global mcast_startup_query_interval option Nikolay Aleksandrov
2021-08-28 11:08 ` [PATCH iproute2-next v2 18/19] bridge: vlan: add global mcast_querier option Nikolay Aleksandrov
2021-08-28 11:08 ` [PATCH iproute2-next v2 19/19] bridge: vlan: add support for dumping router ports Nikolay Aleksandrov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210828110805.463429-3-razor@blackwall.org \
--to=razor@blackwall.org \
--cc=dsahern@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nikolay@nvidia.com \
--cc=roopa@nvidia.com \
--cc=stephen@networkplumber.org \
--cc=troglobit@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).