network: rename WireGuard.FwMark -> FirewallMark

For the consistency with FirewallMark= in [RoutingPolicyRule] section.

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index b71320e20d91b3a0fcdf7a6fc16287ed89fde322..0bbfc611f80e04455967374367295bfc2eda18d7 100644 (file)
--- 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 107827567ea857932c650ca8fc0a25f1ad4a89d0..16636601a0ffcf609223d2aa823b0bef375c9f77 100644 (file)
--- 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 128f8b63415f3a686e7b212fe415eb7b412f24fb..ab7d9f6fc96fb9a7b8444e7ddc0eb0717957d967 100644 (file)
--- 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]