From e92b60b20f21111a0c28135c1b5c78fc851a4f15 Mon Sep 17 00:00:00 2001 From: AJ Bagwell Date: Tue, 10 Dec 2019 16:27:31 +0000 Subject: ipv4ll: do not reset conflict counter on restart Don't reset the conflict counter when trying a new pseudo random address, so that after trying 10 addresses the londer timeout is used in accordance with the RFC Fixes #14299. --- src/systemd/sd-ipv4acd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/systemd/sd-ipv4acd.h') diff --git a/src/systemd/sd-ipv4acd.h b/src/systemd/sd-ipv4acd.h index 039ed3c7f2..ebf723fc22 100644 --- a/src/systemd/sd-ipv4acd.h +++ b/src/systemd/sd-ipv4acd.h @@ -20,6 +20,7 @@ #include #include +#include #include "sd-event.h" @@ -44,7 +45,7 @@ int sd_ipv4acd_set_mac(sd_ipv4acd *acd, const struct ether_addr *addr); int sd_ipv4acd_set_ifindex(sd_ipv4acd *acd, int interface_index); int sd_ipv4acd_set_address(sd_ipv4acd *acd, const struct in_addr *address); int sd_ipv4acd_is_running(sd_ipv4acd *acd); -int sd_ipv4acd_start(sd_ipv4acd *acd); +int sd_ipv4acd_start(sd_ipv4acd *acd, bool reset_conflicts); int sd_ipv4acd_stop(sd_ipv4acd *acd); sd_ipv4acd *sd_ipv4acd_ref(sd_ipv4acd *acd); sd_ipv4acd *sd_ipv4acd_unref(sd_ipv4acd *acd); -- cgit v1.2.1