picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved: port ResolveRecord() bus call implementation to dns_resource_record_to_wire_format() 

Now that we have dns_resource_record_to_wire_format() we can generate
the RR serialization we return to bus clients in ResolveRecord() with
it. We pass the RR data along in the original form, not the DNSSEC
canonical form, since that would mean we'd lose RR name casing, which is
however important to keep for DNS-SD services and similar.
This commit is contained in:
Lennart Poettering 2015-12-02 21:05:21 +01:00
parent a8812dd7f1
commit 4e2d538f33
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/resolve/resolved-bus.c
View File

@ -425,8 +425,6 @@ fail:
}
static int bus_message_append_rr(sd_bus_message *m, DnsResourceRecord *rr, int ifindex) {
_cleanup_(dns_packet_unrefp) DnsPacket *p = NULL;
size_t start;
int r;
assert(m);
@ -443,17 +441,11 @@ static int bus_message_append_rr(sd_bus_message *m, DnsResourceRecord *rr, int i
if (r < 0)
return r;
r = dns_packet_new(&p, DNS_PROTOCOL_DNS, 0);
r = dns_resource_record_to_wire_format(rr, false);
if (r < 0)
return r;
p->refuse_compression = true;
r = dns_packet_append_rr(p, rr, &start);
if (r < 0)
return r;
r = sd_bus_message_append_array(m, 'y', DNS_PACKET_DATA(p) + start, p->size - start);
r = sd_bus_message_append_array(m, 'y', rr->wire_format, rr->wire_format_size);
if (r < 0)
return r;