From: Yu Watanabe Date: Tue, 10 Aug 2021 06:02:35 +0000 (+0900) Subject: network: DHCP[46] -> DHCPv[46] in log messages X-Git-Tag: v250-rc1~856^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8716018664e13b71288d9c58c4805484d53ec483;p=thirdparty%2Fsystemd.git network: DHCP[46] -> DHCPv[46] in log messages --- diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index 3d00802b200..2b201e271ee 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -492,8 +492,8 @@ int config_parse_iaid(const char *unit, network->dhcp_iaid = iaid; network->dhcp_iaid_set = true; if (!network->dhcp6_iaid_set_explicitly) { - /* Backward compatibility. Previously, IAID is shared by DHCP4 and DHCP6. - * If DHCP6 IAID is not specified explicitly, then use DHCP4 IAID for DHCP6. */ + /* Backward compatibility. Previously, IAID is shared by DHCPv4 and DHCPv6. + * If DHCPv6 IAID is not specified explicitly, then use DHCPv4 IAID for DHCPv6. */ network->dhcp6_iaid = iaid; network->dhcp6_iaid_set = true; } @@ -985,7 +985,7 @@ int config_parse_manager_duid_type( assert(manager); - /* For backward compatibility. Setting both DHCP4 and DHCP6 DUID if they are not specified explicitly. */ + /* For backward compatibility. Setting both DHCPv4 and DHCPv6 DUID if they are not specified explicitly. */ r = config_parse_duid_type(unit, filename, line, section, section_line, lvalue, false, rvalue, &manager->dhcp_duid, manager); if (r < 0) @@ -1015,7 +1015,7 @@ int config_parse_network_duid_type( if (r < 0) return r; - /* For backward compatibility, also set DHCP6 DUID if not specified explicitly. */ + /* For backward compatibility, also set DHCPv6 DUID if not specified explicitly. */ return config_parse_duid_type(unit, filename, line, section, section_line, lvalue, false, rvalue, &network->dhcp6_duid, network); } @@ -1110,7 +1110,7 @@ int config_parse_manager_duid_rawdata( assert(manager); - /* For backward compatibility. Setting both DHCP4 and DHCP6 DUID if they are not specified explicitly. */ + /* For backward compatibility. Setting both DHCPv4 and DHCPv6 DUID if they are not specified explicitly. */ r = config_parse_duid_rawdata(unit, filename, line, section, section_line, lvalue, false, rvalue, &manager->dhcp_duid, manager); if (r < 0) @@ -1140,6 +1140,6 @@ int config_parse_network_duid_rawdata( if (r < 0) return r; - /* For backward compatibility, also set DHCP6 DUID if not specified explicitly. */ + /* For backward compatibility, also set DHCPv6 DUID if not specified explicitly. */ return config_parse_duid_rawdata(unit, filename, line, section, section_line, lvalue, false, rvalue, &network->dhcp6_duid, network); } diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index cc6d1988516..12fb85bf902 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1311,7 +1311,7 @@ static int dhcp4_set_hostname(Link *link) { else { r = gethostname_strict(&hostname); if (r < 0 && r != -ENXIO) /* ENXIO: no hostname set or hostname is "localhost" */ - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to get hostname: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to get hostname: %m"); hn = hostname; } @@ -1319,9 +1319,9 @@ static int dhcp4_set_hostname(Link *link) { r = sd_dhcp_client_set_hostname(link->dhcp_client, hn); if (r == -EINVAL && hostname) /* Ignore error when the machine's hostname is not suitable to send in DHCP packet. */ - log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set hostname from kernel hostname, ignoring: %m"); + log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set hostname from kernel hostname, ignoring: %m"); else if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set hostname: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set hostname: %m"); return 0; } @@ -1351,7 +1351,7 @@ static int dhcp4_set_client_identifier(Link *link) { duid->raw_data_len > 0 ? duid->raw_data : NULL, duid->raw_data_len); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set IAID+DUID: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set IAID+DUID: %m"); break; } case DHCP_CLIENT_ID_DUID_ONLY: { @@ -1367,7 +1367,7 @@ static int dhcp4_set_client_identifier(Link *link) { duid->raw_data_len > 0 ? duid->raw_data : NULL, duid->raw_data_len); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set DUID: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set DUID: %m"); break; } case DHCP_CLIENT_ID_MAC: { @@ -1385,7 +1385,7 @@ static int dhcp4_set_client_identifier(Link *link) { hw_addr, hw_addr_len); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set client ID: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set client ID: %m"); break; } default: @@ -1415,7 +1415,7 @@ static int dhcp4_set_request_address(Link *link) { if (!a) return 0; - log_link_debug(link, "DHCP4 CLIENT: requesting " IPV4_ADDRESS_FMT_STR, IPV4_ADDRESS_FMT_VAL(a->in_addr.in)); + log_link_debug(link, "DHCPv4 CLIENT: requesting " IPV4_ADDRESS_FMT_STR, IPV4_ADDRESS_FMT_VAL(a->in_addr.in)); return sd_dhcp_client_set_request_address(link->dhcp_client, &a->in_addr.in); } @@ -1436,9 +1436,9 @@ static bool link_needs_dhcp_broadcast(Link *link) { if (r < 0 && link->sd_device && sd_device_get_property_value(link->sd_device, "ID_NET_DHCP_BROADCAST", &val) >= 0) { r = parse_boolean(val); if (r < 0) - log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to parse ID_NET_DHCP_BROADCAST, ignoring: %m"); + log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to parse ID_NET_DHCP_BROADCAST, ignoring: %m"); else - log_link_debug(link, "DHCP4 CLIENT: Detected ID_NET_DHCP_BROADCAST='%d'.", r); + log_link_debug(link, "DHCPv4 CLIENT: Detected ID_NET_DHCP_BROADCAST='%d'.", r); } return r == true; @@ -1453,80 +1453,80 @@ static int dhcp4_configure(Link *link) { assert(link->network); if (link->dhcp_client) - return log_link_debug_errno(link, SYNTHETIC_ERRNO(EBUSY), "DHCP4 client is already configured."); + return log_link_debug_errno(link, SYNTHETIC_ERRNO(EBUSY), "DHCPv4 client is already configured."); r = sd_dhcp_client_new(&link->dhcp_client, link->network->dhcp_anonymize); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to allocate DHCP4 client: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to allocate DHCPv4 client: %m"); r = sd_dhcp_client_attach_event(link->dhcp_client, link->manager->event, 0); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to attach event to DHCP4 client: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to attach event to DHCPv4 client: %m"); r = sd_dhcp_client_set_mac(link->dhcp_client, link->hw_addr.bytes, link->bcast_addr.length > 0 ? link->bcast_addr.bytes : NULL, link->hw_addr.length, link->iftype); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set MAC address: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set MAC address: %m"); r = sd_dhcp_client_set_ifindex(link->dhcp_client, link->ifindex); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set ifindex: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set ifindex: %m"); r = sd_dhcp_client_set_callback(link->dhcp_client, dhcp4_handler, link); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set callback: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set callback: %m"); r = sd_dhcp_client_set_request_broadcast(link->dhcp_client, link_needs_dhcp_broadcast(link)); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for broadcast: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set request flag for broadcast: %m"); if (link->mtu > 0) { r = sd_dhcp_client_set_mtu(link->dhcp_client, link->mtu); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set MTU: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set MTU: %m"); } if (!link->network->dhcp_anonymize) { if (link->network->dhcp_use_mtu) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_INTERFACE_MTU); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for MTU: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set request flag for MTU: %m"); } if (link->network->dhcp_use_routes) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_STATIC_ROUTE); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for static route: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set request flag for static route: %m"); r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for classless static route: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set request flag for classless static route: %m"); } if (link->network->dhcp_use_domains != DHCP_USE_DOMAINS_NO) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_DOMAIN_SEARCH_LIST); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for domain search list: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set request flag for domain search list: %m"); } if (link->network->dhcp_use_ntp) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NTP_SERVER); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for NTP server: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set request flag for NTP server: %m"); } if (link->network->dhcp_use_sip) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_SIP_SERVER); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for SIP server: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set request flag for SIP server: %m"); } if (link->network->dhcp_use_timezone) { r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NEW_TZDB_TIMEZONE); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for timezone: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set request flag for timezone: %m"); } SET_FOREACH(request_options, link->network->dhcp_request_options) { @@ -1534,7 +1534,7 @@ static int dhcp4_configure(Link *link) { r = sd_dhcp_client_set_request_option(link->dhcp_client, option); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for '%u': %m", option); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set request flag for '%u': %m", option); } ORDERED_HASHMAP_FOREACH(send_option, link->network->dhcp_client_send_options) { @@ -1542,7 +1542,7 @@ static int dhcp4_configure(Link *link) { if (r == -EEXIST) continue; if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set send option: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set send option: %m"); } ORDERED_HASHMAP_FOREACH(send_option, link->network->dhcp_client_send_vendor_options) { @@ -1550,7 +1550,7 @@ static int dhcp4_configure(Link *link) { if (r == -EEXIST) continue; if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set send option: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set send option: %m"); } r = dhcp4_set_hostname(link); @@ -1561,49 +1561,49 @@ static int dhcp4_configure(Link *link) { r = sd_dhcp_client_set_vendor_class_identifier(link->dhcp_client, link->network->dhcp_vendor_class_identifier); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set vendor class identifier: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set vendor class identifier: %m"); } if (link->network->dhcp_mudurl) { r = sd_dhcp_client_set_mud_url(link->dhcp_client, link->network->dhcp_mudurl); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set MUD URL: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set MUD URL: %m"); } if (link->network->dhcp_user_class) { r = sd_dhcp_client_set_user_class(link->dhcp_client, link->network->dhcp_user_class); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set user class: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set user class: %m"); } } if (link->network->dhcp_client_port > 0) { r = sd_dhcp_client_set_client_port(link->dhcp_client, link->network->dhcp_client_port); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set listen port: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set listen port: %m"); } if (link->network->dhcp_max_attempts > 0) { r = sd_dhcp_client_set_max_attempts(link->dhcp_client, link->network->dhcp_max_attempts); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set max attempts: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set max attempts: %m"); } if (link->network->dhcp_ip_service_type > 0) { r = sd_dhcp_client_set_service_type(link->dhcp_client, link->network->dhcp_ip_service_type); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set IP service type: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set IP service type: %m"); } if (link->network->dhcp_fallback_lease_lifetime > 0) { r = sd_dhcp_client_set_fallback_lease_lifetime(link->dhcp_client, link->network->dhcp_fallback_lease_lifetime); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed set to lease lifetime: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed set to lease lifetime: %m"); } r = dhcp4_set_request_address(link); if (r < 0) - return log_link_debug_errno(link, r, "DHCP4 CLIENT: Failed to set initial DHCPv4 address: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set initial DHCPv4 address: %m"); return dhcp4_set_client_identifier(link); } diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index 163af103e49..2f755bc4ebb 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -920,7 +920,7 @@ static int dhcp6_pd_prefix_add(Link *link, const struct in6_addr *prefix, uint8_ log_link_full(link, set_contains(link->dhcp6_pd_prefixes, p) ? LOG_DEBUG : prefixlen > 64 || prefixlen < 48 ? LOG_WARNING : LOG_INFO, - "DHCP6: received PD Prefix %s%s", + "DHCPv6: received PD Prefix %s%s", strna(buf), prefixlen > 64 ? " with prefix length > 64, ignoring." : prefixlen < 48 ? " with prefix length < 48, looks unusual.": ""); @@ -928,7 +928,7 @@ static int dhcp6_pd_prefix_add(Link *link, const struct in6_addr *prefix, uint8_ /* Store PD prefix even if prefixlen > 64, not to make logged at warning level so frequently. */ r = set_ensure_put(&link->dhcp6_pd_prefixes, &in_addr_prefix_hash_ops_free, p); if (r < 0) - return log_link_error_errno(link, r, "Failed to store DHCP6 PD prefix %s: %m", strna(buf)); + return log_link_error_errno(link, r, "Failed to store DHCPv6 PD prefix %s: %m", strna(buf)); if (r > 0) TAKE_PTR(p); @@ -1512,7 +1512,7 @@ static int dhcp6_set_hostname(sd_dhcp6_client *client, Link *link) { else { r = gethostname_strict(&hostname); if (r < 0 && r != -ENXIO) /* ENXIO: no hostname set or hostname is "localhost" */ - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to get hostname: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to get hostname: %m"); hn = hostname; } @@ -1520,9 +1520,9 @@ static int dhcp6_set_hostname(sd_dhcp6_client *client, Link *link) { r = sd_dhcp6_client_set_fqdn(client, hn); if (r == -EINVAL && hostname) /* Ignore error when the machine's hostname is not suitable to send in DHCP packet. */ - log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set hostname from kernel hostname, ignoring: %m"); + log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set hostname from kernel hostname, ignoring: %m"); else if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set hostname: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set hostname: %m"); return 0; } @@ -1589,28 +1589,28 @@ static int dhcp6_configure(Link *link) { assert(link->network); if (link->dhcp6_client) - return log_link_debug_errno(link, SYNTHETIC_ERRNO(EBUSY), "DHCP6 client is already configured."); + return log_link_debug_errno(link, SYNTHETIC_ERRNO(EBUSY), "DHCPv6 client is already configured."); r = sd_dhcp6_client_new(&client); if (r == -ENOMEM) return log_oom_debug(); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to create DHCP6 client: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to create DHCPv6 client: %m"); r = sd_dhcp6_client_attach_event(client, link->manager->event, 0); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to attach event: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to attach event: %m"); r = dhcp6_set_identifier(link, client); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set identifier: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set identifier: %m"); ORDERED_HASHMAP_FOREACH(send_option, link->network->dhcp6_client_send_options) { r = sd_dhcp6_client_add_option(client, send_option); if (r == -EEXIST) continue; if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set option: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set option: %m"); } r = dhcp6_set_hostname(client, link); @@ -1619,18 +1619,18 @@ static int dhcp6_configure(Link *link) { r = sd_dhcp6_client_set_ifindex(client, link->ifindex); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set ifindex: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set ifindex: %m"); if (link->network->dhcp6_rapid_commit) { r = sd_dhcp6_client_set_request_option(client, SD_DHCP6_OPTION_RAPID_COMMIT); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set request flag for rapid commit: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set request flag for rapid commit: %m"); } if (link->network->dhcp6_mudurl) { r = sd_dhcp6_client_set_request_mud_url(client, link->network->dhcp6_mudurl); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set MUD URL: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set MUD URL: %m"); } SET_FOREACH(request_options, link->network->dhcp6_request_options) { @@ -1638,23 +1638,23 @@ static int dhcp6_configure(Link *link) { r = sd_dhcp6_client_set_request_option(client, option); if (r == -EEXIST) { - log_link_debug(link, "DHCP6 CLIENT: Failed to set request flag for '%u' already exists, ignoring.", option); + log_link_debug(link, "DHCPv6 CLIENT: Failed to set request flag for '%u' already exists, ignoring.", option); continue; } if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set request flag for '%u': %m", option); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set request flag for '%u': %m", option); } if (link->network->dhcp6_user_class) { r = sd_dhcp6_client_set_request_user_class(client, link->network->dhcp6_user_class); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set user class: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set user class: %m"); } if (link->network->dhcp6_vendor_class) { r = sd_dhcp6_client_set_request_vendor_class(client, link->network->dhcp6_vendor_class); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set vendor class: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set vendor class: %m"); } ORDERED_HASHMAP_FOREACH(vendor_option, link->network->dhcp6_client_send_vendor_options) { @@ -1662,23 +1662,23 @@ static int dhcp6_configure(Link *link) { if (r == -EEXIST) continue; if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set vendor option: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set vendor option: %m"); } r = sd_dhcp6_client_set_callback(client, dhcp6_handler, link); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set callback: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set callback: %m"); if (dhcp6_enable_prefix_delegation(link)) { r = sd_dhcp6_client_set_prefix_delegation(client, true); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set prefix delegation: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set prefix delegation: %m"); } if (link->network->dhcp6_pd_length > 0) { r = sd_dhcp6_client_set_prefix_delegation_hint(client, link->network->dhcp6_pd_length, &link->network->dhcp6_pd_address); if (r < 0) - return log_link_debug_errno(link, r, "DHCP6 CLIENT: Failed to set prefix hint: %m"); + return log_link_debug_errno(link, r, "DHCPv6 CLIENT: Failed to set prefix hint: %m"); } link->dhcp6_client = TAKE_PTR(client); diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 041a53e97b3..92fab92553d 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -507,7 +507,7 @@ void link_check_ready(Link *link) { !link->dhcp_address && set_isempty(link->dhcp6_addresses) && !has_ndisc_address && !link->ipv4ll_address_configured) /* When DHCP[46] or IPv4LL is enabled, at least one address is acquired by them. */ - return (void) log_link_debug(link, "%s(): DHCP4, DHCP6 or IPv4LL is enabled but no dynamic address is assigned yet.", __func__); + return (void) log_link_debug(link, "%s(): DHCPv4, DHCPv6 or IPv4LL is enabled but no dynamic address is assigned yet.", __func__); /* Ignore NDisc when ConfigureWithoutCarrier= is enabled, as IPv6AcceptRA= is enabled by default. */ if (link_dhcp4_enabled(link) || link_dhcp6_enabled(link) || link_dhcp6_pd_is_enabled(link) || @@ -522,8 +522,8 @@ void link_check_ready(Link *link) { /* When DHCP[46], NDisc, or IPv4LL is enabled, at least one protocol must be finished. */ return (void) log_link_debug(link, "%s(): dynamic addresses or routes are not configured.", __func__); - log_link_debug(link, "%s(): dhcp4:%s ipv4ll:%s dhcp6_addresses:%s dhcp6_routes:%s " - "dhcp6_pd_addresses:%s dhcp6_pd_routes:%s ndisc_addresses:%s ndisc_routes:%s", + log_link_debug(link, "%s(): DHCPv4:%s IPv4LL:%s DHCPv6_addresses:%s DHCPv6_routes:%s " + "DHCPv6PD_addresses:%s DHCPv6PD_routes:%s NDisc_addresses:%s NDisc_routes:%s", __func__, yes_no(link->dhcp4_configured), yes_no(link->ipv4ll_address_configured),