From efce46b169513428ef21511a863c9ad1f7202964 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Thu, 8 Oct 2015 05:16:02 +0200
Subject: [PATCH] [fd4o6] Removed IPv6 remote address from IPv4 selector

---
 src/bin/dhcp4/dhcp4_srv.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 1d935da7f2..5b3109d7ec 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -428,10 +428,10 @@ Dhcpv4Srv::selectSubnet4o6(const Pkt4Ptr& query) const {
         }
     }
 
-    // Applying default DHCPv4 rules
+    // Applying default DHCPv4 rules (but not the IPv6 remote address)
     if (!subnet) {
         selector.ciaddr_ = query->getCiaddr();
-        selector.remote_address_ = query->getRemoteAddr();
+        // selector.remote_address_ = query->getRemoteAddr();
         selector.iface_name_ = query->getIface();
 
         subnet =
-- 
2.47.2