}
DnsScope* dns_scope_free(DnsScope *s) {
+ DnsQueryTransaction *t;
+
if (!s)
return NULL;
dns_scope_llmnr_membership(s, false);
- while (s->transactions) {
- DnsQuery *q;
+ while ((t = s->transactions)) {
+
+ /* Abort the transaction, but make sure it is not
+ * freed while we still look at it */
- q = s->transactions->query;
- dns_query_transaction_free(s->transactions);
+ t->block_gc++;
+ dns_query_transaction_complete(t, DNS_QUERY_ABORTED);
+ t->block_gc--;
- dns_query_finish(q);
+ dns_query_transaction_free(t);
}
dns_cache_flush(&s->cache);
_cleanup_close_ int fd = -1;
union sockaddr_union sa = {};
socklen_t salen;
- int one, ifindex, ret;
+ int one, ret;
DnsServer *srv;
int r;
if (!srv)
return -ESRCH;
- if (s->link)
- ifindex = s->link->ifindex;
-
sa.sa.sa_family = srv->family;
if (srv->family == AF_INET) {
sa.in.sin_port = htobe16(53);
} else if (srv->family == AF_INET6) {
sa.in6.sin6_port = htobe16(53);
sa.in6.sin6_addr = srv->address.in6;
- sa.in6.sin6_scope_id = ifindex;
+ sa.in6.sin6_scope_id = s->link ? s->link->ifindex : 0;
salen = sizeof(sa.in6);
} else
return -EAFNOSUPPORT;
assert(domain);
STRV_FOREACH(i, s->domains)
- if (dns_name_endswith(domain, *i))
+ if (dns_name_endswith(domain, *i) > 0)
return DNS_SCOPE_YES;
- if (dns_name_root(domain))
+ if (dns_name_root(domain) != 0)
return DNS_SCOPE_NO;
if (is_localhost(domain))
return DNS_SCOPE_NO;
if (s->protocol == DNS_PROTOCOL_DNS) {
- if (dns_name_endswith(domain, "254.169.in-addr.arpa") ||
- dns_name_endswith(domain, "0.8.e.f.ip6.arpa") ||
- dns_name_single_label(domain))
- return DNS_SCOPE_NO;
+ if (dns_name_endswith(domain, "254.169.in-addr.arpa") == 0 &&
+ dns_name_endswith(domain, "0.8.e.f.ip6.arpa") == 0 &&
+ dns_name_single_label(domain) == 0)
+ return DNS_SCOPE_MAYBE;
- return DNS_SCOPE_MAYBE;
+ return DNS_SCOPE_NO;
}
if (s->protocol == DNS_PROTOCOL_MDNS) {
- if (dns_name_endswith(domain, "254.169.in-addr.arpa") ||
- dns_name_endswith(domain, "0.8.e.f.ip6.arpa") ||
- dns_name_endswith(domain, "local"))
+ if (dns_name_endswith(domain, "254.169.in-addr.arpa") > 0 ||
+ dns_name_endswith(domain, "0.8.e.f.ip6.arpa") > 0 ||
+ (dns_name_endswith(domain, "local") > 0 && dns_name_equal(domain, "local") == 0))
return DNS_SCOPE_MAYBE;
return DNS_SCOPE_NO;
}
if (s->protocol == DNS_PROTOCOL_LLMNR) {
- if (dns_name_endswith(domain, "254.169.in-addr.arpa") ||
- dns_name_endswith(domain, "0.8.e.f.ip6.arpa") ||
- dns_name_single_label(domain))
+ if (dns_name_endswith(domain, "254.169.in-addr.arpa") > 0 ||
+ dns_name_endswith(domain, "0.8.e.f.ip6.arpa") > 0 ||
+ dns_name_single_label(domain) > 0)
return DNS_SCOPE_MAYBE;
return DNS_SCOPE_NO;