From af93291cc4cbd2fe2fb4af7d3c56138fb39f31dc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 30 Jul 2014 00:48:59 +0200 Subject: resolved: when answer A or AAAA questions, order responses by whether addresses are link-local or not --- src/network/networkd-address.c | 4 ++-- src/network/networkd-link.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/network') diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 539bd98b52..1b2d7d52ff 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -243,7 +243,7 @@ static int address_acquire(Link *link, Address *original, Address **ret) { assert(ret); /* Something useful was configured? just use it */ - if (in_addr_null(original->family, &original->in_addr) <= 0) + if (in_addr_is_null(original->family, &original->in_addr) <= 0) return 0; /* The address is configured to be 0.0.0.0 or [::] by the user? @@ -345,7 +345,7 @@ int address_configure(Address *address, Link *link, return r; } - if (!in_addr_null(address->family, &address->in_addr_peer)) { + if (!in_addr_is_null(address->family, &address->in_addr_peer)) { if (address->family == AF_INET) r = sd_rtnl_message_append_in_addr(req, IFA_ADDRESS, &address->in_addr_peer.in); else if (address->family == AF_INET6) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 7db71c0b70..87bdd85644 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -283,7 +283,7 @@ static Address* link_find_dhcp_server_address(Link *link) { if (address->family != AF_INET) continue; - if (in_addr_null(address->family, &address->in_addr)) + if (in_addr_is_null(address->family, &address->in_addr)) continue; return address; -- cgit v1.2.3-54-g00ecf