From c881908ac7a485512b74bcd583c5890f2ad2af19 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 15 Jun 2011 16:23:35 +0200 Subject: neigh: include ndm flags while building message Reported by jeff courington --- lib/route/neigh.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/route/neigh.c b/lib/route/neigh.c index 0cd0366..7985d34 100644 --- a/lib/route/neigh.c +++ b/lib/route/neigh.c @@ -465,6 +465,9 @@ static int build_neigh_msg(struct rtnl_neigh *tmpl, int cmd, int flags, nhdr.ndm_family = nl_addr_get_family(tmpl->n_dst); + if (tmpl->ce_mask & NEIGH_ATTR_FLAGS) + nhdr.ndm_flags = tmpl->n_flags; + if (tmpl->ce_mask & NEIGH_ATTR_STATE) nhdr.ndm_state = tmpl->n_state; -- cgit v1.2.1 From ca0fc75580512ccb5931fe1e05092c6c52a4e99c Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 15 Jun 2011 17:37:28 +0200 Subject: socket: Set SOCK_CLOEXEC if available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by Марк Коренберг --- lib/nl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/nl.c b/lib/nl.c index f5f94e3..fc70374 100644 --- a/lib/nl.c +++ b/lib/nl.c @@ -101,14 +101,20 @@ * Creates a netlink socket using the specified protocol, binds the socket * and issues a connection attempt. * + * @note SOCK_CLOEXEC is set on the socket if available. + * * @return 0 on success or a negative error code. */ int nl_connect(struct nl_sock *sk, int protocol) { - int err; + int err, flags = 0; socklen_t addrlen; - sk->s_fd = socket(AF_NETLINK, SOCK_RAW, protocol); +#ifdef SOCK_CLOEXEC + flags |= SOCK_CLOEXEC; +#endif + + sk->s_fd = socket(AF_NETLINK, SOCK_RAW | flags, protocol); if (sk->s_fd < 0) { err = -nl_syserr2nlerr(errno); goto errout; -- cgit v1.2.1