diff options
| author | Michael Biebl <biebl@debian.org> | 2020-01-31 12:13:40 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-01-31 12:13:40 +0100 |
| commit | 7d548822e672c0e8a580ae52d8f8df7f011103cd (patch) | |
| tree | 9a592708c2f3245f60b8adf4fb3f2db61dff60b6 /src/dhcp/nm-dhcp-systemd.c | |
| parent | 55780b62324ba5492ce2670817fc0a8c209cc138 (diff) | |
| parent | f3c6d0765dff885e168b94f28e06ecc640315a74 (diff) | |
Update upstream source from tag 'upstream/1.22.6'
Update to upstream version '1.22.6' with Debian dir dd9b100f674653057e9629a59eec828fcacf66ad
Diffstat (limited to 'src/dhcp/nm-dhcp-systemd.c')
| -rw-r--r-- | src/dhcp/nm-dhcp-systemd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c index 1518d465..6e6aa243 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -477,7 +477,7 @@ lease_to_ip4_config (NMDedupMultiIndex *multi_idx, /*****************************************************************************/ static void -bound4_handle (NMDhcpSystemd *self) +bound4_handle (NMDhcpSystemd *self, gboolean extended) { NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self); const char *iface = nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self)); @@ -514,7 +514,7 @@ bound4_handle (NMDhcpSystemd *self) dhcp_lease_save (lease, priv->lease_file); nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), - NM_DHCP_STATE_BOUND, + extended ? NM_DHCP_STATE_EXTENDED : NM_DHCP_STATE_BOUND, NM_IP_CONFIG_CAST (ip4_config), options); } @@ -538,8 +538,10 @@ dhcp_event_cb (sd_dhcp_client *client, int event, gpointer user_data) break; case SD_DHCP_CLIENT_EVENT_RENEW: case SD_DHCP_CLIENT_EVENT_IP_CHANGE: + bound4_handle (self, TRUE); + break; case SD_DHCP_CLIENT_EVENT_IP_ACQUIRE: - bound4_handle (self); + bound4_handle (self, FALSE); break; case SD_DHCP_CLIENT_EVENT_SELECTING: break; |