network: rename WireGuard.FwMark -> FirewallMark

yuwata · yuwata · commit 1c30b174edc0 · 2019-05-04T17:20:23.000+02:00
For the consistency with FirewallMark= in [RoutingPolicyRule] section.
diff --git 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
@@ -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
@@ -11,6 +11,7 @@ ListenPort=
 PrivateKey=
 PrivateKeyFile=
 FwMark=
+FirewallMark=
 [MACVTAP]
 Mode=
 [Match]
