#include "utf8.h"
#include "util.h"
+#include "strv.h"
#include "resolved-dns-domain.h"
#include "resolved-dns-packet.h"
r = dns_packet_append_string(p, rr->hinfo.os, NULL);
break;
+ case DNS_TYPE_TXT: {
+ char **s;
+
+ STRV_FOREACH(s, rr->txt.strings) {
+ r = dns_packet_append_string(p, *s, NULL);
+ if (r < 0)
+ goto fail;
+ }
+
+ break;
+ }
+
case DNS_TYPE_A:
r = dns_packet_append_blob(p, &rr->a.in_addr, sizeof(struct in_addr), NULL);
break;
r = dns_packet_append_name(p, rr->mx.exchange, NULL);
break;
- case DNS_TYPE_TXT:
case DNS_TYPE_SRV:
case DNS_TYPE_DNAME:
case DNS_TYPE_SSHFP:
r = dns_packet_read_string(p, &rr->hinfo.os, NULL);
break;
+ case DNS_TYPE_TXT: {
+ char *s;
+
+ while (p->rindex < p->size) {
+ 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;
+ };
+ break;
+ }
+
case DNS_TYPE_A:
r = dns_packet_read_blob(p, &rr->a.in_addr, sizeof(struct in_addr), NULL);
break;
r = dns_packet_read_name(p, &rr->mx.exchange, NULL);
break;
- case DNS_TYPE_TXT:
case DNS_TYPE_SRV:
case DNS_TYPE_DNAME:
case DNS_TYPE_SSHFP:
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "strv.h"
+
#include "resolved-dns-domain.h"
#include "resolved-dns-rr.h"
else if (rr->key->type == DNS_TYPE_HINFO) {
free(rr->hinfo.cpu);
free(rr->hinfo.os);
+ } else if (rr->key->type == DNS_TYPE_TXT) {
+ strv_free(rr->txt.strings);
} else if (rr->key->type == DNS_TYPE_SOA) {
free(rr->soa.mname);
free(rr->soa.rname);
return strcaseeq(a->hinfo.cpu, b->hinfo.cpu) &&
strcaseeq(a->hinfo.os, b->hinfo.os);
+ case DNS_TYPE_TXT: {
+ int i;
+
+ for (i = 0; a->txt.strings[i] || b->txt.strings[i]; i++)
+ if (!streq_ptr(a->txt.strings[i], b->txt.strings[i]))
+ return false;
+ return true;
+ }
+
case DNS_TYPE_A:
return memcmp(&a->a.in_addr, &b->a.in_addr, sizeof(struct in_addr)) == 0;
return -ENOMEM;
break;
+ case DNS_TYPE_TXT: {
+ _cleanup_free_ char *t;
+
+ t = strv_join_quoted(rr->txt.strings);
+ if (!t)
+ return -ENOMEM;
+
+ s = strjoin(k, " ", t, NULL);
+ if (!s)
+ return -ENOMEM;
+
+ break;
+ }
+
case DNS_TYPE_A: {
_cleanup_free_ char *x = NULL;