diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-05-07 05:16:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 05:16:34 +0200 |
| commit | b30160ff7f70a188a5ba7d03ddbce4993f49346d (patch) | |
| tree | 817f3b56177366033f81dbaa0934bd7a62d26617 | |
| parent | c2d6b5ac9d1f265a34158e155e8aba04e0054c56 (diff) | |
| parent | 1c30b174edc001537350036245ea632cb4e91cbb (diff) | |
| download | systemd-b30160ff7f70a188a5ba7d03ddbce4993f49346d.tar.gz | |
Merge pull request #12478 from yuwata/wireguard-fwmark
network: rename WireGuard.FwMark -> FirewallMark
| -rw-r--r-- | man/systemd.netdev.xml | 4 | ||||
| -rw-r--r-- | src/network/netdev/netdev-gperf.gperf | 3 | ||||
| -rw-r--r-- | test/fuzz/fuzz-netdev-parser/directives.netdev | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index b71320e20d..0bbfc611f8 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -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> diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf index 107827567e..16636601a0 100644 --- a/src/network/netdev/netdev-gperf.gperf +++ b/src/network/netdev/netdev-gperf.gperf @@ -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 diff --git a/test/fuzz/fuzz-netdev-parser/directives.netdev b/test/fuzz/fuzz-netdev-parser/directives.netdev index 128f8b6341..ab7d9f6fc9 100644 --- a/test/fuzz/fuzz-netdev-parser/directives.netdev +++ b/test/fuzz/fuzz-netdev-parser/directives.netdev @@ -11,6 +11,7 @@ ListenPort= PrivateKey= PrivateKeyFile= FwMark= +FirewallMark= [MACVTAP] Mode= [Match] |