From 53db18b200aa7d5d065e8cc8f2672f077d6d324b Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Mon, 17 Feb 2014 21:18:49 +0100 Subject: [PATCH] Reintroduce Reconfigure-Accept in Request-Message --- src/dhcpv6.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/dhcpv6.c b/src/dhcpv6.c index 20343e4..ec42b32 100644 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -445,16 +445,14 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs) } // Disable IAs if not used - if (type != DHCPV6_MSG_SOLICIT) { - iov[IOV_RECONF_ACCEPT].iov_len = 0; - if (ia_na_len == 0) - iov[IOV_HDR_IA_NA].iov_len = 0; - } + if (type != DHCPV6_MSG_SOLICIT && ia_na_len == 0) + iov[IOV_HDR_IA_NA].iov_len = 0; if (na_mode == IA_MODE_NONE) iov[IOV_HDR_IA_NA].iov_len = 0; - if (!(client_options & DHCPV6_ACCEPT_RECONFIGURE)) + if ((type != DHCPV6_MSG_SOLICIT && type != DHCPV6_MSG_REQUEST) || + !(client_options & DHCPV6_ACCEPT_RECONFIGURE)) iov[IOV_RECONF_ACCEPT].iov_len = 0; if (!(client_options & DHCPV6_CLIENT_FQDN)) -- 2.25.1