shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 01:27:11 +03:00
Code

resolved: use DNS_ANSWER_FOREACH instead of for

Browse Source
This commit is contained in:
Dmitry Rozhkov 2018-01-03 15:00:27 +02:00
parent cfcc8dcc86
commit c1227a1840
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/resolve/resolved-dns-scope.c
View File

@ -958,7 +958,7 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) {
} }
void dns_scope_check_conflicts(DnsScope *scope, DnsPacket *p) { void dns_scope_check_conflicts(DnsScope *scope, DnsPacket *p) {
unsigned i; DnsResourceRecord *rr;
int r; int r;
assert(scope); assert(scope);
@ -989,25 +989,24 @@ void dns_scope_check_conflicts(DnsScope *scope, DnsPacket *p) {
log_debug("Checking for conflicts..."); log_debug("Checking for conflicts...");
for (i = 0; i < p->answer->n_rrs; i++) { DNS_ANSWER_FOREACH(rr, p->answer) {
/* No conflict if it is DNS-SD RR used for service enumeration. */ /* No conflict if it is DNS-SD RR used for service enumeration. */
if (dns_resource_key_is_dnssd_ptr(p->answer->items[i].rr->key)) if (dns_resource_key_is_dnssd_ptr(rr->key))
continue; continue;
/* Check for conflicts against the local zone. If we /* Check for conflicts against the local zone. If we
* found one, we won't check any further */ * found one, we won't check any further */
r = dns_zone_check_conflicts(&scope->zone, p->answer->items[i].rr); r = dns_zone_check_conflicts(&scope->zone, rr);
if (r != 0) if (r != 0)
continue; continue;
/* Check for conflicts against the local cache. If so, /* Check for conflicts against the local cache. If so,
* send out an advisory query, to inform everybody */ * send out an advisory query, to inform everybody */
r = dns_cache_check_conflicts(&scope->cache, p->answer->items[i].rr, p->family, &p->sender); r = dns_cache_check_conflicts(&scope->cache, rr, p->family, &p->sender);
if (r <= 0) if (r <= 0)
continue; continue;
dns_scope_notify_conflict(scope, p->answer->items[i].rr); dns_scope_notify_conflict(scope, rr);
} }
} }