From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 13 Jun 2016 09:31:40 +0000 (+0200)
Subject: [master] Merge branch 'trac4320'
X-Git-Tag: fdxhook_base~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3004ceae1cdc50733b4134151b3fade1a67f1801;p=thirdparty%2Fkea.git

[master] Merge branch 'trac4320'
---

3004ceae1cdc50733b4134151b3fade1a67f1801
diff --cc src/bin/dhcp6/dhcp6_srv.cc
index a62018ebea,2281af6310..afe3faa8f7
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@@ -1595,12 -1593,14 +1592,12 @@@ Dhcpv6Srv::extendIA_NA(const Pkt6Ptr& q
          Option6IAAddrPtr iaaddr = boost::dynamic_pointer_cast<Option6IAAddr>(it->second);
          if (!iaaddr) {
              // That's weird. Option code was ok, but the object type was not.
 -            // As we use Dhcpv6Srv::unpackOptions() that is guaranteed to use
 -            // Option6IAAddr for D6O_IAADDR, this should never happen. The only
 -            // case would be with badly mis-implemented hook libraries that
 -            // insert invalid option objects. There's no way to protect against
 -            // this.
 +            // This should never happen. The only case would be with badly
 +            // mis-implemented hook libraries that insert invalid option objects.
 +            // There's no way to protect against this.
              continue;
          }
-         ctx.hints_.push_back(make_pair(iaaddr->getAddress(), 128));
+         ctx.currentIA().addHint(iaaddr->getAddress());
      }
  
      Lease6Collection leases = alloc_engine_->renewLeases6(ctx);