From 3f00899bdedaee8fcd0168a267785565de20e794 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 12 Feb 2016 16:29:46 +0100 Subject: [PATCH] platform: continue reading in event_handler_recvmsgs() when not handling events If @handle_events is FALSE, we want to drain the socket. In that case even when encountering an error error we don't want to abort, but instead continue reading the next message. --- src/platform/nm-linux-platform.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 76ca16f306..0723bf3099 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -5698,8 +5698,11 @@ continue_reading: event_seq_check (platform, msg, seq_result); - if (abort_parsing) + if (abort_parsing) { + if (!handle_events) + goto continue_reading; goto out; + } err = 0; hdr = nlmsg_next (hdr, &n);