shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

network: make link_may_have_ipv6ll() optionally check Multicast= setting

Browse Source 
Fixes the IPv6LL issue in #23197.
This commit is contained in:
Yu Watanabe 2022-08-02 03:33:21 +09:00
parent 5fb5fae933
commit bd7e0a3f1c
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/networkd-address.c
View File

@ -802,7 +802,7 @@ int link_drop_ipv6ll_addresses(Link *link) {
/* IPv6LL address may be in the tentative state, and in that case networkd has not received it.
* So, we need to dump all IPv6 addresses. */
if (link_may_have_ipv6ll(link))
if (link_may_have_ipv6ll(link, /* check_multicast = */ false))
return 0;
r = sd_rtnl_message_new_addr(link->manager->rtnl, &req, RTM_GETADDR, link->ifindex, AF_INET6);

5
src/network/networkd-ipv6ll.c
View File

@ -38,7 +38,7 @@ bool link_ipv6ll_enabled(Link *link) {
return link->network->link_local & ADDRESS_FAMILY_IPV6;
}
bool link_may_have_ipv6ll(Link *link) {
bool link_may_have_ipv6ll(Link *link, bool check_multicast) {
assert(link);
/*
@ -62,6 +62,9 @@ bool link_may_have_ipv6ll(Link *link) {
if (!link->network)
return false;
if (check_multicast && !FLAGS_SET(link->flags, IFF_MULTICAST) && link->network->multicast <= 0)
return false;
ORDERED_HASHMAP_FOREACH(a, link->network->addresses_by_section) {
if (a->family != AF_INET6)
continue;

2
src/network/networkd-ipv6ll.h
View File

@ -22,7 +22,7 @@ typedef enum IPv6LinkLocalAddressGenMode {
} IPv6LinkLocalAddressGenMode;
bool link_ipv6ll_enabled(Link *link);
bool link_may_have_ipv6ll(Link *link);
bool link_may_have_ipv6ll(Link *link, bool check_multicast);
IPv6LinkLocalAddressGenMode link_get_ipv6ll_addrgen_mode(Link *link);
int ipv6ll_addrgen_mode_fill_message(sd_netlink_message *message, IPv6LinkLocalAddressGenMode mode);

3
src/network/networkd-link.c
View File

@ -83,8 +83,7 @@ bool link_ipv6_enabled(Link *link) {
if (link->network->bond)
return false;
/* DHCPv6 client will not be started if no IPv6 link-local address is configured. */
if (link_ipv6ll_enabled(link))
if (link_may_have_ipv6ll(link, /* check_multicast = */ false))
return true;
if (network_has_static_ipv6_configurations(link->network))

2
src/network/networkd-ndisc.c
View File

@ -41,7 +41,7 @@ bool link_ipv6_accept_ra_enabled(Link *link) {
if (!link->network)
return false;
if (!link_may_have_ipv6ll(link))
if (!link_may_have_ipv6ll(link, /* check_multicast = */ true))
return false;
assert(link->network->ipv6_accept_ra >= 0);

2
src/network/networkd-radv.c
View File

@ -54,7 +54,7 @@ void network_adjust_radv(Network *network) {
bool link_radv_enabled(Link *link) {
assert(link);
if (!link_may_have_ipv6ll(link))
if (!link_may_have_ipv6ll(link, /* check_multicast = */ true))
return false;
if (link->hw_addr.length != ETH_ALEN)