From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 27 Aug 2020 21:54:11 +0000 (+0900)
Subject: network: dhcp4: reset counter only when the lease address is new
X-Git-Tag: v247-rc1~297^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=687b3bc6f45522062c0a704bda3550c8f4ee9024;p=thirdparty%2Fsystemd.git

network: dhcp4: reset counter only when the lease address is new
---

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 771001f84d4..4a4ccd3dd0c 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -656,6 +656,7 @@ static int configure_dhcpv4_duplicate_address_detection(Link *link) {
 
 static int dhcp4_start_acd(Link *link) {
         union in_addr_union addr;
+        struct in_addr old;
         int r;
 
         if (!link->network->dhcp_send_decline)
@@ -672,6 +673,10 @@ static int dhcp4_start_acd(Link *link) {
         if (r < 0)
                 return r;
 
+        r = sd_ipv4acd_get_address(link->network->dhcp_acd, &old);
+        if (r < 0)
+                return r;
+
         r = sd_ipv4acd_set_address(link->network->dhcp_acd, &addr.in);
         if (r < 0)
                 return r;
@@ -687,7 +692,7 @@ static int dhcp4_start_acd(Link *link) {
                 log_link_debug(link, "Starting IPv4ACD client. Probing DHCPv4 address %s", strna(pretty));
         }
 
-        r = sd_ipv4acd_start(link->network->dhcp_acd, true);
+        r = sd_ipv4acd_start(link->network->dhcp_acd, !in4_addr_equal(&addr.in, &old));
         if (r < 0)
                 return r;