From 3cb10d3a0b1b6a7c44f307f2abb5215104e16941 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 16 Jul 2014 18:03:46 +0200 Subject: dns-domain: introduce macros for accessing all DNS header fields --- src/resolve/resolved-bus.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/resolve/resolved-bus.c') diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index e73bdacbb..02e971dbf 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -86,10 +86,9 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { if (r < 0) goto finish; - n = be16toh(DNS_PACKET_HEADER(q->packet)->ancount) + - be16toh(DNS_PACKET_HEADER(q->packet)->nscount) + - be16toh(DNS_PACKET_HEADER(q->packet)->arcount); - + n = DNS_PACKET_ANCOUNT(q->packet) + + DNS_PACKET_NSCOUNT(q->packet) + + DNS_PACKET_ARCOUNT(q->packet); for (i = 0; i < n; i++) { _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL; @@ -292,10 +291,9 @@ static void bus_method_resolve_address_complete(DnsQuery *q) { if (r < 0) goto finish; - n = be16toh(DNS_PACKET_HEADER(q->packet)->ancount) + - be16toh(DNS_PACKET_HEADER(q->packet)->nscount) + - be16toh(DNS_PACKET_HEADER(q->packet)->arcount); - + n = DNS_PACKET_ANCOUNT(q->packet) + + DNS_PACKET_NSCOUNT(q->packet) + + DNS_PACKET_ARCOUNT(q->packet); for (i = 0; i < n; i++) { _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL; -- cgit v1.2.3