fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-06 16:20:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

n-dhcp4: move back to INIT after lease expires

Browse source 
Move back to INIT state after the lease expires, as per section 4.4.5
of RFC 2131. Previously the client just moved to EXPIRED, closed the
connection and cleared the probe, leaving to the caller of the library
the choice to create a new client instance and to start from
scratch. However, it seems more useful that the client, once
initialized, always tries to get a lease even after an expiration.

(cherry picked from commit 182a8021f3)
This commit is contained in:
Beniamino Galvani 2020-01-27 21:44:36 +01:00
parent 4505c25270
commit a01198863a
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
shared/n-dhcp4/src/n-dhcp4-c-probe.c
View file

@ -841,11 +841,10 @@ static int n_dhcp4_client_probe_transition_lifetime(NDhcp4ClientProbe *probe) {
return r;
c_assert(probe->client->current_probe == probe);
probe->client->current_probe = NULL;
probe->current_lease = n_dhcp4_client_lease_unref(probe->current_lease);
n_dhcp4_c_connection_close(&probe->connection);
probe->state = N_DHCP4_CLIENT_PROBE_STATE_EXPIRED;
probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT;
probe->ns_deferred = n_dhcp4_gettime(CLOCK_BOOTTIME) + UINT64_C(1);
break;