From 745f0620edfc06a20a19bc322efdfa6fed45d781 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 24 Feb 2022 13:26:18 +0900 Subject: [PATCH] network: dhcp-server: add two more log messages --- src/network/networkd-dhcp-server.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c index 28762107309..795ad686af9 100644 --- a/src/network/networkd-dhcp-server.c +++ b/src/network/networkd-dhcp-server.c @@ -528,8 +528,7 @@ static int dhcp4_server_configure(Link *link) { return log_link_error_errno(link, r, "Could not start DHCPv4 server instance: %m"); log_link_debug(link, "Offering DHCPv4 leases"); - - return 1; + return 0; } static bool dhcp_server_is_ready_to_configure(Link *link) { @@ -569,17 +568,26 @@ static bool dhcp_server_is_ready_to_configure(Link *link) { } int request_process_dhcp_server(Request *req) { + Link *link; + int r; + assert(req); - assert(req->link); assert(req->type == REQUEST_TYPE_DHCP_SERVER); + assert_se(link = req->link); - if (!dhcp_server_is_ready_to_configure(req->link)) + if (!dhcp_server_is_ready_to_configure(link)) return 0; - return dhcp4_server_configure(req->link); + r = dhcp4_server_configure(link); + if (r < 0) + return log_link_warning_errno(link, r, "Failed to configure DHCP server: %m"); + + return 1; } int link_request_dhcp_server(Link *link) { + int r; + assert(link); if (!link_dhcp4_server_enabled(link)) @@ -589,7 +597,11 @@ int link_request_dhcp_server(Link *link) { return 0; log_link_debug(link, "Requesting DHCP server."); - return link_queue_request(link, REQUEST_TYPE_DHCP_SERVER, NULL, false, NULL, NULL, NULL); + r = link_queue_request(link, REQUEST_TYPE_DHCP_SERVER, NULL, false, NULL, NULL, NULL); + if (r < 0) + return log_link_warning_errno(link, r, "Failed to request configuration of DHCP server: %m"); + + return 0; } int config_parse_dhcp_server_relay_agent_suboption( -- 2.47.3