network: rename Protocol= in [RoutingPolicyRule] to IPProtocol=

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 1b6a6d44dd8b77661fb0d1f4541c3d301f21393f..1484c073ef00f0d9b19d955f5c363ad5adb7c887 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1007,9 +1007,9 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><varname>Protocol=</varname></term>
+          <term><varname>IPProtocol=</varname></term>
           <listitem>
-            <para>Specifies the protocol to match in forwarding information base (FIB) rules. Accepted values are tcp, udp and sctp.
+            <para>Specifies the IP protocol to match in forwarding information base (FIB) rules. Accepted values are <literal>tcp</literal>, <literal>udp</literal> and <literal>sctp</literal>.
             Defaults to unset.</para>
           </listitem>
         </varlistentry>

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 378b63af8c0ce36774a333af8b3b778710072ca0..ed15d221785c4080ce96b4917e09a58d6562854f 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -101,7 +101,7 @@ RoutingPolicyRule.From,                 config_parse_routing_policy_rule_prefix,
 RoutingPolicyRule.To,                   config_parse_routing_policy_rule_prefix,        0,                             0
 RoutingPolicyRule.IncomingInterface,    config_parse_routing_policy_rule_device,        0,                             0
 RoutingPolicyRule.OutgoingInterface,    config_parse_routing_policy_rule_device,        0,                             0
-RoutingPolicyRule.Protocol,             config_parse_routing_policy_rule_protocol,      0,                             0
+RoutingPolicyRule.IPProtocol,           config_parse_routing_policy_rule_ip_protocol,   0,                             0
 RoutingPolicyRule.SourcePort,           config_parse_routing_policy_rule_port_range,    0,                             0
 RoutingPolicyRule.DestinationPort,      config_parse_routing_policy_rule_port_range,    0,                             0
 Route.Gateway,                          config_parse_gateway,                           0,                             0

diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c
index c4572a6aad5f4f94d6c335f6ff35c9ab40ddfbea..5d87b27677e991a5fbea10945ea6eea2c6bd293b 100644 (file)
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -932,7 +932,7 @@ int config_parse_routing_policy_rule_port_range(
         return 0;
 }
 
-int config_parse_routing_policy_rule_protocol(
+int config_parse_routing_policy_rule_ip_protocol(
                 const char *unit,
                 const char *filename,
                 unsigned line,

diff --git a/src/network/networkd-routing-policy-rule.h b/src/network/networkd-routing-policy-rule.h
index 3bb3b4cd8110447e77dc4506541935c8ced98691..5665f9979b542a62c68500c507eb58a6368a3515 100644 (file)
--- a/src/network/networkd-routing-policy-rule.h
+++ b/src/network/networkd-routing-policy-rule.h
@@ -79,4 +79,4 @@ CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_prefix);
 CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_priority);
 CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_device);
 CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_port_range);
-CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_protocol);
+CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_ip_protocol);

diff --git a/test/fuzz/fuzz-network-parser/25-fibrule-port-range.network b/test/fuzz/fuzz-network-parser/25-fibrule-port-range.network
index b0502175f38fac68866ea49efe6a349cc5713880..36646ec0ff04686cdf2f9f38186a7e924efa74f1 100644 (file)
--- a/test/fuzz/fuzz-network-parser/25-fibrule-port-range.network
+++ b/test/fuzz/fuzz-network-parser/25-fibrule-port-range.network
@@ -8,4 +8,4 @@ From= 192.168.100.18
 Priority=111
 SourcePort = 1123-1150
 DestinationPort = 3224-3290
-Protocol = tcp
+IPProtocol = tcp

diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network
index 7508f693ddbec6cce301010ee7828bd357648ad4..8ea809a7e1f1ebdf9f6fdd5f31451877411de7e0 100644 (file)
--- a/test/fuzz/fuzz-network-parser/directives.network
+++ b/test/fuzz/fuzz-network-parser/directives.network
@@ -152,7 +152,7 @@ Priority=
 FirewallMark=
 SourcePort=
 DestinationPort=
-Protocol=
+IPProtocol=
 [IPv6PrefixDelegation]
 RouterPreference=
 DNSLifetimeSec=

diff --git a/test/test-network/conf/25-fibrule-port-range.network b/test/test-network/conf/25-fibrule-port-range.network
index b0502175f38fac68866ea49efe6a349cc5713880..36646ec0ff04686cdf2f9f38186a7e924efa74f1 100644 (file)
--- a/test/test-network/conf/25-fibrule-port-range.network
+++ b/test/test-network/conf/25-fibrule-port-range.network
@@ -8,4 +8,4 @@ From= 192.168.100.18
 Priority=111
 SourcePort = 1123-1150
 DestinationPort = 3224-3290
-Protocol = tcp
+IPProtocol = tcp