From: Tom Gundersen <teg@jklm.no>
Date: Sun, 29 Jun 2014 14:59:33 +0000 (+0200)
Subject: networkd: dhcp - update the lifetime of an existing address
X-Git-Tag: v215~123
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=46ba9fbae2517e6fee2a2b486ef9f06a62284b8c

networkd: dhcp - update the lifetime of an existing address

The logic otherwise is that we leave anything preconfigured alone, but in the case of DHCP
we actually need to update it whenever the lease is renewed.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index dff445bc5..b597b1668 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -760,7 +760,9 @@ static int link_enter_set_addresses(Link *link) {
                 address->prefixlen = prefixlen;
                 address->broadcast.s_addr = addr.s_addr | ~netmask.s_addr;
 
-                r = address_configure(address, link, &address_handler);
+                /* use update rather than configure so that we will update the lifetime
+                   of an existing address if it has already been configured */
+                r = address_update(address, link, &address_handler);
                 if (r < 0) {
                         log_warning_link(link,
                                          "could not set addresses: %s", strerror(-r));