From 4d91eec42d3ba547c4e2578df0d6fd568075647b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 10 Aug 2014 22:48:16 +0200 Subject: resolved: actually, the peer with the lower IP address wins conflicts --- src/resolve/resolved-dns-transaction.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/resolve/resolved-dns-transaction.c') diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c index dfed74dc91..990b1f2e43 100644 --- a/src/resolve/resolved-dns-transaction.c +++ b/src/resolve/resolved-dns-transaction.c @@ -137,12 +137,12 @@ static void dns_transaction_tentative(DnsTransaction *t, DnsPacket *p) { /* RFC 4795, Section 4.1 says that the peer with the * lexicographically smaller IP address loses */ - if (memcmp(&p->sender, &p->destination, FAMILY_ADDRESS_SIZE(p->family)) < 0) { - log_debug("Peer has lexicographically smaller IP address and thus lost in the conflict."); + if (memcmp(&p->sender, &p->destination, FAMILY_ADDRESS_SIZE(p->family)) >= 0) { + log_debug("Peer has lexicographically larger IP address and thus lost in the conflict."); return; } - log_debug("We have the lexicographically smaller IP address and thus lost in the conflict."); + log_debug("We have the lexicographically larger IP address and thus lost in the conflict."); t->block_gc++; while ((z = set_first(t->zone_items))) { -- cgit v1.2.3-54-g00ecf