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

resolved: SPF records

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-07-31 21:47:51 -04:00
parent 2e276efc7b
commit 9de3e32940
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/resolve/resolved-dns-packet.c
View file

@ -513,6 +513,7 @@ int dns_packet_append_rr(DnsPacket *p, const DnsResourceRecord *rr, size_t *star
r = dns_packet_append_string(p, rr->hinfo.os, NULL);
break;
case DNS_TYPE_SPF: /* exactly the same as TXT */
case DNS_TYPE_TXT: {
char **s;
@ -933,6 +934,7 @@ int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
r = dns_packet_read_string(p, &rr->hinfo.os, NULL);
break;
case DNS_TYPE_SPF: /* exactly the same as TXT */
case DNS_TYPE_TXT: {
char *s;

28
src/resolve/resolved-dns-rr.c
View file

@ -231,20 +231,33 @@ DnsResourceRecord* dns_resource_record_unref(DnsResourceRecord *rr) {
}
if (rr->key) {
if (IN_SET(rr->key->type, DNS_TYPE_PTR, DNS_TYPE_NS, DNS_TYPE_CNAME))
switch(rr->key->type) {
case DNS_TYPE_PTR:
case DNS_TYPE_NS:
case DNS_TYPE_CNAME:
free(rr->ptr.name);
else if (rr->key->type == DNS_TYPE_HINFO) {
break;
case DNS_TYPE_HINFO:
free(rr->hinfo.cpu);
free(rr->hinfo.os);
} else if (rr->key->type == DNS_TYPE_TXT) {
break;
case DNS_TYPE_SPF:
case DNS_TYPE_TXT:
strv_free(rr->txt.strings);
} else if (rr->key->type == DNS_TYPE_SOA) {
break;
case DNS_TYPE_SOA:
free(rr->soa.mname);
free(rr->soa.rname);
} else if (rr->key->type == DNS_TYPE_MX) {
break;
case DNS_TYPE_MX:
free(rr->mx.exchange);
} else if (!IN_SET(rr->key->type, DNS_TYPE_A, DNS_TYPE_AAAA))
break;
case DNS_TYPE_A:
case DNS_TYPE_AAAA:
break;
default:
free(rr->generic.data);
}
dns_resource_key_unref(rr->key);
}
@ -309,6 +322,7 @@ int dns_resource_record_equal(const DnsResourceRecord *a, const DnsResourceRecor
return strcaseeq(a->hinfo.cpu, b->hinfo.cpu) &&
strcaseeq(a->hinfo.os, b->hinfo.os);
case DNS_TYPE_SPF: /* exactly the same as TXT */
case DNS_TYPE_TXT: {
int i;
@ -377,6 +391,7 @@ int dns_resource_record_to_string(const DnsResourceRecord *rr, char **ret) {
return -ENOMEM;
break;
case DNS_TYPE_SPF: /* exactly the same as TXT */
case DNS_TYPE_TXT: {
_cleanup_free_ char *t;
@ -500,6 +515,7 @@ static const struct {
{ DNS_TYPE_AAAA, "AAAA" },
{ DNS_TYPE_SRV, "SRV" },
{ DNS_TYPE_SSHFP, "SSHFP" },
{ DNS_TYPE_SPF, "SPF" },
{ DNS_TYPE_DNAME, "DNAME" },
{ DNS_TYPE_ANY, "ANY" },
{ DNS_TYPE_OPT, "OPT" },

2
src/resolve/resolved-dns-rr.h
View file

@ -55,6 +55,8 @@ enum {
DNS_TYPE_DNAME = 0x27,
DNS_TYPE_SSHFP = 0x2C,
DNS_TYPE_SPF = 0x63,
/* Special records */
DNS_TYPE_ANY = 0xFF,
DNS_TYPE_OPT = 0x29, /* EDNS0 option */