[#2843] Fix in random allocator return values

diff --git a/src/lib/dhcpsrv/random_allocator.cc b/src/lib/dhcpsrv/random_allocator.cc
index f838b8cf3c22beaedc72aefc6ba882ab91f09a55..e06cc54575a833ec73e39a5ef07a39ce27399e67 100644 (file)
--- a/src/lib/dhcpsrv/random_allocator.cc
+++ b/src/lib/dhcpsrv/random_allocator.cc
@@ -80,7 +80,7 @@ RandomAllocator::pickAddressInternal(const ClientClasses& client_classes,
 
     // No pool available. There are no pools or client classes do
     // not match.
-    return (IOAddress::IPV4_ZERO_ADDRESS());
+    return (pool_type_ == Lease::TYPE_V4 ? IOAddress::IPV4_ZERO_ADDRESS() : IOAddress::IPV6_ZERO_ADDRESS());
 }
 
 IOAddress

diff --git a/src/lib/dhcpsrv/tests/random_allocator_unittest.cc b/src/lib/dhcpsrv/tests/random_allocator_unittest.cc
index e8009eed3a6ae3a86eadb3809b281c60752f4dee..caf27f4745634fa1a4f22d6a5690e419b89aadbc 100644 (file)
--- a/src/lib/dhcpsrv/tests/random_allocator_unittest.cc
+++ b/src/lib/dhcpsrv/tests/random_allocator_unittest.cc
@@ -334,7 +334,7 @@ TEST_F(RandomAllocatorTest6, clientClasses) {
    // can't offer any address to the client.
    cc_.clear();
    IOAddress candidate = alloc.pickAddress(cc_, duid_, IOAddress("0.0.0.0"));
-   EXPECT_TRUE(candidate.isV4Zero());
+   EXPECT_TRUE(candidate.isV6Zero());
 }
 
 // Test allocating delegated prefixes when a subnet has a single pool.