diff options
| author | Steven Barth <steven@midlink.org> | 2014-02-17 21:18:49 +0100 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-02-17 21:18:49 +0100 |
| commit | 53db18b200aa7d5d065e8cc8f2672f077d6d324b (patch) | |
| tree | 7f06c8741e4de6882af00bd4472eea0fef4c47ca /src/dhcpv6.c | |
| parent | a98e68ed36ea25c8cf43ffebf30f0ead8ac8fa68 (diff) | |
| download | odhcp6c-53db18b200aa7d5d065e8cc8f2672f077d6d324b.tar.gz | |
Reintroduce Reconfigure-Accept in Request-Message
Diffstat (limited to 'src/dhcpv6.c')
| -rw-r--r-- | src/dhcpv6.c | 10 |
1 files 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)) |