From: Lorenzo Colitti <lorenzo@google.com>
Date: Fri, 8 Jan 2016 08:32:36 +0000 (+0900)
Subject: libnetlink: don't print NETLINK_SOCK_DIAG errors in rtnl_talk
X-Git-Tag: v4.5.0~93^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57fdf2d4d94aeee493214d455b8f3336f09afa09;p=thirdparty%2Fiproute2.git

libnetlink: don't print NETLINK_SOCK_DIAG errors in rtnl_talk

This change is a no-op, as currently no code uses rtnl_talk on
NETLINK_SOCK_DIAG_BY_FAMILY sockets. It is needed to suppress
spurious errors when using SOCK_DESTROY via rtnl_talk.

Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
---

diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 165821447..d6b5fd3e8 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -419,8 +419,10 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
 					return 0;
 				}
 
-				fprintf(stderr, "RTNETLINK answers: %s\n",
-					strerror(-err->error));
+				if (rtnl->proto != NETLINK_SOCK_DIAG)
+					fprintf(stderr,
+						"RTNETLINK answers: %s\n",
+						strerror(-err->error));
 				errno = -err->error;
 				return -1;
 			}