diff options
author | Daniel Mack <daniel@zonque.org> | 2015-12-10 15:59:30 +0100 |
---|---|---|
committer | Daniel Mack <daniel@zonque.org> | 2015-12-10 16:32:03 +0100 |
commit | fe2dfc8b4947451f87fcae56f839ca84dde26453 (patch) | |
tree | 341fd1392213487ce4ff8ab951ebc88f4a7d9ec9 | |
parent | 40fa4728eb0de88719c288aaf8793a37c1bb84f9 (diff) |
resolved: make sure the packet's transaction ID is always 0 for mDNS
RFC6762, 18.1:
In multicast query messages, the Query Identifier SHOULD be set to
zero on transmission.
-rw-r--r-- | src/resolve/resolved-dns-scope.c | 6 | ||||
-rw-r--r-- | src/resolve/resolved-dns-transaction.c | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index 4d83ac597c..bf49c51b5d 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -818,7 +818,11 @@ static int dns_scope_make_conflict_packet( 0 /* (ad) */, 0 /* (cd) */, 0)); - random_bytes(&DNS_PACKET_HEADER(p)->id, sizeof(uint16_t)); + + /* For mDNS, the transaction ID should always be 0 */ + if (s->protocol != DNS_PROTOCOL_MDNS) + random_bytes(&DNS_PACKET_HEADER(p)->id, sizeof(uint16_t)); + DNS_PACKET_HEADER(p)->qdcount = htobe16(1); DNS_PACKET_HEADER(p)->arcount = htobe16(1); diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c index 90f07e6c4b..05fce99679 100644 --- a/src/resolve/resolved-dns-transaction.c +++ b/src/resolve/resolved-dns-transaction.c @@ -819,7 +819,6 @@ static int dns_transaction_make_packet_mdns(DnsTransaction *t) { } DNS_PACKET_HEADER(p)->qdcount = htobe16(qdcount); - DNS_PACKET_HEADER(p)->id = t->id; /* Append known answer section if we're asking for any shared record */ if (add_known_answers) { |