src/patches/dnsmasq/0102-DHCPv6-DHCPCONFIRM-should-be-OK-for-any-address-on-l.patch

   1 From 89130d91d684faa88cb244f46c85eb26a8c06d7a Mon Sep 17 00:00:00 2001
   2 From: Simon Kelley <simon@thekelleys.org.uk>
   3 Date: Wed, 3 Jun 2015 22:30:59 +0100
   4 Subject: [PATCH 102/113] DHCPv6: DHCPCONFIRM should be OK for any address on
   5  link, not just dynamic addresses.
   6
   7 ---
   8  CHANGELOG     | 5 +++++
   9  src/rfc3315.c | 2 +-
  10  2 files changed, 6 insertions(+), 1 deletion(-)
  11
  12 diff --git a/CHANGELOG b/CHANGELOG
  13 index ef39a415788b..9e1b5a5ab0b8 100644
  14 --- a/CHANGELOG
  15 +++ b/CHANGELOG
  16 @@ -121,6 +121,11 @@ version 2.73
  17             Allow DHCPv4 options T1 and T2 to be set using --dhcp-option.
  18             Thanks to Kevin Benton for patches and work on this.
  19
  20 +            Fix code for DHCPCONFIRM DHCPv6 messages to confirm addresses
  21 +           in the correct subnet, even of not in dynamic address
  22 +           allocation range. Thanks to Steve Hirsch for spotting
  23 +           the problem.
  24 +
  25
  26  version 2.72
  27              Add ra-advrouter mode, for RFC-3775 mobile IPv6 support.
  28 diff --git a/src/rfc3315.c b/src/rfc3315.c
  29 index b4f5dd2db61f..2665d0d3294a 100644
  30 --- a/src/rfc3315.c
  31 +++ b/src/rfc3315.c
  32 @@ -1089,7 +1089,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
  33               {
  34                 struct in6_addr *req_addr = opt6_ptr(ia_option, 0);
  35
  36 -               if (!address6_available(state->context, req_addr, tagif, 1))
  37 +               if (!address6_valid(state->context, req_addr, tagif, 1))
  38                   {
  39                     o1 = new_opt6(OPTION6_STATUS_CODE);
  40                     put_opt6_short(DHCP6NOTONLINK);
  41 --
  42 2.1.0
  43