diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-11-22 23:22:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 23:22:04 -0500 |
| commit | ee43050b40628368f938b6f366b4a6e94ea898a1 (patch) | |
| tree | c2d2098c5dd0bb2f84b31153f0260e72d2a6d7c2 /src/network/networkd-network.h | |
| parent | 6d9e45e97fb1157d5670d533f55819a59e7ae336 (diff) | |
| parent | ef8b0084552e05f28b9132d5dfc75edae164a991 (diff) | |
Merge pull request #4692 from poettering/networkd-dhcp
Various networkd/DHCP fixes.
Diffstat (limited to 'src/network/networkd-network.h')
| -rw-r--r-- | src/network/networkd-network.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index e956a59fe3..17cff956da 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -112,19 +112,19 @@ struct Network { DCHPClientIdentifier dhcp_client_identifier; char *dhcp_vendor_class_identifier; char *dhcp_hostname; - bool dhcp_use_dns; - bool dhcp_use_ntp; - bool dhcp_use_mtu; - bool dhcp_use_hostname; - DHCPUseDomains dhcp_use_domains; + unsigned dhcp_route_metric; + uint32_t dhcp_route_table; + uint32_t dhcp_client_port; bool dhcp_send_hostname; bool dhcp_broadcast; bool dhcp_critical; + bool dhcp_use_dns; + bool dhcp_use_ntp; + bool dhcp_use_mtu; bool dhcp_use_routes; bool dhcp_use_timezone; - unsigned dhcp_route_metric; - uint32_t dhcp_route_table; - uint32_t dhcp_client_port; + bool dhcp_use_hostname; + DHCPUseDomains dhcp_use_domains; /* DHCP Server Support */ bool dhcp_server; @@ -194,7 +194,10 @@ struct Network { Hashmap *routes_by_section; Hashmap *fdb_entries_by_section; - char **search_domains, **route_domains, **dns, **ntp, **bind_carrier; + struct in_addr_data *dns; + unsigned n_dns; + + char **search_domains, **route_domains, **ntp, **bind_carrier; ResolveSupport llmnr; ResolveSupport mdns; @@ -233,6 +236,7 @@ int config_parse_dnssec_negative_trust_anchors(const char *unit, const char *fil int config_parse_dhcp_use_domains(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); int config_parse_lldp_mode(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); int config_parse_dhcp_route_table(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); +int config_parse_ntp(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); /* Legacy IPv4LL support */ int config_parse_ipv4ll(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); |