shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-11 20:58:27 +03:00
Code

Fix bootp bug w/ missing siaddr, and improve logging

Browse Source
This commit is contained in:
Avram Dorfman 2024-12-19 04:17:14 +00:00
parent f30efcc9cf
commit dc61d4f1aa
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libsystemd-network/sd-dhcp-client.c
View File

@ -1602,17 +1602,26 @@ static int client_parse_message(
assert_not_reached();
}
lease->next_server = message->siaddr;
lease->address = message->yiaddr;
if (client->bootp) {
log_dhcp_client(client, "BOOTP identified, using infinite lease and siaddr(%#x)", message->siaddr);
if (client->bootp)
lease->lifetime = USEC_INFINITY;
lease->server_address = message->siaddr;
lease->next_server = 0;
} else
lease->next_server = message->siaddr;
lease->address = message->yiaddr;
if (lease->address == 0 ||
lease->server_address == 0 ||
lease->lifetime == 0)
return log_dhcp_client_errno(client, SYNTHETIC_ERRNO(ENOMSG),
"received lease lacks address, server address or lease lifetime, ignoring.");
"received lease lacks address(%#x), server address(%#x) or lease lifetime(%#lx), ignoring.",
lease->address,
lease->server_address,
lease->lifetime);
r = dhcp_lease_set_default_subnet_mask(lease);
if (r < 0)