switch (rr->unparseable ? _DNS_TYPE_INVALID : rr->key->type) {
+ case DNS_TYPE_SRV:
+ r = dns_packet_append_uint16(p, rr->srv.priority, NULL);
+ if (r < 0)
+ goto fail;
+
+ r = dns_packet_append_uint16(p, rr->srv.weight, NULL);
+ if (r < 0)
+ goto fail;
+
+ r = dns_packet_append_uint16(p, rr->srv.port, NULL);
+ if (r < 0)
+ goto fail;
+
+ r = dns_packet_append_name(p, rr->srv.name, NULL);
+ break;
+
case DNS_TYPE_PTR:
case DNS_TYPE_NS:
case DNS_TYPE_CNAME:
+ case DNS_TYPE_DNAME:
r = dns_packet_append_name(p, rr->ptr.name, NULL);
break;
goto fail;
}
+ r = 0;
break;
}
r = dns_packet_append_uint16(p, rr->loc.altitude, NULL);
break;
- case DNS_TYPE_SRV:
- case DNS_TYPE_DNAME:
case DNS_TYPE_SSHFP:
+ r = dns_packet_append_uint8(p, rr->sshfp.algorithm, NULL);
+ if (r < 0)
+ goto fail;
+ r = dns_packet_append_uint8(p, rr->sshfp.fptype, NULL);
+ if (r < 0)
+ goto fail;
+
+ r = dns_packet_append_blob(p, rr->sshfp.key, rr->sshfp.key_size, NULL);
+ break;
+
case _DNS_TYPE_INVALID: /* unparseable */
default:
else
first = false;
- memcpy(ret + n, t, c);
+ memcpy(ret + n, t, r);
n += r;
continue;
} else if ((c & 0xc0) == 0xc0) {
switch (rr->key->type) {
+ case DNS_TYPE_SRV:
+ r = dns_packet_read_uint16(p, &rr->srv.priority, NULL);
+ if (r < 0)
+ goto fail;
+ r = dns_packet_read_uint16(p, &rr->srv.weight, NULL);
+ if (r < 0)
+ goto fail;
+ r = dns_packet_read_uint16(p, &rr->srv.port, NULL);
+ if (r < 0)
+ goto fail;
+ r = dns_packet_read_name(p, &rr->srv.name, NULL);
+ break;
+
case DNS_TYPE_PTR:
case DNS_TYPE_NS:
case DNS_TYPE_CNAME:
+ case DNS_TYPE_DNAME:
r = dns_packet_read_name(p, &rr->ptr.name, NULL);
break;
case DNS_TYPE_TXT: {
char *s;
- while (p->rindex < p->size) {
+ while (p->rindex < offset + rdlength) {
r = dns_packet_read_string(p, &s, NULL);
if (r < 0)
goto fail;
r = strv_consume(&rr->txt.strings, s);
if (r < 0)
goto fail;
- };
+ }
+
+ r = 0;
break;
}
}
}
- case DNS_TYPE_SRV:
- case DNS_TYPE_DNAME:
case DNS_TYPE_SSHFP:
+
+ r = dns_packet_read_uint8(p, &rr->sshfp.algorithm, NULL);
+ if (r < 0)
+ goto fail;
+
+ r = dns_packet_read_uint8(p, &rr->sshfp.fptype, NULL);
+ if (r < 0)
+ goto fail;
+
+ r = dns_packet_read(p, rdlength - 2, &d, NULL);
+ if (r < 0)
+ goto fail;
+
+ rr->sshfp.key = memdup(d, rdlength - 2);
+ if (!rr->sshfp.key) {
+ r = -ENOMEM;
+ goto fail;
+ }
+
+ rr->sshfp.key_size = rdlength - 2;
+ break;
+
default:
r = dns_packet_read(p, rdlength, &d, NULL);
if (r < 0)