From: Yu Watanabe Date: Sat, 3 Aug 2019 20:09:08 +0000 (+0900) Subject: network: rename AddressFamilyBoolean -> AddressFamily X-Git-Tag: v243-rc2~18^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d79289525ce2a85c22c6be6290f876b96b1bc0a;p=thirdparty%2Fsystemd.git network: rename AddressFamilyBoolean -> AddressFamily We usually do not call an extended boolean as XxxBoolean. --- diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index d958d11d01e..626b9758392 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -18,7 +18,7 @@ int config_parse_dhcp( void *data, void *userdata) { - AddressFamilyBoolean *dhcp = data, s; + AddressFamily *dhcp = data, s; assert(filename); assert(lvalue); @@ -26,10 +26,10 @@ int config_parse_dhcp( assert(data); /* Note that this is mostly like - * config_parse_address_family_boolean(), except that it + * config_parse_address_family(), except that it * understands some old names for the enum values */ - s = address_family_boolean_from_string(rvalue); + s = address_family_from_string(rvalue); if (s < 0) { /* Previously, we had a slightly different enum here, @@ -51,7 +51,7 @@ int config_parse_dhcp( log_syntax(unit, LOG_WARNING, filename, line, 0, "DHCP=%s is deprecated, please use DHCP=%s instead.", - rvalue, address_family_boolean_to_string(s)); + rvalue, address_family_to_string(s)); } *dhcp = s; diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c index 71f6af6af2a..e50a3150df8 100644 --- a/src/network/networkd-ipv4ll.c +++ b/src/network/networkd-ipv4ll.c @@ -251,7 +251,7 @@ int config_parse_ipv4ll( void *data, void *userdata) { - AddressFamilyBoolean *link_local = data; + AddressFamily *link_local = data; int r; assert(filename); @@ -260,7 +260,7 @@ int config_parse_ipv4ll( assert(data); /* Note that this is mostly like - * config_parse_address_family_boolean(), except that it + * config_parse_address_family(), except that it * applies only to IPv4 */ r = parse_boolean(rvalue); @@ -276,7 +276,7 @@ int config_parse_ipv4ll( log_syntax(unit, LOG_WARNING, filename, line, 0, "%s=%s is deprecated, please use LinkLocalAddressing=%s instead.", - lvalue, rvalue, address_family_boolean_to_string(*link_local)); + lvalue, rvalue, address_family_to_string(*link_local)); return 0; } diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 3749b979f9b..47d4d08aeea 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -150,7 +150,7 @@ static bool link_dhcp4_server_enabled(Link *link) { return link->network->dhcp_server; } -bool link_ipv4ll_enabled(Link *link, AddressFamilyBoolean mask) { +bool link_ipv4ll_enabled(Link *link, AddressFamily mask) { assert(link); assert((mask & ~(ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_FALLBACK_IPV4)) == 0); @@ -242,7 +242,7 @@ static bool link_ipv4_forward_enabled(Link *link) { if (!link->network) return false; - if (link->network->ip_forward == _ADDRESS_FAMILY_BOOLEAN_INVALID) + if (link->network->ip_forward == _ADDRESS_FAMILY_INVALID) return false; return link->network->ip_forward & ADDRESS_FAMILY_IPV4; @@ -260,7 +260,7 @@ static bool link_ipv6_forward_enabled(Link *link) { if (!link->network) return false; - if (link->network->ip_forward == _ADDRESS_FAMILY_BOOLEAN_INVALID) + if (link->network->ip_forward == _ADDRESS_FAMILY_INVALID) return false; if (link_sysctl_ipv6_enabled(link) == 0) diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 5c9d0327efe..d077dfe7729 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -188,7 +188,7 @@ int link_ipv6ll_gained(Link *link, const struct in6_addr *address); int link_set_mtu(Link *link, uint32_t mtu); -bool link_ipv4ll_enabled(Link *link, AddressFamilyBoolean mask); +bool link_ipv4ll_enabled(Link *link, AddressFamily mask); int link_stop_clients(Link *link, bool may_keep_dhcp); diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index e55228af38d..8c7e5db4bbf 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -59,7 +59,7 @@ Network.Xfrm, config_parse_stacked_netdev, Network.VRF, config_parse_ifname, 0, offsetof(Network, vrf_name) Network.DHCP, config_parse_dhcp, 0, offsetof(Network, dhcp) Network.DHCPServer, config_parse_bool, 0, offsetof(Network, dhcp_server) -Network.LinkLocalAddressing, config_parse_link_local_address_family_boolean, 0, offsetof(Network, link_local) +Network.LinkLocalAddressing, config_parse_link_local_address_family, 0, offsetof(Network, link_local) Network.IPv4LLRoute, config_parse_bool, 0, offsetof(Network, ipv4ll_route) Network.DefaultRouteOnDevice, config_parse_bool, 0, offsetof(Network, default_route_on_device) Network.IPv6Token, config_parse_ipv6token, 0, offsetof(Network, ipv6_token) @@ -76,7 +76,7 @@ Network.DNSOverTLS, config_parse_dns_over_tls_mode, Network.DNSSEC, config_parse_dnssec_mode, 0, offsetof(Network, dnssec_mode) Network.DNSSECNegativeTrustAnchors, config_parse_dnssec_negative_trust_anchors, 0, 0 Network.NTP, config_parse_ntp, 0, offsetof(Network, ntp) -Network.IPForward, config_parse_address_family_boolean_with_kernel, 0, offsetof(Network, ip_forward) +Network.IPForward, config_parse_address_family_with_kernel, 0, offsetof(Network, ip_forward) Network.IPMasquerade, config_parse_bool, 0, offsetof(Network, ip_masquerade) Network.IPv6PrivacyExtensions, config_parse_ipv6_privacy_extensions, 0, offsetof(Network, ipv6_privacy_extensions) Network.IPv6AcceptRA, config_parse_tristate, 0, offsetof(Network, ipv6_accept_ra) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 191e766a925..6a8766ce689 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -395,7 +395,7 @@ int network_load_one(Manager *manager, const char *filename) { .dns_over_tls_mode = _DNS_OVER_TLS_MODE_INVALID, /* If LinkLocalAddressing= is not set, then set to ADDRESS_FAMILY_IPV6 later. */ - .link_local = _ADDRESS_FAMILY_BOOLEAN_INVALID, + .link_local = _ADDRESS_FAMILY_INVALID, .ipv6_privacy_extensions = IPV6_PRIVACY_EXTENSIONS_NO, .ipv6_accept_ra = -1, diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index 0fa800841cd..f8894f86dda 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -77,7 +77,7 @@ struct Network { Hashmap *stacked_netdev_names; /* DHCP Client Support */ - AddressFamilyBoolean dhcp; + AddressFamily dhcp; DHCPClientIdentifier dhcp_client_identifier; char *dhcp_vendor_class_identifier; char **dhcp_user_class; @@ -123,7 +123,7 @@ struct Network { uint32_t dhcp_server_pool_size; /* IPV4LL Support */ - AddressFamilyBoolean link_local; + AddressFamily link_local; bool ipv4ll_route; bool default_route_on_device; @@ -171,7 +171,7 @@ struct Network { usec_t can_restart_us; int can_triple_sampling; - AddressFamilyBoolean ip_forward; + AddressFamily ip_forward; bool ip_masquerade; int ipv6_accept_ra; diff --git a/src/network/networkd-util.c b/src/network/networkd-util.c index d01de53f7be..2f56b4c7f11 100644 --- a/src/network/networkd-util.c +++ b/src/network/networkd-util.c @@ -8,14 +8,14 @@ #include "string-util.h" #include "util.h" -static const char * const address_family_boolean_table[_ADDRESS_FAMILY_BOOLEAN_MAX] = { +static const char * const address_family_table[_ADDRESS_FAMILY_MAX] = { [ADDRESS_FAMILY_NO] = "no", [ADDRESS_FAMILY_YES] = "yes", [ADDRESS_FAMILY_IPV4] = "ipv4", [ADDRESS_FAMILY_IPV6] = "ipv6", }; -static const char * const link_local_address_family_boolean_table[_ADDRESS_FAMILY_BOOLEAN_MAX] = { +static const char * const link_local_address_family_table[_ADDRESS_FAMILY_MAX] = { [ADDRESS_FAMILY_NO] = "no", [ADDRESS_FAMILY_YES] = "yes", [ADDRESS_FAMILY_IPV4] = "ipv4", @@ -24,12 +24,12 @@ static const char * const link_local_address_family_boolean_table[_ADDRESS_FAMIL [ADDRESS_FAMILY_FALLBACK_IPV4] = "ipv4-fallback", }; -DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(address_family_boolean, AddressFamilyBoolean, ADDRESS_FAMILY_YES); -DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(link_local_address_family_boolean, AddressFamilyBoolean, ADDRESS_FAMILY_YES); -DEFINE_CONFIG_PARSE_ENUM(config_parse_link_local_address_family_boolean, link_local_address_family_boolean, - AddressFamilyBoolean, "Failed to parse option"); +DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(address_family, AddressFamily, ADDRESS_FAMILY_YES); +DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(link_local_address_family, AddressFamily, ADDRESS_FAMILY_YES); +DEFINE_CONFIG_PARSE_ENUM(config_parse_link_local_address_family, link_local_address_family, + AddressFamily, "Failed to parse option"); -int config_parse_address_family_boolean_with_kernel( +int config_parse_address_family_with_kernel( const char* unit, const char *filename, unsigned line, @@ -41,7 +41,7 @@ int config_parse_address_family_boolean_with_kernel( void *data, void *userdata) { - AddressFamilyBoolean *fwd = data, s; + AddressFamily *fwd = data, s; assert(filename); assert(lvalue); @@ -56,7 +56,7 @@ int config_parse_address_family_boolean_with_kernel( * is gone, hence silently accept the old setting, but turn it * to "no". */ - s = address_family_boolean_from_string(rvalue); + s = address_family_from_string(rvalue); if (s < 0) { if (streq(rvalue, "kernel")) s = ADDRESS_FAMILY_NO; diff --git a/src/network/networkd-util.h b/src/network/networkd-util.h index aafbac7df63..c96c2fd9fa2 100644 --- a/src/network/networkd-util.h +++ b/src/network/networkd-util.h @@ -5,7 +5,7 @@ #include "hash-funcs.h" #include "macro.h" -typedef enum AddressFamilyBoolean { +typedef enum AddressFamily { /* This is a bitmask, though it usually doesn't feel that way! */ ADDRESS_FAMILY_NO = 0, ADDRESS_FAMILY_IPV4 = 1 << 0, @@ -13,9 +13,9 @@ typedef enum AddressFamilyBoolean { ADDRESS_FAMILY_YES = ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_IPV6, ADDRESS_FAMILY_FALLBACK_IPV4 = 1 << 2, ADDRESS_FAMILY_FALLBACK = ADDRESS_FAMILY_FALLBACK_IPV4 | ADDRESS_FAMILY_IPV6, - _ADDRESS_FAMILY_BOOLEAN_MAX, - _ADDRESS_FAMILY_BOOLEAN_INVALID = -1, -} AddressFamilyBoolean; + _ADDRESS_FAMILY_MAX, + _ADDRESS_FAMILY_INVALID = -1, +} AddressFamily; typedef struct NetworkConfigSection { unsigned line; @@ -23,14 +23,14 @@ typedef struct NetworkConfigSection { char filename[]; } NetworkConfigSection; -CONFIG_PARSER_PROTOTYPE(config_parse_link_local_address_family_boolean); -CONFIG_PARSER_PROTOTYPE(config_parse_address_family_boolean_with_kernel); +CONFIG_PARSER_PROTOTYPE(config_parse_link_local_address_family); +CONFIG_PARSER_PROTOTYPE(config_parse_address_family_with_kernel); -const char *address_family_boolean_to_string(AddressFamilyBoolean b) _const_; -AddressFamilyBoolean address_family_boolean_from_string(const char *s) _pure_; +const char *address_family_to_string(AddressFamily b) _const_; +AddressFamily address_family_from_string(const char *s) _pure_; -const char *link_local_address_family_boolean_to_string(AddressFamilyBoolean b) _const_; -AddressFamilyBoolean link_local_address_family_boolean_from_string(const char *s) _pure_; +const char *link_local_address_family_to_string(AddressFamily b) _const_; +AddressFamily link_local_address_family_from_string(const char *s) _pure_; int kernel_route_expiration_supported(void); diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c index 711954e4a2c..56932ba15c4 100644 --- a/src/network/test-network-tables.c +++ b/src/network/test-network-tables.c @@ -41,7 +41,7 @@ int main(int argc, char **argv) { test_table_sparse(ipvlan_mode, NETDEV_IPVLAN_MODE); test_table_sparse(macvlan_mode, NETDEV_MACVLAN_MODE); - test_table_sparse(address_family_boolean, ADDRESS_FAMILY_BOOLEAN); + test_table_sparse(address_family, ADDRESS_FAMILY); return EXIT_SUCCESS; }