noctra/iproute2-next
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ip: do not print stray prefixes in monitor mode

Browse Source 
When running "ip monitor", accept_msg() first prints the prefix and
then calls the object-specific print function, which also does the
filtering. Therefore, it is possible that the prefix is printed even
for events that get ignored later. For example:

  ip link add dummy1 type dummy
  ip link set dummy1 up
  ip -ts monitor all dev dummy1 &
  ip link add dummy2 type dummy
  ip addr add dev dummy1 192.0.2.1/24

generates:

  [2024-07-12T22:11:26.338342] [LINK][2024-07-12T22:11:26.339846] [ADDR]314: dummy1    inet 192.0.2.1/24 scope global dummy1
       valid_lft forever preferred_lft forever

Fix this by printing the prefix only after the filtering. Now the
output for the commands above is:

 [2024-07-12T22:11:26.339846] [ADDR]314: dummy1    inet 192.0.2.1/24 scope global dummy1
       valid_lft forever preferred_lft forever

See also commit 7e0a889b54 ("bridge: Do not print stray prefixes in
monitor mode") which fixed the same problem in the bridge tool.

Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Beniamino Galvani
2024-07-13 16:56:41 +02:00
committed by Stephen Hemminger
parent b06341a252
commit 554ea3649d
13 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ip/ip_common.h
View File

@@ -232,4 +232,5 @@ void print_stats64(FILE *fp, struct rtnl_link_stats64 *s,
const struct rtattr *carrier_changes, const char *what);
void print_mpls_link_stats(FILE *fp, const struct mpls_link_stats *stats,
const char *indent);
void print_headers(FILE *fp, const char *label);
#endif /* _IP_COMMON_H_ */

4
ip/ipaddress.c
View File

@@ -1052,6 +1052,8 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
if (filter.slave_kind && match_link_kind(tb, filter.slave_kind, 1))
return -1;
print_headers(fp, "[LINK]");
if (n->nlmsg_type == RTM_DELLINK)
print_bool(PRINT_ANY, "deleted", "Deleted ", true);
@@ -1598,6 +1600,8 @@ int print_addrinfo(struct nlmsghdr *n, void *arg)
return 0;
}
print_headers(fp, "[ADDR]");
if (n->nlmsg_type == RTM_DELADDR)
print_bool(PRINT_ANY, "deleted", "Deleted ", true);

3
ip/ipaddrlabel.c
View File

@@ -46,6 +46,7 @@ int print_addrlabel(struct nlmsghdr *n, void *arg)
struct ifaddrlblmsg *ifal = NLMSG_DATA(n);
int len = n->nlmsg_len;
struct rtattr *tb[IFAL_MAX+1];
FILE *fp = (FILE *)arg;
if (n->nlmsg_type != RTM_NEWADDRLABEL && n->nlmsg_type != RTM_DELADDRLABEL)
return 0;
@@ -56,6 +57,8 @@ int print_addrlabel(struct nlmsghdr *n, void *arg)
parse_rtattr(tb, IFAL_MAX, IFAL_RTA(ifal), len);
print_headers(fp, "[ADDRLABEL]");
open_json_object(NULL);
if (n->nlmsg_type == RTM_DELADDRLABEL)
print_bool(PRINT_ANY, "deleted", "Deleted ", true);

27
ip/ipmonitor.c
View File

@@ -22,6 +22,8 @@
static void usage(void) __attribute__((noreturn));
static int prefix_banner;
int listen_all_nsid;
struct rtnl_ctrl_data *ctrl_data;
int do_monitor;
static void usage(void)
{
@@ -34,16 +36,19 @@ static void usage(void)
exit(-1);
}
static void print_headers(FILE *fp, char *label, struct rtnl_ctrl_data *ctrl)
void print_headers(FILE *fp, const char *label)
{
if (!do_monitor)
return;
if (timestamp)
print_timestamp(fp);
if (listen_all_nsid) {
if (ctrl == NULL || ctrl->nsid < 0)
if (ctrl_data == NULL || ctrl_data->nsid < 0)
fprintf(fp, "[nsid current]");
else
fprintf(fp, "[nsid %d]", ctrl->nsid);
fprintf(fp, "[nsid %d]", ctrl_data->nsid);
}
if (prefix_banner)
@@ -55,6 +60,8 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl,
{
FILE *fp = (FILE *)arg;
ctrl_data = ctrl;
switch (n->nlmsg_type) {
case RTM_NEWROUTE:
case RTM_DELROUTE: {
@@ -71,11 +78,9 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl,
if (r->rtm_family == RTNL_FAMILY_IPMR ||
r->rtm_family == RTNL_FAMILY_IP6MR) {
print_headers(fp, "[MROUTE]", ctrl);
print_mroute(n, arg);
return 0;
} else {
print_headers(fp, "[ROUTE]", ctrl);
print_route(n, arg);
return 0;
}
@@ -83,32 +88,27 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl,
case RTM_NEWNEXTHOP:
case RTM_DELNEXTHOP:
print_headers(fp, "[NEXTHOP]", ctrl);
print_cache_nexthop(n, arg, true);
return 0;
case RTM_NEWNEXTHOPBUCKET:
case RTM_DELNEXTHOPBUCKET:
print_headers(fp, "[NEXTHOPBUCKET]", ctrl);
print_nexthop_bucket(n, arg);
return 0;
case RTM_NEWLINK:
case RTM_DELLINK:
ll_remember_index(n, NULL);
print_headers(fp, "[LINK]", ctrl);
print_linkinfo(n, arg);
return 0;
case RTM_NEWADDR:
case RTM_DELADDR:
print_headers(fp, "[ADDR]", ctrl);
print_addrinfo(n, arg);
return 0;
case RTM_NEWADDRLABEL:
case RTM_DELADDRLABEL:
print_headers(fp, "[ADDRLABEL]", ctrl);
print_addrlabel(n, arg);
return 0;
@@ -122,18 +122,15 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl,
return 0;
}
print_headers(fp, "[NEIGH]", ctrl);
print_neigh(n, arg);
return 0;
case RTM_NEWPREFIX:
print_headers(fp, "[PREFIX]", ctrl);
print_prefix(n, arg);
return 0;
case RTM_NEWRULE:
case RTM_DELRULE:
print_headers(fp, "[RULE]", ctrl);
print_rule(n, arg);
return 0;
@@ -143,18 +140,15 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl,
case RTM_NEWNETCONF:
case RTM_DELNETCONF:
print_headers(fp, "[NETCONF]", ctrl);
print_netconf(ctrl, n, arg);
return 0;
case RTM_DELNSID:
case RTM_NEWNSID:
print_headers(fp, "[NSID]", ctrl);
print_nsid(n, arg);
return 0;
case RTM_NEWSTATS:
print_headers(fp, "[STATS]", ctrl);
ipstats_print(n, arg);
return 0;
@@ -196,6 +190,7 @@ int do_ipmonitor(int argc, char **argv)
int ifindex = 0;
rtnl_close(&rth);
do_monitor = 1;
while (argc > 0) {
if (matches(*argv, "file") == 0) {

2
ip/ipmroute.c
View File

@@ -97,6 +97,8 @@ int print_mroute(struct nlmsghdr *n, void *arg)
if (inet_addr_match_rta(&filter.msrc, tb[RTA_SRC]))
return 0;
print_headers(fp, "[MROUTE]");
family = get_real_family(r->rtm_type, r->rtm_family);
open_json_object(NULL);

2
ip/ipneigh.c
View File

@@ -383,6 +383,8 @@ int print_neigh(struct nlmsghdr *n, void *arg)
return 0;
}
print_headers(fp, "[NEIGH]");
open_json_object(NULL);
if (n->nlmsg_type == RTM_DELNEIGH)
print_bool(PRINT_ANY, "deleted", "Deleted ", true);

2
ip/ipnetconf.c
View File

@@ -78,6 +78,8 @@ int print_netconf(struct rtnl_ctrl_data *ctrl, struct nlmsghdr *n, void *arg)
if (filter.ifindex && filter.ifindex != ifindex)
return 0;
print_headers(fp, "[NETCONF]");
open_json_object(NULL);
if (n->nlmsg_type == RTM_DELNETCONF)
print_bool(PRINT_ANY, "deleted", "Deleted ", true);

2
ip/ipnetns.c
View File

@@ -289,6 +289,8 @@ int print_nsid(struct nlmsghdr *n, void *arg)
return -1;
}
print_headers(fp, "[NSID]");
open_json_object(NULL);
if (n->nlmsg_type == RTM_DELNSID)
print_bool(PRINT_ANY, "deleted", "Deleted ", true);

5
ip/ipnexthop.c
View File

@@ -799,6 +799,9 @@ int print_cache_nexthop(struct nlmsghdr *n, void *arg, bool process_cache)
fprintf(stderr, "Error parsing nexthop: %s\n", strerror(-err));
return -1;
}
print_headers(fp, "[NEXTHOP]");
__print_nexthop_entry(fp, NULL, &nhe, n->nlmsg_type == RTM_DELNEXTHOP);
print_string(PRINT_FP, NULL, "%s", "\n");
fflush(fp);
@@ -839,6 +842,8 @@ int print_nexthop_bucket(struct nlmsghdr *n, void *arg)
parse_rtattr_flags(tb, NHA_MAX, RTM_NHA(nhm), len, NLA_F_NESTED);
print_headers(fp, "[NEXTHOPBUCKET]");
open_json_object(NULL);
if (n->nlmsg_type == RTM_DELNEXTHOP)

2
ip/ipprefix.c
View File

@@ -58,6 +58,8 @@ int print_prefix(struct nlmsghdr *n, void *arg)
parse_rtattr(tb, RTA_MAX, RTM_RTA(prefix), len);
print_headers(fp, "[PREFIX]");
if (tb[PREFIX_ADDRESS]) {
fprintf(fp, "prefix %s/%u",
rt_addr_n2a_rta(family, tb[PREFIX_ADDRESS]),

2
ip/iproute.c
View File

@@ -818,6 +818,8 @@ int print_route(struct nlmsghdr *n, void *arg)
return 0;
}
print_headers(fp, "[ROUTE]");
open_json_object(NULL);
if (n->nlmsg_type == RTM_DELROUTE)
print_bool(PRINT_ANY, "deleted", "Deleted ", true);

2
ip/iprule.c
View File

@@ -250,6 +250,8 @@ int print_rule(struct nlmsghdr *n, void *arg)
if (!filter_nlmsg(n, tb, host_len))
return 0;
print_headers(fp, "[RULE]");
open_json_object(NULL);
if (n->nlmsg_type == RTM_DELRULE)
print_bool(PRINT_ANY, "deleted", "Deleted ", true);

10
ip/ipstats.c
View File

@@ -741,7 +741,7 @@ static void ipstats_show_group(const struct ipstats_sel *sel)
}
static int
ipstats_process_ifsm(struct nlmsghdr *answer,
ipstats_process_ifsm(FILE *fp, struct nlmsghdr *answer,
struct ipstats_stat_enabled *enabled)
{
struct ipstats_stat_show_attrs show_attrs = {};
@@ -763,6 +763,8 @@ ipstats_process_ifsm(struct nlmsghdr *answer,
dev = ll_index_to_name(show_attrs.ifsm->ifindex);
print_headers(fp, "[STATS]");
for (i = 0; i < enabled->nenabled; i++) {
const struct ipstats_stat_desc *desc = enabled->enabled[i].desc;
@@ -845,7 +847,7 @@ ipstats_show_one(int ifindex, struct ipstats_stat_enabled *enabled)
ipstats_req_add_filters(&req, enabled);
if (rtnl_talk(&rth, &req.nlh, &answer) < 0)
return -2;
err = ipstats_process_ifsm(answer, enabled);
err = ipstats_process_ifsm(stdout, answer, enabled);
free(answer);
return err;
@@ -856,7 +858,7 @@ static int ipstats_dump_one(struct nlmsghdr *n, void *arg)
struct ipstats_stat_enabled *enabled = arg;
int rc;
rc = ipstats_process_ifsm(n, enabled);
rc = ipstats_process_ifsm(stdout, n, enabled);
if (rc)
return rc;
@@ -1352,7 +1354,7 @@ int ipstats_print(struct nlmsghdr *n, void *arg)
FILE *fp = arg;
int rc;
rc = ipstats_process_ifsm(n, &enabled);
rc = ipstats_process_ifsm(fp, n, &enabled);
if (rc)
return rc;