diff options
| author | Daniel Mack <github@zonque.org> | 2015-06-10 20:06:43 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-06-10 20:06:43 +0200 |
| commit | a8467435a0c4962cab89574f65e7318ef389351f (patch) | |
| tree | cea7229033673996d2d492ee29b171ef96096d6e /src/resolve | |
| parent | 1f8cc1284c586b06ddf2ba5e5d8c9f13f987a1c5 (diff) | |
| parent | 2a1288ff89322a2f49c79f6d1832c8164c14a05c (diff) | |
Merge pull request #147 from poettering/cmsg
util: introduce CMSG_FOREACH() macro and make use of it everywhere
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/resolved-dns-stream.c | 3 | ||||
| -rw-r--r-- | src/resolve/resolved-manager.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c index 4c0b557bad..7f47e7223a 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -113,7 +113,8 @@ static int dns_stream_identify(DnsStream *s) { mh.msg_control = &control; mh.msg_controllen = sl; - for (cmsg = CMSG_FIRSTHDR(&mh); cmsg; cmsg = CMSG_NXTHDR(&mh, cmsg)) { + + CMSG_FOREACH(cmsg, &mh) { if (cmsg->cmsg_level == IPPROTO_IPV6) { assert(s->peer.sa.sa_family == AF_INET6); diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 52695376f0..7fc2803ddb 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -920,7 +920,7 @@ int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) { } else return -EAFNOSUPPORT; - for (cmsg = CMSG_FIRSTHDR(&mh); cmsg; cmsg = CMSG_NXTHDR(&mh, cmsg)) { + CMSG_FOREACH(cmsg, &mh) { if (cmsg->cmsg_level == IPPROTO_IPV6) { assert(p->family == AF_INET6); |