From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 27 Feb 2014 10:12:47 +0000 (+0100)
Subject: [3343] Classification is now done before calling accept()
X-Git-Tag: bind10-1.2.0beta1-release~15^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e14f6e2223c2c96c82986148689a59e537c832c;p=thirdparty%2Fkea.git

[3343] Classification is now done before calling accept()
---

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index fcee56cb53..7199fa13e2 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -232,6 +232,11 @@ Dhcpv4Srv::run() {
             }
         }
 
+        // Assign this packet to one or more classes if needed. We need to do this
+	// before calling accept(), because getSubnet4() may need client class
+	// information.
+        classifyPacket(query);
+
         // Check whether the message should be further processed or discarded.
         // There is no need to log anything here. This function logs by itself.
         if (!accept(query)) {
@@ -274,9 +279,6 @@ Dhcpv4Srv::run() {
             callout_handle->getArgument("query4", query);
         }
 
-        // Assign this packet to one or more classes if needed
-        classifyPacket(query);
-
         try {
             switch (query->getType()) {
             case DHCPDISCOVER: