morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33853 from NickCao/l3mdev

Browse Source 
network: Fixup Table when L3MasterDevice is set on routing policy rule
This commit is contained in:
Luca Boccassi
2024-07-29 10:15:52 +01:00
committed by GitHub
parent 3f24fa57df 615af2c77d
commit 0fa53f5dd7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
man/systemd.network.xml
View File

@@ -1682,7 +1682,8 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
one of predefined names <literal>default</literal>, <literal>main</literal>, and
<literal>local</literal>, and names defined in <varname>RouteTable=</varname> in
<citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
or a number between 1 and 4294967295. Defaults to <literal>main</literal>.</para>
or a number between 1 and 4294967295. Defaults to <literal>main</literal>.
Ignored if <varname>L3MasterDevice=</varname> is true.</para>
<xi:include href="version-info.xml" xpointer="v235"/>
</listitem>
@@ -2053,7 +2054,7 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
<command>ip route show table <replaceable>num</replaceable></command>. If unset and
<varname>Type=</varname> is <literal>local</literal>, <literal>broadcast</literal>,
<literal>anycast</literal>, or <literal>nat</literal>, then <literal>local</literal> is used.
In other cases, defaults to <literal>main</literal>. Ignored if <varname>L3MasterDevice=</varname> is true.</para>
In other cases, defaults to <literal>main</literal>.</para>
<xi:include href="version-info.xml" xpointer="v230"/>
</listitem>

7
src/network/networkd-routing-policy-rule.c
View File

@@ -483,9 +483,7 @@ static int routing_policy_rule_set_netlink_message(const RoutingPolicyRule *rule
return r;
}
if (rule->l3mdev)
r = sd_rtnl_message_routing_policy_rule_set_table(m, RT_TABLE_UNSPEC);
else if (rule->table < 256)
if (rule->table < 256)
r = sd_rtnl_message_routing_policy_rule_set_table(m, rule->table);
else {
r = sd_rtnl_message_routing_policy_rule_set_table(m, RT_TABLE_UNSPEC);
@@ -1784,6 +1782,9 @@ static int routing_policy_rule_section_verify(RoutingPolicyRule *rule) {
/* rule->family can be AF_UNSPEC only when Family=both. */
}
if (rule->l3mdev)
rule->table = RT_TABLE_UNSPEC;
return 0;
}