summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2011-02-18 18:58:21 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-18 18:58:21 +0100
commit65cb5c100eb1e5891f145be0b89aaa3c2d2e4317 (patch)
tree006507ee6b5a84e92de29cfdf89f9df65798747d
parent78f848c7c76c91a3c203c3289382bc2972803d3d (diff)
netlink: fix wrong use of netlink flags for dump operations
The avahi-daemon uses a wrong flag combination to operate with rtnetlink. This patch fixes the problems. No need to set NLM_F_ACK since the dump operation already includes the trailing NLMSG_DONE message that informs about the end of the dump operation.
-rw-r--r--avahi-autoipd/iface-linux.c2
-rw-r--r--avahi-core/iface-linux.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/avahi-autoipd/iface-linux.c b/avahi-autoipd/iface-linux.c
index fc27829..83e9e41 100644
--- a/avahi-autoipd/iface-linux.c
+++ b/avahi-autoipd/iface-linux.c
@@ -262,7 +262,7 @@ int iface_get_initial_state(State *state) {
n->nlmsg_len = NLMSG_LENGTH(sizeof(*ifi));
n->nlmsg_type = RTM_GETLINK;
n->nlmsg_seq = seq;
- n->nlmsg_flags = NLM_F_MATCH|NLM_F_REQUEST|NLM_F_ACK;
+ n->nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP;
n->nlmsg_pid = 0;
ifi = NLMSG_DATA(n);
diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c
index a1b7f73..4d12f73 100644
--- a/avahi-core/iface-linux.c
+++ b/avahi-core/iface-linux.c
@@ -53,7 +53,7 @@ static int netlink_list_items(AvahiNetlink *nl, uint16_t type, unsigned *ret_seq
n = (struct nlmsghdr*) req;
n->nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg));
n->nlmsg_type = type;
- n->nlmsg_flags = NLM_F_ROOT|NLM_F_REQUEST;
+ n->nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP;
n->nlmsg_pid = 0;
gen = NLMSG_DATA(n);