shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-28 07:21:32 +03:00
Code

Merge pull request #12478 from yuwata/wireguard-fwmark

Browse Source 
network: rename WireGuard.FwMark -> FirewallMark
This commit is contained in:
Yu Watanabe 2019-05-07 05:16:34 +02:00 committed by GitHub
commit b30160ff7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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>
</varlistentry>
<varlistentry>
<term><varname>FwMark=</varname></term>
<term><varname>FirewallMark=</varname></term>
<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>
</varlistentry>
</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)
VRF.TableId, config_parse_uint32, 0, offsetof(Vrf, table) /* deprecated */
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.PrivateKey, config_parse_wireguard_private_key, 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=
PrivateKeyFile=
FwMark=
FirewallMark=
[MACVTAP]
Mode=
[Match]