fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 13:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Squashed 'src/n-dhcp4/' changes from 64513e31c01a..e4af93228e37

Browse source 
e4af93228e37 probe: forget lease after a NAK
c39e1fe74463 connection: discard NAKs from other servers in SELECTING

git-subtree-dir: src/n-dhcp4
git-subtree-split: e4af93228e3772bbb443ec1237252e6a2f3e3dd7
This commit is contained in:
Thomas Haller 2022-05-06 13:48:25 +02:00
parent aba56902d1
commit 3a49d158e0
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/n-dhcp4-c-connection.c
View file

@ -705,6 +705,7 @@ int n_dhcp4_c_connection_select_new(NDhcp4CConnection *connection,
message->userdata.start_time = offer->userdata.start_time;
message->userdata.base_time = offer->userdata.base_time;
message->userdata.client_addr = client.s_addr;
message->userdata.server_id = server.s_addr;
n_dhcp4_incoming_get_xid(offer, &xid);
n_dhcp4_outgoing_set_xid(message, xid);
@ -1229,6 +1230,24 @@ int n_dhcp4_c_connection_dispatch_io(NDhcp4CConnection *connection,
serv_addr, sizeof(serv_addr)));
}
if (type == N_DHCP4_MESSAGE_NAK &&
connection->request->userdata.server_id != INADDR_ANY) {
struct in_addr server;
r = n_dhcp4_incoming_query_server_identifier(message, &server);
if (r)
return N_DHCP4_E_AGAIN;
if (connection->request->userdata.server_id != server.s_addr) {
n_dhcp4_log(connection->log_queue,
LOG_DEBUG,
"discarded NAK with wrong server-id %s",
inet_ntop(AF_INET, &server,
serv_addr, sizeof(serv_addr)));
return N_DHCP4_E_AGAIN;
}
}
switch (type) {
case N_DHCP4_MESSAGE_OFFER:
case N_DHCP4_MESSAGE_ACK:

3
src/n-dhcp4-c-probe.c
View file

@ -995,14 +995,13 @@ static int n_dhcp4_client_probe_transition_nak(NDhcp4ClientProbe *probe) {
case N_DHCP4_CLIENT_PROBE_STATE_RENEWING:
case N_DHCP4_CLIENT_PROBE_STATE_REBINDING:
/* XXX */
r = n_dhcp4_client_probe_raise(probe,
NULL,
N_DHCP4_CLIENT_EVENT_RETRACTED);
if (r)
return r;
probe->current_lease = n_dhcp4_client_lease_unref(probe->current_lease);
probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT;
probe->ns_deferred = n_dhcp4_gettime(CLOCK_BOOTTIME) + probe->ns_nak_restart_delay;
probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2u,

1
src/n-dhcp4-private.h
View file

@ -202,6 +202,7 @@ struct NDhcp4Outgoing {
uint8_t type;
uint8_t message_type;
uint32_t client_addr;
uint32_t server_id;
uint64_t start_time;
uint64_t base_time;
uint64_t send_time;