chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolved: be a bit more communicative about conflicts
[elogind.git]
/
src
/
resolve
/
resolved-dns-zone.c
diff --git
a/src/resolve/resolved-dns-zone.c
b/src/resolve/resolved-dns-zone.c
index 5f250e7ca3989f51f6cbc3cb48888eca887b8efa..13b1b3c595a7f66c8990154356d30b9b83b4a8c6 100644
(file)
--- a/
src/resolve/resolved-dns-zone.c
+++ b/
src/resolve/resolved-dns-zone.c
@@
-530,11
+530,14
@@
void dns_zone_item_ready(DnsZoneItem *i) {
* lexicographically smaller IP address we continue
* and defend it. */
* lexicographically smaller IP address we continue
* and defend it. */
- if (!IN_SET(i->state, DNS_ZONE_ITEM_ESTABLISHED, DNS_ZONE_ITEM_VERIFYING))
+ if (!IN_SET(i->state, DNS_ZONE_ITEM_ESTABLISHED, DNS_ZONE_ITEM_VERIFYING)) {
+ log_debug("Got a successful probe for not yet established RR, we lost.");
we_lost = true;
we_lost = true;
- else {
+
}
else {
assert(i->probe_transaction->received);
we_lost = memcmp(&i->probe_transaction->received->sender, &i->probe_transaction->received->destination, FAMILY_ADDRESS_SIZE(i->probe_transaction->received->family)) > 0;
assert(i->probe_transaction->received);
we_lost = memcmp(&i->probe_transaction->received->sender, &i->probe_transaction->received->destination, FAMILY_ADDRESS_SIZE(i->probe_transaction->received->family)) > 0;
+ if (we_lost)
+ log_debug("Got a successful probe reply for an established RR, and we have a lexicographically lower IP address and thus lost.");
}
if (we_lost) {
}
if (we_lost) {
@@
-553,6
+556,7
@@
void dns_zone_item_ready(DnsZoneItem *i) {
}
static int dns_zone_item_verify(DnsZoneItem *i) {
}
static int dns_zone_item_verify(DnsZoneItem *i) {
+ _cleanup_free_ char *pretty = NULL;
int r;
assert(i);
int r;
assert(i);
@@
-560,6
+564,9
@@
static int dns_zone_item_verify(DnsZoneItem *i) {
if (i->state != DNS_ZONE_ITEM_ESTABLISHED)
return 0;
if (i->state != DNS_ZONE_ITEM_ESTABLISHED)
return 0;
+ dns_resource_record_to_string(i->rr, &pretty);
+ log_debug("Verifying RR %s", strna(pretty));
+
i->state = DNS_ZONE_ITEM_VERIFYING;
r = dns_zone_item_probe_start(i);
if (r < 0) {
i->state = DNS_ZONE_ITEM_VERIFYING;
r = dns_zone_item_probe_start(i);
if (r < 0) {