system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-30 05:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

network/ndisc: fix spurious log messages

Browse source 
- Fix swapped arguments:

Before:
veth99: Prefix 'in deny list' is 2002:da8:1::/64, ignoring
After:
veth99: Prefix '2002:da8:1::/64' is in deny list, ignoring.

- Drop unnecessary DEBUG_LOGGING.
This commit is contained in:
Yu Watanabe 2024-06-25 16:33:15 +09:00 committed by Luca Boccassi
parent 59d4970a55
commit a0b7cae551
2 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/network/networkd-dhcp4.c
View file

@ -1137,14 +1137,12 @@ static int dhcp_server_is_filtered(Link *link, sd_dhcp_client *client) {
return log_link_debug_errno(link, r, "Failed to get DHCP server IP address: %m");
if (in4_address_is_filtered(&addr, link->network->dhcp_allow_listed_ip, link->network->dhcp_deny_listed_ip)) {
if (DEBUG_LOGGING) {
if (link->network->dhcp_allow_listed_ip)
log_link_debug(link, "DHCPv4 server IP address "IPV4_ADDRESS_FMT_STR" not found in allow-list, ignoring offer.",
IPV4_ADDRESS_FMT_VAL(addr));
else
log_link_debug(link, "DHCPv4 server IP address "IPV4_ADDRESS_FMT_STR" found in deny-list, ignoring offer.",
IPV4_ADDRESS_FMT_VAL(addr));
}
if (link->network->dhcp_allow_listed_ip)
log_link_debug(link, "DHCPv4 server IP address "IPV4_ADDRESS_FMT_STR" not found in allow-list, ignoring offer.",
IPV4_ADDRESS_FMT_VAL(addr));
else
log_link_debug(link, "DHCPv4 server IP address "IPV4_ADDRESS_FMT_STR" found in deny-list, ignoring offer.",
IPV4_ADDRESS_FMT_VAL(addr));
return true;
}

29
src/network/networkd-ndisc.c
View file

@ -1275,10 +1275,11 @@ static int ndisc_router_process_prefix(Link *link, sd_ndisc_router *rt) {
return log_link_warning_errno(link, r, "Failed to get prefix length: %m");
if (in6_prefix_is_filtered(&a, prefixlen, link->network->ndisc_allow_listed_prefix, link->network->ndisc_deny_listed_prefix)) {
if (DEBUG_LOGGING)
log_link_debug(link, "Prefix '%s' is %s, ignoring",
!set_isempty(link->network->ndisc_allow_listed_prefix) ? "not in allow list"
: "in deny list",
if (set_isempty(link->network->ndisc_allow_listed_prefix))
log_link_debug(link, "Prefix '%s' is in deny list, ignoring.",
IN6_ADDR_PREFIX_TO_STRING(&a, prefixlen));
else
log_link_debug(link, "Prefix '%s' is not in allow list, ignoring.",
IN6_ADDR_PREFIX_TO_STRING(&a, prefixlen));
return 0;
}
@ -1329,11 +1330,11 @@ static int ndisc_router_process_route(Link *link, sd_ndisc_router *rt) {
if (in6_prefix_is_filtered(&dst, prefixlen,
link->network->ndisc_allow_listed_route_prefix,
link->network->ndisc_deny_listed_route_prefix)) {
if (DEBUG_LOGGING)
log_link_debug(link, "Route prefix %s is %s, ignoring",
!set_isempty(link->network->ndisc_allow_listed_route_prefix) ? "not in allow list"
: "in deny list",
if (set_isempty(link->network->ndisc_allow_listed_route_prefix))
log_link_debug(link, "Route prefix '%s' is in deny list, ignoring.",
IN6_ADDR_PREFIX_TO_STRING(&dst, prefixlen));
else
log_link_debug(link, "Route prefix '%s' is not in allow list, ignoring.",
IN6_ADDR_PREFIX_TO_STRING(&dst, prefixlen));
return 0;
}
@ -2103,12 +2104,10 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
return log_link_warning_errno(link, r, "Failed to get router address from RA: %m");
if (in6_prefix_is_filtered(&router, 128, link->network->ndisc_allow_listed_router, link->network->ndisc_deny_listed_router)) {
if (DEBUG_LOGGING) {
if (!set_isempty(link->network->ndisc_allow_listed_router))
log_link_debug(link, "Router %s is not in allow list, ignoring.", IN6_ADDR_TO_STRING(&router));
else
log_link_debug(link, "Router %s is in deny list, ignoring.", IN6_ADDR_TO_STRING(&router));
}
if (!set_isempty(link->network->ndisc_allow_listed_router))
log_link_debug(link, "Router %s is not in allow list, ignoring.", IN6_ADDR_TO_STRING(&router));
else
log_link_debug(link, "Router %s is in deny list, ignoring.", IN6_ADDR_TO_STRING(&router));
return 0;
}