shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-10 01:17:44 +03:00
Code

sd-dhcp-server: explicitly refuse when conflicting address is requested

Browse Source
This commit is contained in:
Yu Watanabe 2022-01-28 03:50:57 +09:00
parent e2ba408084
commit 7e98fe05a0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsystemd-network/sd-dhcp-server.c
View File

@ -1140,14 +1140,17 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message, siz
return DHCP_ACK; return DHCP_ACK;
} }
DHCPLease *existing_lease_by_address = hashmap_get(server->bound_leases_by_address, UINT32_TO_PTR(address)); if (address_is_in_pool(server, address)) {
if (address_is_in_pool(server, address) && existing_lease_by_address == existing_lease) { /* The requested address is in the pool. */
if (existing_lease && existing_lease->address != address)
/* We previously assigned an address, but the client requested another one. Refuse. */
return server_send_nak_or_ignore(server, init_reboot, req);
_cleanup_(dhcp_lease_freep) DHCPLease *new_lease = NULL; _cleanup_(dhcp_lease_freep) DHCPLease *new_lease = NULL;
usec_t time_now, expiration; usec_t time_now, expiration;
DHCPLease *lease; DHCPLease *lease;
/* Note that in the above condition we accept the case that both leases are NULL. */
r = sd_event_now(server->event, clock_boottime_or_monotonic(), &time_now); r = sd_event_now(server->event, clock_boottime_or_monotonic(), &time_now);
if (r < 0) if (r < 0)
return r; return r;