shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

network: rename WireGuard.FwMark -> FirewallMark

Browse Source 
For the consistency with FirewallMark= in [RoutingPolicyRule] section.
This commit is contained in:
Yu Watanabe 2019-05-04 16:21:43 +02:00
parent 6450ee3f8c
commit 1c30b174ed
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
man/systemd.netdev.xml
View File

@ -1416,9 +1416,9 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>FwMark=</varname></term> <term><varname>FirewallMark=</varname></term>
<listitem> <listitem>
<para>Sets a firewall mark on outgoing WireGuard packets from this interface.</para> <para>Sets a firewall mark on outgoing WireGuard packets from this interface. Takes a number between 1 and 4294967295.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>

3
src/network/netdev/netdev-gperf.gperf
View File

@ -197,7 +197,8 @@ Bridge.VLANFiltering, config_parse_tristate,
Bridge.STP, config_parse_tristate, 0, offsetof(Bridge, stp) Bridge.STP, config_parse_tristate, 0, offsetof(Bridge, stp)
VRF.TableId, config_parse_uint32, 0, offsetof(Vrf, table) /* deprecated */ VRF.TableId, config_parse_uint32, 0, offsetof(Vrf, table) /* deprecated */
VRF.Table, config_parse_uint32, 0, offsetof(Vrf, table) VRF.Table, config_parse_uint32, 0, offsetof(Vrf, table)
WireGuard.FwMark, config_parse_unsigned, 0, offsetof(Wireguard, fwmark) WireGuard.FirewallMark, config_parse_unsigned, 0, offsetof(Wireguard, fwmark)
WireGuard.FwMark, config_parse_unsigned, 0, offsetof(Wireguard, fwmark) /* deprecated */
WireGuard.ListenPort, config_parse_wireguard_listen_port, 0, offsetof(Wireguard, port) WireGuard.ListenPort, config_parse_wireguard_listen_port, 0, offsetof(Wireguard, port)
WireGuard.PrivateKey, config_parse_wireguard_private_key, 0, 0 WireGuard.PrivateKey, config_parse_wireguard_private_key, 0, 0
WireGuard.PrivateKeyFile, config_parse_wireguard_private_key_file, 0, 0 WireGuard.PrivateKeyFile, config_parse_wireguard_private_key_file, 0, 0

1
test/fuzz/fuzz-netdev-parser/directives.netdev
View File

@ -11,6 +11,7 @@ ListenPort=
PrivateKey= PrivateKey=
PrivateKeyFile= PrivateKeyFile=
FwMark= FwMark=
FirewallMark=
[MACVTAP] [MACVTAP]
Mode= Mode=
[Match] [Match]