mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-03 15:23:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30128 from yuwata/network-rapid-commit-follow-ups

Browse Source 
network/dhcp: several follow-ups for RapidCommit=
This commit is contained in:
Luca Boccassi 2023-11-21 23:43:00 +00:00 committed by GitHub
commit 8bff168cb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
man/systemd.network.xml
View File

@ -2236,7 +2236,8 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
four-message exchange (discover, offer, request, and ack) is used. The two-message exchange
provides faster client configuration. See
<ulink url="https://tools.ietf.org/html/rfc4039">RFC 4039</ulink> for details.
Defaults to true.</para>
Defaults to true when <varname>Anonymize=no</varname> and neither <varname>AllowList=</varname>
nor <varname>DenyList=</varname> is specified, and false otherwise.</para>
<xi:include href="version-info.xml" xpointer="v255"/>
</listitem>
@ -2256,6 +2257,7 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
<para>When true,
<varname>ClientIdentifier=mac</varname>,
<varname>RapidCommit=no</varname>,
<varname>SendHostname=no</varname>,
<varname>Use6RD=no</varname>,
<varname>UseCaptivePortal=no</varname>,
@ -2669,6 +2671,9 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
prefix length after <literal>/</literal>. DHCP offers from servers in the list are rejected.
Note that if <varname>AllowList=</varname> is configured then <varname>DenyList=</varname> is
ignored.</para>
<para>Note that this filters only DHCP offers, so the filtering may not work when
<varname>RapidCommit=</varname> is enabled. See also <varname>RapidCommit=</varname> in the above.
</para>
<xi:include href="version-info.xml" xpointer="v246"/>
</listitem>
@ -2680,6 +2685,9 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
<para>A whitespace-separated list of IPv4 addresses. Each address can optionally take a
prefix length after <literal>/</literal>. DHCP offers from servers in the list are accepted.
</para>
<para>Note that this filters only DHCP offers, so the filtering may not work when
<varname>RapidCommit=</varname> is enabled. See also <varname>RapidCommit=</varname> in the above.
</para>
<xi:include href="version-info.xml" xpointer="v246"/>
</listitem>

7
src/network/networkd-dhcp4.c
View File

@ -51,6 +51,13 @@ void network_adjust_dhcp4(Network *network) {
if (network->dhcp_client_identifier < 0)
network->dhcp_client_identifier = network->dhcp_anonymize ? DHCP_CLIENT_ID_MAC : DHCP_CLIENT_ID_DUID;
/* By default, RapidCommit= is enabled when Anonymize=no and neither AllowList= nor DenyList= is specified. */
if (network->dhcp_use_rapid_commit < 0)
network->dhcp_use_rapid_commit =
!network->dhcp_anonymize &&
set_isempty(network->dhcp_allow_listed_ip) &&
set_isempty(network->dhcp_deny_listed_ip);
}
static int dhcp4_prefix_covers(

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

@ -261,7 +261,7 @@ DHCPv4.Use6RD, config_parse_bool,
DHCPv4.IPv6OnlyMode, config_parse_tristate, 0, offsetof(Network, dhcp_ipv6_only_mode)
DHCPv4.NetLabel, config_parse_string, CONFIG_PARSE_STRING_SAFE, offsetof(Network, dhcp_netlabel)
DHCPv4.NFTSet, config_parse_nft_set, NFT_SET_PARSE_NETWORK, offsetof(Network, dhcp_nft_set_context)
DHCPv4.RapidCommit config_parse_bool, 0, offsetof(Network, dhcp_use_rapid_commit)
DHCPv4.RapidCommit config_parse_tristate, 0, offsetof(Network, dhcp_use_rapid_commit)
DHCPv6.UseAddress, config_parse_bool, 0, offsetof(Network, dhcp6_use_address)
DHCPv6.UseDelegatedPrefix, config_parse_bool, 0, offsetof(Network, dhcp6_use_pd_prefix)
DHCPv6.UseDNS, config_parse_dhcp_use_dns, AF_INET6, 0

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

@ -396,7 +396,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
.dhcp_send_hostname = true,
.dhcp_send_release = true,
.dhcp_route_metric = DHCP_ROUTE_METRIC,
.dhcp_use_rapid_commit = true,
.dhcp_use_rapid_commit = -1,
.dhcp_client_identifier = _DHCP_CLIENT_ID_INVALID,
.dhcp_route_table = RT_TABLE_MAIN,
.dhcp_ip_service_type = -1,

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

@ -141,7 +141,7 @@ struct Network {
bool dhcp_send_hostname_set;
int dhcp_broadcast;
int dhcp_ipv6_only_mode;
bool dhcp_use_rapid_commit;
int dhcp_use_rapid_commit;
bool dhcp_use_dns;
bool dhcp_use_dns_set;
bool dhcp_routes_to_dns;