SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: dhcp6: always assign prefix through dhcp6_pd_assign_prefix()

Browse Source 
For uplink interface, we request Assign= is enabled in the above.
So, we can always use dhcp6_pd_assign_prefix().

Just a minor simplification for later commits.
This commit is contained in:
Yu Watanabe
2021-10-19 00:54:45 +09:00
parent 3f3bc1f2e7
commit 63e43d0800
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-dhcp6.c
+9 -12
View File
@@ -556,20 +556,17 @@ static int dhcp6_pd_prefix_distribute(
}
(void) in6_addr_prefix_to_string(&assigned_prefix, 64, &buf);
if (link == dhcp6_link) {
r = dhcp6_pd_request_address(link, &assigned_prefix, lifetime_preferred, lifetime_valid);
if (r < 0)
return log_link_warning_errno(link, r, "Failed to assign addresses in prefix %s: %m", strna(buf));
r = dhcp6_pd_assign_prefix(link, &assigned_prefix, lifetime_preferred, lifetime_valid);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to assign/update prefix %s: %m", strna(buf));
if (link == dhcp6_link)
return r;
log_link_debug(link, "Assigned addresses in prefix %s: %m", strna(buf));
} else {
r = dhcp6_pd_assign_prefix(link, &assigned_prefix, lifetime_preferred, lifetime_valid);
if (r < 0) {
log_link_error_errno(link, r, "Failed to assign/update prefix %s: %m", strna(buf));
link_enter_failed(link);
} else
log_link_debug(link, "Assigned prefix %s", strna(buf));
link_enter_failed(link);
continue;
}
log_link_debug(link, "Assigned prefix %s", strna(buf));
}
return 0;