]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
libnetlink: don't print NETLINK_SOCK_DIAG errors in rtnl_talk
authorLorenzo Colitti <lorenzo@google.com>
Fri, 8 Jan 2016 08:32:36 +0000 (17:32 +0900)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 18 Jan 2016 19:47:03 +0000 (11:47 -0800)
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>
lib/libnetlink.c

index 165821447b2d28663168683b6229bce2491f117a..d6b5fd3e8a493940df0e91e8305f655d1e59fb8e 100644 (file)
@@ -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;
                        }