aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Poirier <bpoirier@nvidia.com>2023-12-11 09:07:23 -0500
committerStephen Hemminger <stephen@networkplumber.org>2023-12-22 09:54:23 -0800
commit14c9845f05f842687ea6eec8e4f9f283d1200d72 (patch)
treeb4be6376594721014409c3fb378fb2b8ad5740f1
parent7418335b4b43de1ed3e9d6f651f5d2cb39f8ee95 (diff)
downloadiproute2-14c9845f05f842687ea6eec8e4f9f283d1200d72.tar.gz
bridge: vni: Reverse the logic in print_vnifilter_rtm()
print_vnifilter_rtm() is structured similarly to print_vlan_tunnel_info() except that in the former, the open_vni_port() call is guarded by a "if (first)" check whereas in the latter, the open_vlan_port() call is guarded by a "if (!opened)" check. Reverse the logic in one of the functions to have the same structure in both. Since the calls being guarded are "open_...()", "close_...()", use the "opened" logic structure. Reviewed-by: Petr Machata <petrm@nvidia.com> Tested-by: Petr Machata <petrm@nvidia.com> Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-rw-r--r--bridge/vni.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/bridge/vni.c b/bridge/vni.c
index ca5d2e433..b597a916e 100644
--- a/bridge/vni.c
+++ b/bridge/vni.c
@@ -296,7 +296,7 @@ int print_vnifilter_rtm(struct nlmsghdr *n, void *arg)
{
struct tunnel_msg *tmsg = NLMSG_DATA(n);
int len = n->nlmsg_len;
- bool first = true;
+ bool opened = false;
struct rtattr *t;
FILE *fp = arg;
int rem;
@@ -332,9 +332,10 @@ int print_vnifilter_rtm(struct nlmsghdr *n, void *arg)
if (rta_type != VXLAN_VNIFILTER_ENTRY)
continue;
- if (first) {
+
+ if (!opened) {
open_vni_port(tmsg->ifindex, "%s");
- first = false;
+ opened = true;
} else {
print_string(PRINT_FP, NULL, "%-" __stringify(IFNAMSIZ) "s ", "");
}
@@ -342,7 +343,7 @@ int print_vnifilter_rtm(struct nlmsghdr *n, void *arg)
print_vni(t, tmsg->ifindex);
}
- if (!first)
+ if (opened)
close_vni_port();
print_string(PRINT_FP, NULL, "%s", _SL_);