aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2016-01-08 17:32:36 +0900
committerStephen Hemminger <stephen@networkplumber.org>2016-01-18 11:47:03 -0800
commit57fdf2d4d94aeee493214d455b8f3336f09afa09 (patch)
tree7abf5136f06c678977096a0c4cd0a6174fd3f733
parent1ab0f02f465b7bcc09798645d19236a500742e90 (diff)
downloadplatform_external_iproute2-57fdf2d4d94aeee493214d455b8f3336f09afa09.tar.gz
platform_external_iproute2-57fdf2d4d94aeee493214d455b8f3336f09afa09.tar.bz2
platform_external_iproute2-57fdf2d4d94aeee493214d455b8f3336f09afa09.zip
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>
-rw-r--r--lib/libnetlink.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 16582144..d6b5fd3e 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;
}