From: Zbigniew Jędrzejewski-Szmek Date: Sat, 16 Sep 2023 07:56:04 +0000 (+0200) Subject: sd-network: modernize log error messages X-Git-Tag: v255-rc1~458^2~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f31fa08057f40ed5872daab7e566d6992b6c0cbd;p=thirdparty%2Fsystemd.git sd-network: modernize log error messages SYNTHETIC_ERRNO() is used where appropriate. Splits in message format strings are removed, so that it's easier to read/grep/copy them. --- diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index 854eca5a584..36b87fe84ed 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -401,8 +401,8 @@ int sd_dhcp_client_set_client_id( * the client-id. The caller is advised to account for that. */ if ((type == ARPHRD_ETHER && data_len != ETH_ALEN) || (type == ARPHRD_INFINIBAND && data_len != 8)) - log_dhcp_client(client, "Changing client ID to hardware type %u with " - "unexpected address length %zu", + log_dhcp_client(client, + "Changing client ID to hardware type %u with unexpected address length %zu", type, data_len); client->client_id.type = type; @@ -1563,10 +1563,9 @@ static int client_handle_offer(sd_dhcp_client *client, DHCPMessage *offer, size_ } r = dhcp_option_parse(offer, len, dhcp_lease_parse_options, lease, NULL); - if (r != DHCP_OFFER) { - log_dhcp_client(client, "received message was not an OFFER, ignoring"); - return -ENOMSG; - } + if (r != DHCP_OFFER) + return log_dhcp_client_errno(client, SYNTHETIC_ERRNO(ENOMSG), + "received message was not an OFFER, ignoring"); lease->next_server = offer->siaddr; lease->address = offer->yiaddr; @@ -1576,19 +1575,16 @@ static int client_handle_offer(sd_dhcp_client *client, DHCPMessage *offer, size_ if (lease->address == 0 || lease->server_address == 0 || - lease->lifetime == 0) { - log_dhcp_client(client, "received lease lacks address, server address or lease lifetime, ignoring"); - return -ENOMSG; - } + lease->lifetime == 0) + return log_dhcp_client_errno(client, SYNTHETIC_ERRNO(ENOMSG), + "received lease lacks address, server address or lease lifetime, ignoring"); if (!lease->have_subnet_mask) { r = dhcp_lease_set_default_subnet_mask(lease); - if (r < 0) { - log_dhcp_client(client, - "received lease lacks subnet mask, " - "and a fallback one cannot be generated, ignoring"); - return -ENOMSG; - } + if (r < 0) + return log_dhcp_client_errno( + client, SYNTHETIC_ERRNO(ENOMSG), + "received lease lacks subnet mask, and a fallback one cannot be generated, ignoring"); } sd_dhcp_lease_unref(client->lease); @@ -1611,14 +1607,13 @@ static int client_handle_forcerenew(sd_dhcp_client *client, DHCPMessage *force, #if 0 log_dhcp_client(client, "FORCERENEW"); - return 0; #else /* FIXME: Ignore FORCERENEW requests until we implement RFC3118 (Authentication for DHCP * Messages) and/or RFC6704 (Forcerenew Nonce Authentication), as unauthenticated FORCERENEW * requests causes a security issue (TALOS-2020-1142, CVE-2020-13529). */ - log_dhcp_client(client, "Received FORCERENEW, ignoring."); - return -ENOMSG; + return log_dhcp_client_errno(client, SYNTHETIC_ERRNO(ENOMSG), + "Received FORCERENEW, ignoring."); #endif } @@ -1657,15 +1652,13 @@ static int client_handle_ack(sd_dhcp_client *client, DHCPMessage *ack, size_t le } r = dhcp_option_parse(ack, len, dhcp_lease_parse_options, lease, &error_message); - if (r == DHCP_NAK) { - log_dhcp_client(client, "NAK: %s", strna(error_message)); - return -EADDRNOTAVAIL; - } + if (r == DHCP_NAK) + return log_dhcp_client_errno(client, SYNTHETIC_ERRNO(EADDRNOTAVAIL), + "NAK: %s", strna(error_message)); - if (r != DHCP_ACK) { - log_dhcp_client(client, "received message was not an ACK, ignoring"); - return -ENOMSG; - } + if (r != DHCP_ACK) + return log_dhcp_client_errno(client, SYNTHETIC_ERRNO(ENOMSG), + "received message was not an ACK, ignoring"); lease->next_server = ack->siaddr; @@ -1673,20 +1666,16 @@ static int client_handle_ack(sd_dhcp_client *client, DHCPMessage *ack, size_t le if (lease->address == INADDR_ANY || lease->server_address == INADDR_ANY || - lease->lifetime == 0) { - log_dhcp_client(client, "received lease lacks address, server " - "address or lease lifetime, ignoring"); - return -ENOMSG; - } + lease->lifetime == 0) + return log_dhcp_client_errno(client, SYNTHETIC_ERRNO(ENOMSG), + "received lease lacks address, server address or lease lifetime, ignoring"); if (lease->subnet_mask == INADDR_ANY) { r = dhcp_lease_set_default_subnet_mask(lease); - if (r < 0) { - log_dhcp_client(client, - "received lease lacks subnet mask, " - "and a fallback one cannot be generated, ignoring"); - return -ENOMSG; - } + if (r < 0) + return log_dhcp_client_errno( + client, SYNTHETIC_ERRNO(ENOMSG), + "received lease lacks subnet mask, and a fallback one cannot be generated, ignoring"); } r = SD_DHCP_CLIENT_EVENT_IP_ACQUIRE; diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c index a35311efb99..9506759bb57 100644 --- a/src/libsystemd-network/sd-radv.c +++ b/src/libsystemd-network/sd-radv.c @@ -1144,7 +1144,8 @@ int sd_radv_pref64_prefix_set_prefix( r = pref64_prefix_length_to_plc(prefixlen, &prefixlen_code); if (r < 0) - return log_radv_errno(NULL, r, "Unsupported PREF64 prefix length %u. Valid lengths are 32, 40, 48, 56, 64 and 96", prefixlen); + return log_radv_errno(NULL, r, + "Unsupported PREF64 prefix length %u. Valid lengths are 32, 40, 48, 56, 64 and 96", prefixlen); if (lifetime_usec == USEC_INFINITY || DIV_ROUND_UP(lifetime_usec, 8 * USEC_PER_SEC) >= UINT64_C(1) << 13) return -EINVAL; diff --git a/src/network/networkd.c b/src/network/networkd.c index 68760e8ff4d..46c2c743467 100644 --- a/src/network/networkd.c +++ b/src/network/networkd.c @@ -87,7 +87,7 @@ static int run(int argc, char *argv[]) { r = manager_setup(m); if (r < 0) - return log_error_errno(r, "Could not setup manager: %m"); + return log_error_errno(r, "Could not set up manager: %m"); r = manager_parse_config_file(m); if (r < 0)