diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-04-10 10:24:17 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-04-21 21:00:11 +0900 |
commit | 4e26a5baa0045c8bbb899f0c72f07ac630692bd3 (patch) | |
tree | 91b527e1822ab310cc3d2823273db30479dced3f /src/network | |
parent | cde74a65c1b71d322a2fe3984c3fea446ca5a295 (diff) | |
download | systemd-4e26a5baa0045c8bbb899f0c72f07ac630692bd3.tar.gz |
network: make IAID and DUID for DHCPv6 configurable explicitly
Closes #18996.
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/networkd-dhcp-common.c | 265 | ||||
-rw-r--r-- | src/network/networkd-dhcp-common.h | 16 | ||||
-rw-r--r-- | src/network/networkd-dhcp4.c | 12 | ||||
-rw-r--r-- | src/network/networkd-dhcp6.c | 6 | ||||
-rw-r--r-- | src/network/networkd-gperf.gperf | 9 | ||||
-rw-r--r-- | src/network/networkd-manager.c | 8 | ||||
-rw-r--r-- | src/network/networkd-manager.h | 4 | ||||
-rw-r--r-- | src/network/networkd-network-gperf.gperf | 15 | ||||
-rw-r--r-- | src/network/networkd-network.c | 10 | ||||
-rw-r--r-- | src/network/networkd-network.h | 10 | ||||
-rw-r--r-- | src/network/networkd.conf | 6 |
11 files changed, 273 insertions, 88 deletions
diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index 12bdda5129..cbe2f67c94 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -64,15 +64,26 @@ void network_adjust_dhcp(Network *network) { } static struct DUID fallback_duid = { .type = DUID_TYPE_EN }; -DUID* link_get_duid(Link *link) { - if (link->network->duid.type != _DUID_TYPE_INVALID) - return &link->network->duid; - else if (link->hw_addr.length == 0 && IN_SET(link->manager->duid.type, DUID_TYPE_LLT, DUID_TYPE_LL)) + +DUID* link_get_duid(Link *link, int family) { + DUID *duid; + + assert(link); + assert(IN_SET(family, AF_INET, AF_INET6)); + + if (link->network) { + duid = family == AF_INET ? &link->network->dhcp_duid : &link->network->dhcp6_duid; + if (duid->type != _DUID_TYPE_INVALID) + return duid; + } + + duid = family == AF_INET ? &link->manager->dhcp_duid : &link->manager->dhcp6_duid; + if (link->hw_addr.length == 0 && IN_SET(duid->type, DUID_TYPE_LLT, DUID_TYPE_LL)) /* Fallback to DUID that works without MAC address. * This is useful for tunnel devices without MAC address. */ return &fallback_duid; - else - return &link->manager->duid; + + return duid; } static int duid_set_uuid(DUID *duid, sd_id128_t uuid) { @@ -145,32 +156,16 @@ configure: return 1; } -int manager_request_product_uuid(Manager *m, Link *link) { +int manager_request_product_uuid(Manager *m) { int r; assert(m); - if (m->has_product_uuid) + if (m->product_uuid_requested) return 0; log_debug("Requesting product UUID"); - if (link) { - DUID *duid; - - assert_se(duid = link_get_duid(link)); - - r = set_ensure_put(&m->links_requesting_uuid, NULL, link); - if (r < 0) - return log_oom(); - if (r > 0) - link_ref(link); - - r = set_ensure_put(&m->duids_requesting_uuid, NULL, duid); - if (r < 0) - return log_oom(); - } - if (sd_bus_is_ready(m->bus) <= 0) { log_debug("Not connected to system bus, requesting product UUID later."); return 0; @@ -190,27 +185,46 @@ int manager_request_product_uuid(Manager *m, Link *link) { if (r < 0) return log_warning_errno(r, "Failed to get product UUID: %m"); + m->product_uuid_requested = true; + return 0; } -static bool link_requires_uuid(Link *link) { +static bool dhcp4_requires_uuid(Link *link) { const DUID *duid; assert(link); - assert(link->manager); - assert(link->network); - duid = link_get_duid(link); + if (!link_dhcp4_enabled(link)) + return false; + + if (!IN_SET(link->network->dhcp_client_identifier, DHCP_CLIENT_ID_DUID, DHCP_CLIENT_ID_DUID_ONLY)) + return false; + + duid = link_get_dhcp4_duid(link); if (duid->type != DUID_TYPE_UUID || duid->raw_data_len != 0) return false; - if (link_dhcp4_enabled(link) && IN_SET(link->network->dhcp_client_identifier, DHCP_CLIENT_ID_DUID, DHCP_CLIENT_ID_DUID_ONLY)) - return true; + return true; +} + +static bool dhcp6_requires_uuid(Link *link) { + const DUID *duid; + + assert(link); + + if (!link_dhcp6_enabled(link) && !link_ipv6_accept_ra_enabled(link)) + return false; + + duid = link_get_dhcp6_duid(link); + if (duid->type != DUID_TYPE_UUID || duid->raw_data_len != 0) + return false; - if (link_dhcp6_enabled(link) || link_ipv6_accept_ra_enabled(link)) - return true; + return true; +} - return false; +static bool link_requires_uuid(Link *link) { + return dhcp4_requires_uuid(link) || dhcp6_requires_uuid(link); } int link_configure_duid(Link *link) { @@ -223,34 +237,45 @@ int link_configure_duid(Link *link) { assert(link->network); m = link->manager; - duid = link_get_duid(link); if (!link_requires_uuid(link)) return 1; if (m->has_product_uuid) { - (void) duid_set_uuid(duid, m->product_uuid); + if (dhcp4_requires_uuid(link)) { + duid = link_get_dhcp4_duid(link); + (void) duid_set_uuid(duid, m->product_uuid); + } + if (dhcp6_requires_uuid(link)) { + duid = link_get_dhcp6_duid(link); + (void) duid_set_uuid(duid, m->product_uuid); + } return 1; } - if (!m->links_requesting_uuid) { - r = manager_request_product_uuid(m, link); - if (r < 0) { - if (r == -ENOMEM) - return r; + r = manager_request_product_uuid(m); + if (r < 0) { + log_link_warning_errno(link, r, + "Failed to get product UUID. Falling back to use machine-app-specific ID as DUID-UUID: %m"); + return 1; + } - log_link_warning_errno(link, r, - "Failed to get product UUID. Falling back to use machine-app-specific ID as DUID-UUID: %m"); - return 1; - } - } else { - r = set_put(m->links_requesting_uuid, link); + r = set_ensure_put(&m->links_requesting_uuid, NULL, link); + if (r < 0) + return log_oom(); + if (r > 0) + link_ref(link); + + if (dhcp4_requires_uuid(link)) { + duid = link_get_dhcp4_duid(link); + r = set_ensure_put(&m->duids_requesting_uuid, NULL, duid); if (r < 0) return log_oom(); - if (r > 0) - link_ref(link); + } - r = set_put(m->duids_requesting_uuid, duid); + if (dhcp6_requires_uuid(link)) { + duid = link_get_dhcp6_duid(link); + r = set_ensure_put(&m->duids_requesting_uuid, NULL, duid); if (r < 0) return log_oom(); } @@ -525,6 +550,7 @@ int config_parse_iaid(const char *unit, const char *rvalue, void *data, void *userdata) { + Network *network = userdata; uint32_t iaid; int r; @@ -533,6 +559,7 @@ int config_parse_iaid(const char *unit, assert(lvalue); assert(rvalue); assert(network); + assert(IN_SET(ltype, AF_INET, AF_INET6)); r = safe_atou32(rvalue, &iaid); if (r < 0) { @@ -541,8 +568,21 @@ int config_parse_iaid(const char *unit, return 0; } - network->iaid = iaid; - network->iaid_set = true; + if (ltype == AF_INET) { + network->dhcp_iaid = iaid; + network->dhcp_iaid_set = true; + if (!network->dhcp6_iaid_set_explicitly) { + /* Backward compatibility. Previously, IAID is shared by DHCP4 and DHCP6. + * If DHCP6 IAID is not specified explicitly, then use DHCP4 IAID for DHCP6. */ + network->dhcp6_iaid = iaid; + network->dhcp6_iaid_set = true; + } + } else { + assert(ltype == AF_INET6); + network->dhcp6_iaid = iaid; + network->dhcp6_iaid_set = true; + network->dhcp6_iaid_set_explicitly = true; + } return 0; } @@ -949,6 +989,7 @@ int config_parse_duid_type( _cleanup_free_ char *type_string = NULL; const char *p = rvalue; + bool force = ltype; DUID *duid = data; DUIDType type; int r; @@ -958,6 +999,9 @@ int config_parse_duid_type( assert(rvalue); assert(duid); + if (!force && duid->set) + return 0; + r = extract_first_word(&p, &type_string, ":", 0); if (r == -ENOMEM) return log_oom(); @@ -999,10 +1043,62 @@ int config_parse_duid_type( } duid->type = type; + duid->set = force; return 0; } +int config_parse_manager_duid_type( + 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) { + + Manager *manager = userdata; + int r; + + assert(manager); + + /* For backward compatibility. Setting both DHCP4 and DHCP6 DUID if they are not specified explicitly. */ + + r = config_parse_duid_type(unit, filename, line, section, section_line, lvalue, false, rvalue, &manager->dhcp_duid, manager); + if (r < 0) + return r; + + return config_parse_duid_type(unit, filename, line, section, section_line, lvalue, false, rvalue, &manager->dhcp6_duid, manager); +} + +int config_parse_network_duid_type( + 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; + int r; + + assert(network); + + r = config_parse_duid_type(unit, filename, line, section, section_line, lvalue, true, rvalue, &network->dhcp_duid, network); + if (r < 0) + return r; + + /* For backward compatibility, also set DHCP6 DUID if not specified explicitly. */ + return config_parse_duid_type(unit, filename, line, section, section_line, lvalue, false, rvalue, &network->dhcp6_duid, network); +} + int config_parse_duid_rawdata( const char *unit, const char *filename, @@ -1015,14 +1111,18 @@ int config_parse_duid_rawdata( void *data, void *userdata) { - DUID *ret = data; uint8_t raw_data[MAX_DUID_LEN]; unsigned count = 0; + bool force = ltype; + DUID *duid = data; assert(filename); assert(lvalue); assert(rvalue); - assert(ret); + assert(duid); + + if (!force && duid->set) + return 0; /* RawData contains DUID in format "NN:NN:NN..." */ for (const char *p = rvalue;;) { @@ -1065,8 +1165,61 @@ int config_parse_duid_rawdata( raw_data[count++] = byte; } - assert_cc(sizeof(raw_data) == sizeof(ret->raw_data)); - memcpy(ret->raw_data, raw_data, count); - ret->raw_data_len = count; + assert_cc(sizeof(raw_data) == sizeof(duid->raw_data)); + memcpy(duid->raw_data, raw_data, count); + duid->raw_data_len = count; + duid->set = force; + return 0; } + +int config_parse_manager_duid_rawdata( + 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) { + + Manager *manager = userdata; + int r; + + assert(manager); + + /* For backward compatibility. Setting both DHCP4 and DHCP6 DUID if they are not specified explicitly. */ + + r = config_parse_duid_rawdata(unit, filename, line, section, section_line, lvalue, false, rvalue, &manager->dhcp_duid, manager); + if (r < 0) + return r; + + return config_parse_duid_rawdata(unit, filename, line, section, section_line, lvalue, false, rvalue, &manager->dhcp6_duid, manager); +} + +int config_parse_network_duid_rawdata( + 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; + int r; + + assert(network); + + r = config_parse_duid_rawdata(unit, filename, line, section, section_line, lvalue, true, rvalue, &network->dhcp_duid, network); + if (r < 0) + return r; + + /* For backward compatibility, also set DHCP6 DUID if not specified explicitly. */ + return config_parse_duid_rawdata(unit, filename, line, section, section_line, lvalue, false, rvalue, &network->dhcp6_duid, network); +} diff --git a/src/network/networkd-dhcp-common.h b/src/network/networkd-dhcp-common.h index 23baef9246..6b462b3bd2 100644 --- a/src/network/networkd-dhcp-common.h +++ b/src/network/networkd-dhcp-common.h @@ -39,6 +39,7 @@ typedef struct DUID { uint8_t raw_data_len; uint8_t raw_data[MAX_DUID_LEN]; usec_t llt_time; + bool set; } DUID; bool link_dhcp_enabled(Link *link, int family); @@ -51,9 +52,16 @@ static inline bool link_dhcp6_enabled(Link *link) { void network_adjust_dhcp(Network *network); -DUID* link_get_duid(Link *link); +DUID *link_get_duid(Link *link, int family); +static inline DUID *link_get_dhcp4_duid(Link *link) { + return link_get_duid(link, AF_INET); +} +static inline DUID *link_get_dhcp6_duid(Link *link) { + return link_get_duid(link, AF_INET6); +} + int link_configure_duid(Link *link); -int manager_request_product_uuid(Manager *m, Link *link); +int manager_request_product_uuid(Manager *m); const char* dhcp_use_domains_to_string(DHCPUseDomains p) _const_; DHCPUseDomains dhcp_use_domains_from_string(const char *s) _pure_; @@ -72,4 +80,8 @@ CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_user_or_vendor_class); CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_send_option); CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_request_options); CONFIG_PARSER_PROTOTYPE(config_parse_duid_type); +CONFIG_PARSER_PROTOTYPE(config_parse_manager_duid_type); +CONFIG_PARSER_PROTOTYPE(config_parse_network_duid_type); CONFIG_PARSER_PROTOTYPE(config_parse_duid_rawdata); +CONFIG_PARSER_PROTOTYPE(config_parse_manager_duid_rawdata); +CONFIG_PARSER_PROTOTYPE(config_parse_network_duid_rawdata); diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 85b909e576..5c4e1d789c 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1225,17 +1225,17 @@ static int dhcp4_set_client_identifier(Link *link) { switch (link->network->dhcp_client_identifier) { case DHCP_CLIENT_ID_DUID: { /* If configured, apply user specified DUID and IAID */ - const DUID *duid = link_get_duid(link); + const DUID *duid = link_get_dhcp4_duid(link); if (duid->type == DUID_TYPE_LLT && duid->raw_data_len == 0) r = sd_dhcp_client_set_iaid_duid_llt(link->dhcp_client, - link->network->iaid_set, - link->network->iaid, + link->network->dhcp_iaid_set, + link->network->dhcp_iaid, duid->llt_time); else r = sd_dhcp_client_set_iaid_duid(link->dhcp_client, - link->network->iaid_set, - link->network->iaid, + link->network->dhcp_iaid_set, + link->network->dhcp_iaid, duid->type, duid->raw_data_len > 0 ? duid->raw_data : NULL, duid->raw_data_len); @@ -1245,7 +1245,7 @@ static int dhcp4_set_client_identifier(Link *link) { } case DHCP_CLIENT_ID_DUID_ONLY: { /* If configured, apply user specified DUID */ - const DUID *duid = link_get_duid(link); + const DUID *duid = link_get_dhcp4_duid(link); if (duid->type == DUID_TYPE_LLT && duid->raw_data_len == 0) r = sd_dhcp_client_set_duid_llt(link->dhcp_client, diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index 6f3c02d44d..4cd479c584 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -1424,13 +1424,13 @@ static int dhcp6_set_identifier(Link *link, sd_dhcp6_client *client) { if (r < 0) return r; - if (link->network->iaid_set) { - r = sd_dhcp6_client_set_iaid(client, link->network->iaid); + if (link->network->dhcp6_iaid_set) { + r = sd_dhcp6_client_set_iaid(client, link->network->dhcp6_iaid); if (r < 0) return r; } - duid = link_get_duid(link); + duid = link_get_dhcp6_duid(link); if (duid->type == DUID_TYPE_LLT && duid->raw_data_len == 0) r = sd_dhcp6_client_set_duid_llt(client, duid->llt_time); else diff --git a/src/network/networkd-gperf.gperf b/src/network/networkd-gperf.gperf index 8f02271278..20c33e8c80 100644 --- a/src/network/networkd-gperf.gperf +++ b/src/network/networkd-gperf.gperf @@ -26,5 +26,10 @@ Network.SpeedMeterIntervalSec, config_parse_sec, Network.ManageForeignRoutingPolicyRules, config_parse_bool, 0, offsetof(Manager, manage_foreign_rules) Network.ManageForeignRoutes, config_parse_bool, 0, offsetof(Manager, manage_foreign_routes) Network.RouteTable, config_parse_route_table_names, 0, 0 -DHCP.DUIDType, config_parse_duid_type, 0, offsetof(Manager, duid) -DHCP.DUIDRawData, config_parse_duid_rawdata, 0, offsetof(Manager, duid) +DHCPv4.DUIDType, config_parse_duid_type, 0, offsetof(Manager, dhcp_duid) +DHCPv4.DUIDRawData, config_parse_duid_rawdata, 0, offsetof(Manager, dhcp_duid) +DHCPv6.DUIDType, config_parse_duid_type, 0, offsetof(Manager, dhcp6_duid) +DHCPv6.DUIDRawData, config_parse_duid_rawdata, 0, offsetof(Manager, dhcp6_duid) +/* Deprecated */ +DHCP.DUIDType, config_parse_manager_duid_type, 0, 0 +DHCP.DUIDRawData, config_parse_manager_duid_rawdata, 0, 0 diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 20957ecd89..7beabf7e6f 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -100,8 +100,8 @@ static int on_connected(sd_bus_message *message, void *userdata, sd_bus_error *r (void) manager_set_hostname(m, m->dynamic_hostname); if (m->dynamic_timezone) (void) manager_set_timezone(m, m->dynamic_timezone); - if (m->links_requesting_uuid) - (void) manager_request_product_uuid(m, NULL); + if (!set_isempty(m->links_requesting_uuid)) + (void) manager_request_product_uuid(m); return 0; } @@ -382,6 +382,8 @@ int manager_new(Manager **ret) { .manage_foreign_routes = true, .manage_foreign_rules = true, .ethtool_fd = -1, + .dhcp_duid.type = DUID_TYPE_EN, + .dhcp6_duid.type = DUID_TYPE_EN, }; m->state_file = strdup("/run/systemd/netif/state"); @@ -427,8 +429,6 @@ int manager_new(Manager **ret) { if (r < 0) return r; - m->duid.type = DUID_TYPE_EN; - *ret = TAKE_PTR(m); return 0; diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h index c7f743f56f..bb2cad1883 100644 --- a/src/network/networkd-manager.h +++ b/src/network/networkd-manager.h @@ -52,9 +52,11 @@ struct Manager { usec_t network_dirs_ts_usec; - DUID duid; + DUID dhcp_duid; + DUID dhcp6_duid; sd_id128_t product_uuid; bool has_product_uuid; + bool product_uuid_requested; Set *links_requesting_uuid; Set *duids_requesting_uuid; diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 736988a4b8..16638a2543 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -212,12 +212,12 @@ DHCPv4.VendorClassIdentifier, config_parse_string, DHCPv4.MUDURL, config_parse_dhcp_mud_url, 0, 0 DHCPv4.MaxAttempts, config_parse_dhcp_max_attempts, 0, 0 DHCPv4.UserClass, config_parse_dhcp_user_or_vendor_class, AF_INET, offsetof(Network, dhcp_user_class) -DHCPv4.DUIDType, config_parse_duid_type, 0, offsetof(Network, duid) -DHCPv4.DUIDRawData, config_parse_duid_rawdata, 0, offsetof(Network, duid) +DHCPv4.IAID, config_parse_iaid, AF_INET, 0 +DHCPv4.DUIDType, config_parse_network_duid_type, 0, 0 +DHCPv4.DUIDRawData, config_parse_network_duid_rawdata, 0, 0 DHCPv4.RouteMetric, config_parse_dhcp_route_metric, 0, 0 DHCPv4.RouteTable, config_parse_section_route_table, 0, 0 DHCPv4.UseTimezone, config_parse_bool, 0, offsetof(Network, dhcp_use_timezone) -DHCPv4.IAID, config_parse_iaid, 0, 0 DHCPv4.ListenPort, config_parse_uint16, 0, offsetof(Network, dhcp_client_port) DHCPv4.SendRelease, config_parse_bool, 0, offsetof(Network, dhcp_send_release) DHCPv4.SendDecline, config_parse_bool, 0, offsetof(Network, dhcp_send_decline) @@ -243,6 +243,9 @@ DHCPv6.ForceDHCPv6PDOtherInformation, config_parse_bool, DHCPv6.PrefixDelegationHint, config_parse_dhcp6_pd_hint, 0, 0 DHCPv6.WithoutRA, config_parse_dhcp6_client_start_mode, 0, offsetof(Network, dhcp6_without_ra) DHCPv6.SendOption, config_parse_dhcp_send_option, AF_INET6, offsetof(Network, dhcp6_client_send_options) +DHCPv6.IAID, config_parse_iaid, AF_INET6, 0 +DHCPv6.DUIDType, config_parse_duid_type, 0, offsetof(Network, dhcp6_duid) +DHCPv6.DUIDRawData, config_parse_duid_rawdata, 0, offsetof(Network, dhcp6_duid) IPv6AcceptRA.UseAutonomousPrefix, config_parse_bool, 0, offsetof(Network, ipv6_accept_ra_use_autonomous_prefix) IPv6AcceptRA.UseOnLinkPrefix, config_parse_bool, 0, offsetof(Network, ipv6_accept_ra_use_onlink_prefix) IPv6AcceptRA.UseDNS, config_parse_bool, 0, offsetof(Network, ipv6_accept_ra_use_dns) @@ -482,12 +485,12 @@ DHCP.RequestBroadcast, config_parse_bool, DHCP.CriticalConnection, config_parse_tristate, 0, offsetof(Network, dhcp_critical) DHCP.VendorClassIdentifier, config_parse_string, 0, offsetof(Network, dhcp_vendor_class_identifier) DHCP.UserClass, config_parse_dhcp_user_or_vendor_class, AF_INET, offsetof(Network, dhcp_user_class) -DHCP.DUIDType, config_parse_duid_type, 0, offsetof(Network, duid) -DHCP.DUIDRawData, config_parse_duid_rawdata, 0, offsetof(Network, duid) +DHCP.IAID, config_parse_iaid, AF_INET, 0 +DHCP.DUIDType, config_parse_network_duid_type, 0, 0 +DHCP.DUIDRawData, config_parse_network_duid_rawdata, 0, 0 DHCP.RouteMetric, config_parse_dhcp_route_metric, 0, 0 DHCP.RouteTable, config_parse_section_route_table, 0, 0 DHCP.UseTimezone, config_parse_bool, 0, offsetof(Network, dhcp_use_timezone) -DHCP.IAID, config_parse_iaid, 0, 0 DHCP.ListenPort, config_parse_uint16, 0, offsetof(Network, dhcp_client_port) DHCP.RapidCommit, config_parse_bool, 0, offsetof(Network, dhcp6_rapid_commit) DHCP.ForceDHCPv6PDOtherInformation, config_parse_bool, 0, offsetof(Network, dhcp6_force_pd_other_information) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 6c81f2cca7..736f0d593b 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -301,7 +301,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi .ignore_carrier_loss = -1, .keep_configuration = _KEEP_CONFIGURATION_INVALID, - .duid.type = _DUID_TYPE_INVALID, + .dhcp_duid.type = _DUID_TYPE_INVALID, .dhcp_critical = -1, .dhcp_use_ntp = true, .dhcp_use_sip = true, @@ -321,6 +321,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi .dhcp6_use_hostname = true, .dhcp6_use_ntp = true, .dhcp6_rapid_commit = true, + .dhcp6_duid.type = _DUID_TYPE_INVALID, .dhcp6_pd = -1, .dhcp6_pd_announce = true, @@ -599,9 +600,10 @@ static Network *network_free(Network *network) { ordered_hashmap_free_with_destructor(network->sr_iov_by_section, sr_iov_free); ordered_hashmap_free_with_destructor(network->tc_by_section, traffic_control_free); - if (network->manager && - network->manager->duids_requesting_uuid) - set_remove(network->manager->duids_requesting_uuid, &network->duid); + if (network->manager) { + set_remove(network->manager->duids_requesting_uuid, &network->dhcp_duid); + set_remove(network->manager->duids_requesting_uuid, &network->dhcp6_duid); + } free(network->name); diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index db0fbbdf1a..02bbfbad9a 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -118,9 +118,9 @@ struct Network { /* DHCP Client Support */ AddressFamily dhcp; DHCPClientIdentifier dhcp_client_identifier; - DUID duid; - uint32_t iaid; - bool iaid_set; + DUID dhcp_duid; + uint32_t dhcp_iaid; + bool dhcp_iaid_set; char *dhcp_vendor_class_identifier; char *dhcp_mudurl; char **dhcp_user_class; @@ -169,6 +169,10 @@ struct Network { bool dhcp6_rapid_commit; DHCPUseDomains dhcp6_use_domains; bool dhcp6_use_domains_set; + uint32_t dhcp6_iaid; + bool dhcp6_iaid_set; + bool dhcp6_iaid_set_explicitly; + DUID dhcp6_duid; uint8_t dhcp6_pd_length; char *dhcp6_mudurl; char **dhcp6_user_class; diff --git a/src/network/networkd.conf b/src/network/networkd.conf index 4e4e8b8d07..76f9f8454f 100644 --- a/src/network/networkd.conf +++ b/src/network/networkd.conf @@ -19,6 +19,10 @@ #ManageForeignRoutes=yes #RouteTable= -[DHCP] +[DHCPv4] +#DUIDType=vendor +#DUIDRawData= + +[DHCPv6] #DUIDType=vendor #DUIDRawData= |