Skip to contentSkip to conversation

monitor: put nortnl check into nlmon_print_rtnl

PATCH Applied James Prestwood 2 participants 2 messages Oct 27, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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(-)
monitor/nlmon.c +4 -3
index d786cc33..9694cfd1 100644
@@ -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);
Signature · 1 line
2.34.3
#1 lore raw

Hi James,

Quoted 5 lines · James Prestwood

Doing this allows --nortnl to work when reading pcaps.

---
  monitor/nlmon.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)

Applied, thanks.

Regards,
-Denis