From 9243aa45fa0cfcd399aa7db1abd1e64e9ac515e3 Mon Sep 17 00:00:00 2001 From: tomty89 Date: Fri, 20 May 2016 18:20:24 +0800 Subject: [networkd-ndisc] set IPv6LL address in DHCP client Fix issue #3256 and probably #1982. Referenced link_acquire_ipv6_conf() in networkd-link.c. --- src/network/networkd-ndisc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index b22c58bfe5..78f02cf746 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -157,6 +157,10 @@ static void ndisc_router_handler(sd_ndisc *nd, uint8_t flags, const struct in6_a if (flags & ND_RA_FLAG_MANAGED) dhcp6_request_address(link); + r = sd_dhcp6_client_set_local_address(link->dhcp6_client, &link->ipv6ll_address); + if (r < 0 && r != -EBUSY) + return log_link_warning_errno(link, r, "Could not set IPv6LL address in DHCP client: %m"); + r = sd_dhcp6_client_start(link->dhcp6_client); if (r < 0 && r != -EBUSY) log_link_warning_errno(link, r, "Starting DHCPv6 client on NDisc request failed: %m"); @@ -203,6 +207,10 @@ static void ndisc_handler(sd_ndisc *nd, int event, void *userdata) { case SD_NDISC_EVENT_TIMEOUT: dhcp6_request_address(link); + r = sd_dhcp6_client_set_local_address(link->dhcp6_client, &link->ipv6ll_address); + if (r < 0 && r != -EBUSY) + return log_link_warning_errno(link, r, "Could not set IPv6LL address in DHCP client: %m"); + r = sd_dhcp6_client_start(link->dhcp6_client); if (r < 0 && r != -EBUSY) log_link_warning_errno(link, r, "Starting DHCPv6 client after NDisc timeout failed: %m"); -- cgit v1.2.3-54-g00ecf