From c9f2db2c408d728f1a21f6951a8115470504bd0b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 14 May 2021 16:52:42 +0900 Subject: [PATCH] network: use config_parse_in_addr_non_null() --- src/network/networkd-dhcp-server.c | 26 -------------- src/network/networkd-dhcp-server.h | 1 - src/network/networkd-dhcp6.c | 44 ------------------------ src/network/networkd-dhcp6.h | 1 - src/network/networkd-network-gperf.gperf | 4 +-- 5 files changed, 2 insertions(+), 74 deletions(-) diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c index d2efc301855..07d6eb95d1b 100644 --- a/src/network/networkd-dhcp-server.c +++ b/src/network/networkd-dhcp-server.c @@ -444,32 +444,6 @@ int config_parse_dhcp_server_relay_agent_suboption( return free_and_strdup(suboption_value, empty_to_null(p)); } -int config_parse_dhcp_server_relay_target( - const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - Network *network = userdata; - union in_addr_union a; - int r; - - r = in_addr_from_string(AF_INET, rvalue, &a); - if (r < 0) { - log_syntax(unit, LOG_WARNING, filename, line, r, - "Failed to parse %s= address '%s', ignoring: %m", lvalue, rvalue); - return 0; - } - network->dhcp_server_relay_target = a.in; - return r; -} - int config_parse_dhcp_server_emit( const char *unit, const char *filename, diff --git a/src/network/networkd-dhcp-server.h b/src/network/networkd-dhcp-server.h index 7a1e3a51737..e8c8f192f33 100644 --- a/src/network/networkd-dhcp-server.h +++ b/src/network/networkd-dhcp-server.h @@ -10,5 +10,4 @@ typedef struct Link Link; int dhcp4_server_configure(Link *link); CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_relay_agent_suboption); -CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_relay_target); CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_emit); diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index 7061afe0a2d..e8c7d8ebd85 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -1888,47 +1888,3 @@ int config_parse_dhcp6_pd_subnet_id( return 0; } - -int config_parse_dhcp6_pd_token( - const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - struct in6_addr *addr = data; - union in_addr_union tmp; - int r; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if (isempty(rvalue)) { - *addr = (struct in6_addr) {}; - return 0; - } - - r = in_addr_from_string(AF_INET6, rvalue, &tmp); - if (r < 0) { - log_syntax(unit, LOG_WARNING, filename, line, r, - "Failed to parse DHCPv6 Prefix Delegation token, ignoring: %s", rvalue); - return 0; - } - - if (in_addr_is_null(AF_INET6, &tmp)) { - log_syntax(unit, LOG_WARNING, filename, line, 0, - "DHCPv6 Prefix Delegation token cannot be the ANY address, ignoring: %s", rvalue); - return 0; - } - - *addr = tmp.in6; - - return 0; -} diff --git a/src/network/networkd-dhcp6.h b/src/network/networkd-dhcp6.h index f24d6eea5a7..82becb03217 100644 --- a/src/network/networkd-dhcp6.h +++ b/src/network/networkd-dhcp6.h @@ -41,7 +41,6 @@ CONFIG_PARSER_PROTOTYPE(config_parse_dhcp6_pd_hint); CONFIG_PARSER_PROTOTYPE(config_parse_dhcp6_mud_url); CONFIG_PARSER_PROTOTYPE(config_parse_dhcp6_client_start_mode); CONFIG_PARSER_PROTOTYPE(config_parse_dhcp6_pd_subnet_id); -CONFIG_PARSER_PROTOTYPE(config_parse_dhcp6_pd_token); const char* dhcp6_client_start_mode_to_string(DHCP6ClientStartMode i) _const_; DHCP6ClientStartMode dhcp6_client_start_mode_from_string(const char *s) _pure_; diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 732b53f71dd..b3e03bff3f4 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -261,7 +261,7 @@ IPv6AcceptRA.PrefixAllowList, config_parse_ndisc_address_filter, IPv6AcceptRA.PrefixDenyList, config_parse_ndisc_address_filter, 0, offsetof(Network, ndisc_deny_listed_prefix) IPv6AcceptRA.RouteAllowList, config_parse_ndisc_address_filter, 0, offsetof(Network, ndisc_allow_listed_route_prefix) IPv6AcceptRA.RouteDenyList, config_parse_ndisc_address_filter, 0, offsetof(Network, ndisc_deny_listed_route_prefix) -DHCPServer.RelayTarget, config_parse_dhcp_server_relay_target, 0, 0 +DHCPServer.RelayTarget, config_parse_in_addr_non_null, AF_INET, offsetof(Network, dhcp_server_relay_target) DHCPServer.RelayAgentCircuitId, config_parse_dhcp_server_relay_agent_suboption, 0, offsetof(Network, dhcp_server_relay_agent_circuit_id) DHCPServer.RelayAgentRemoteId, config_parse_dhcp_server_relay_agent_suboption, 0, offsetof(Network, dhcp_server_relay_agent_remote_id) DHCPServer.MaxLeaseTimeSec, config_parse_sec, 0, offsetof(Network, dhcp_server_max_lease_time_usec) @@ -314,7 +314,7 @@ DHCPv6PrefixDelegation.SubnetId, config_parse_dhcp6_pd_subnet_id, DHCPv6PrefixDelegation.Announce, config_parse_bool, 0, offsetof(Network, dhcp6_pd_announce) DHCPv6PrefixDelegation.Assign, config_parse_bool, 0, offsetof(Network, dhcp6_pd_assign) DHCPv6PrefixDelegation.ManageTemporaryAddress, config_parse_bool, 0, offsetof(Network, dhcp6_pd_manage_temporary_address) -DHCPv6PrefixDelegation.Token, config_parse_dhcp6_pd_token, 0, offsetof(Network, dhcp6_pd_token) +DHCPv6PrefixDelegation.Token, config_parse_in_addr_non_null, AF_INET6, offsetof(Network, dhcp6_pd_token) DHCPv6PrefixDelegation.RouteMetric, config_parse_uint32, 0, offsetof(Network, dhcp6_pd_route_metric) IPv6SendRA.RouterLifetimeSec, config_parse_sec, 0, offsetof(Network, router_lifetime_usec) IPv6SendRA.Managed, config_parse_bool, 0, offsetof(Network, router_managed) -- 2.47.3