mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-30 22:03:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

network: do not try to set invalid value for IPv6 hop limit

Browse Source
This commit is contained in:
Yu Watanabe 2023-11-06 15:46:39 +09:00
parent 39713b075f
commit 986e182352
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/systemd.network.xml
View File

@ -864,9 +864,9 @@ Table=1234</programlisting></para>
<varlistentry>
<term><varname>IPv6HopLimit=</varname></term>
<listitem>
<para>Configures IPv6 Hop Limit. For each router that forwards the packet, the hop limit is
decremented by 1. When the hop limit field reaches zero, the packet is discarded. When unset,
the kernel's default will be used.</para>
<para>Configures IPv6 Hop Limit. Takes an integer in the range 1…255. For each router that
forwards the packet, the hop limit is decremented by 1. When the hop limit field reaches zero, the
packet is discarded. When unset, the kernel's default will be used.</para>
<xi:include href="version-info.xml" xpointer="v228"/>
</listitem>

2
src/network/networkd-network-gperf.gperf
View File

@ -130,7 +130,7 @@ Network.IPv6PrivacyExtensions, config_parse_ipv6_privacy_extension
Network.IPv6AcceptRA, config_parse_tristate, 0, offsetof(Network, ipv6_accept_ra)
Network.IPv6AcceptRouterAdvertisements, config_parse_tristate, 0, offsetof(Network, ipv6_accept_ra)
Network.IPv6DuplicateAddressDetection, config_parse_int, 0, offsetof(Network, ipv6_dad_transmits)
Network.IPv6HopLimit, config_parse_int, 0, offsetof(Network, ipv6_hop_limit)
Network.IPv6HopLimit, config_parse_uint8, 0, offsetof(Network, ipv6_hop_limit)
Network.IPv6ProxyNDP, config_parse_tristate, 0, offsetof(Network, ipv6_proxy_ndp)
Network.IPv6MTUBytes, config_parse_mtu, AF_INET6, offsetof(Network, ipv6_mtu)
Network.IPv4AcceptLocal, config_parse_tristate, 0, offsetof(Network, ipv4_accept_local)

1
src/network/networkd-network.c
View File

@ -466,7 +466,6 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
.ipv4_route_localnet = -1,
.ipv6_privacy_extensions = _IPV6_PRIVACY_EXTENSIONS_INVALID,
.ipv6_dad_transmits = -1,
.ipv6_hop_limit = -1,
.ipv6_proxy_ndp = -1,
.proxy_arp = -1,
.ipv4_rp_filter = _IP_REVERSE_PATH_FILTER_INVALID,

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

@ -323,7 +323,7 @@ struct Network {
int ipv4_accept_local;
int ipv4_route_localnet;
int ipv6_dad_transmits;
int ipv6_hop_limit;
uint8_t ipv6_hop_limit;
int proxy_arp;
uint32_t ipv6_mtu;
IPv6PrivacyExtensions ipv6_privacy_extensions;

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

@ -178,7 +178,7 @@ static int link_set_ipv6_hop_limit(Link *link) {
if (!link->network)
return 0;
if (link->network->ipv6_hop_limit < 0)
if (link->network->ipv6_hop_limit <= 0)
return 0;
return sysctl_write_ip_property_int(AF_INET6, link->ifname, "hop_limit", link->network->ipv6_hop_limit);