From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 27 Feb 2014 11:09:08 +0000 (+0100)
Subject: [3353] One line fix for eRouter1.0 client class processing
X-Git-Tag: bind10-1.2.0beta1-release~14^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23c22e9b1141c699f361d45c309e737dfecf6f3f;p=thirdparty%2Fkea.git

[3353] One line fix for eRouter1.0 client class processing
---

diff --git a/ChangeLog b/ChangeLog
index d2fcc8cbbe..b6b26aed96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+7xx.	[bug]		tomek
+	b10-dhcp4: Fixed a minor bug in eRouter1.0 class processing. The server
+	no longer sets giaddr field.
+	(Trac #3353, git abcd)
+
 761.	[doc]		stephen, jreed
 	Added "man" page for perfdhcp.
 	(Trac #2307, git ff2f538912c205fbdb1408ee613c09b90de53514)
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index fcee56cb53..0ed05bb605 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -1865,7 +1865,7 @@ bool Dhcpv4Srv::classSpecificProcessing(const Pkt4Ptr& query, const Pkt4Ptr& rsp
         }
     }
 
-    if (query->inClass(DOCSIS3_CLASS_EROUTER)) {
+    if (query->inClass(VENDOR_CLASS_PREFIX + DOCSIS3_CLASS_EROUTER)) {
 
         // Do not set TFTP server address for eRouter devices.
         rsp->setSiaddr(IOAddress("0.0.0.0"));