shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

sd-dhcp-server: rename server_send_nak() -> server_send_nak_or_ignore()

Browse Source 
And logs error in the function.

(cherry picked from commit eb5bff9c9d)
This commit is contained in:
Yu Watanabe 2022-01-28 02:14:47 +09:00 committed by Luca Boccassi
parent 1dcd82a7bf
commit 7f36fb25d5
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -592,16 +592,28 @@ static int server_send_offer_or_ack(
return 0; return 0;
} }
static int server_send_nak(sd_dhcp_server *server, DHCPRequest *req) { static int server_send_nak_or_ignore(sd_dhcp_server *server, bool init_reboot, DHCPRequest *req) {
_cleanup_free_ DHCPPacket *packet = NULL; _cleanup_free_ DHCPPacket *packet = NULL;
size_t offset; size_t offset;
int r; int r;
/* When a request is refused, RFC 2131, section 4.3.2 mentioned we should send NAK when the
* client is in INITREBOOT. If the client is in other state, there is nothing mentioned in the
* RFC whether we should send NAK or not. Hence, let's silently ignore the request. */
if (!init_reboot)
return 0;
r = server_message_init(server, &packet, DHCP_NAK, &offset, req); r = server_message_init(server, &packet, DHCP_NAK, &offset, req);
if (r < 0) if (r < 0)
return r; return log_dhcp_server_errno(server, r, "Failed to create NAK message: %m");
return dhcp_server_send_packet(server, req, packet, DHCP_NAK, offset); r = dhcp_server_send_packet(server, req, packet, DHCP_NAK, offset);
if (r < 0)
return log_dhcp_server_errno(server, r, "Could not send NAK message: %m");
log_dhcp_server(server, "NAK (0x%x)", be32toh(req->message->xid));
return DHCP_NAK;
} }
static int server_send_forcerenew(sd_dhcp_server *server, be32_t address, static int server_send_forcerenew(sd_dhcp_server *server, be32_t address,
@ -1125,18 +1137,9 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message, siz
server->callback(server, SD_DHCP_SERVER_EVENT_LEASE_CHANGED, server->callback_userdata); server->callback(server, SD_DHCP_SERVER_EVENT_LEASE_CHANGED, server->callback_userdata);
return DHCP_ACK; return DHCP_ACK;
} else if (init_reboot) {
r = server_send_nak(server, req);
if (r < 0)
/* this only fails on critical errors */
return log_dhcp_server_errno(server, r, "Could not send nak: %m");
log_dhcp_server(server, "NAK (0x%x)", be32toh(req->message->xid));
return DHCP_NAK;
} }
break; return server_send_nak_or_ignore(server, init_reboot, req);
} }
case DHCP_RELEASE: { case DHCP_RELEASE: {