From: Yu Watanabe Date: Thu, 29 Nov 2018 15:42:39 +0000 (+0100) Subject: network: rename Protocol= in [RoutingPolicyRule] to IPProtocol= X-Git-Tag: v240~154^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97f9df9e30962ed1bc6240c5368a18a72f256b72;p=thirdparty%2Fsystemd.git network: rename Protocol= in [RoutingPolicyRule] to IPProtocol= --- diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 1b6a6d44dd8..1484c073ef0 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -1007,9 +1007,9 @@ - Protocol= + IPProtocol= - Specifies the protocol to match in forwarding information base (FIB) rules. Accepted values are tcp, udp and sctp. + Specifies the IP protocol to match in forwarding information base (FIB) rules. Accepted values are tcp, udp and sctp. Defaults to unset. diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 378b63af8c0..ed15d221785 100644 --- 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 c4572a6aad5..5d87b27677e 100644 --- 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 3bb3b4cd811..5665f9979b5 100644 --- 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 b0502175f38..36646ec0ff0 100644 --- 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 7508f693ddb..8ea809a7e1f 100644 --- 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 b0502175f38..36646ec0ff0 100644 --- 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