From: Tom Gundersen <teg@jklm.no>
Date: Fri, 3 Apr 2015 13:21:03 +0000 (+0200)
Subject: networkd: improve logging when processing links and addresses
X-Git-Tag: v219.0~184
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=cdfee94318506c9348f8c30b9b7a7c87ec75927c

networkd: improve logging when processing links and addresses
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 437c59843..3bd37d808 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1853,11 +1853,14 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use
         if (r < 0) {
                 log_warning("rtnl: could not get message type");
                 return 0;
+        } else if (type != RTM_NEWADDR && type != RTM_DELADDR) {
+                log_warning("rtnl: received unexpected message type when processing address");
+                return 0;
         }
 
         r = sd_rtnl_message_addr_get_ifindex(message, &ifindex);
         if (r < 0) {
-                log_warning_errno(r, "rtnl: could not get ifindex: %m");
+                log_warning_errno(r, "rtnl: could not get ifindex from address: %m");
                 return 0;
         } else if (ifindex <= 0) {
                 log_warning("rtnl: received address message with invalid ifindex: %d", ifindex);
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index cffae835f..0e204ebae 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -299,11 +299,14 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
         if (r < 0) {
                 log_warning_errno(r, "rtnl: could not get message type: %m");
                 return 0;
+        } else if (type != RTM_NEWLINK && type != RTM_DELLINK) {
+                log_warning("rtnl: received unexpected message type when processing link");
+                return 0;
         }
 
         r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
         if (r < 0) {
-                log_warning_errno(r, "rtnl: could not get ifindex: %m");
+                log_warning_errno(r, "rtnl: could not get ifindex from link: %m");
                 return 0;
         } else if (ifindex <= 0) {
                 log_warning("rtnl: received link message with invalid ifindex: %d", ifindex);