From 99c0cdfab4a1b5a8d127828e239c78fa375f1fef Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Thu, 27 Oct 2022 11:18:42 -0700 Subject: [PATCH] monitor: put nortnl check into nlmon_print_rtnl Doing this allows --nortnl to work when reading pcaps. --- monitor/nlmon.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/monitor/nlmon.c b/monitor/nlmon.c index d786cc33..9694cfd1 100644 --- a/monitor/nlmon.c +++ b/monitor/nlmon.c @@ -8089,6 +8089,9 @@ void nlmon_print_rtnl(struct nlmon *nlmon, const struct timeval *tv, int64_t aligned_size = NLMSG_ALIGN(size); const struct nlmsghdr *nlmsg; + if (nlmon->nortnl) + return; + update_time_offset(tv); for (nlmsg = data; NLMSG_OK(nlmsg, aligned_size); @@ -8207,9 +8210,7 @@ static bool nlmon_receive(struct l_io *io, void *user_data) case NETLINK_ROUTE: store_netlink(nlmon, tv, proto_type, nlmsg); - if (!nlmon->nortnl) - nlmon_print_rtnl(nlmon, tv, nlmsg, - nlmsg->nlmsg_len); + nlmon_print_rtnl(nlmon, tv, nlmsg, nlmsg->nlmsg_len); break; case NETLINK_GENERIC: nlmon_message(nlmon, tv, tp, nlmsg);