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

diff --git a/ChangeLog b/ChangeLog
index d2fcc8cbbe99fc5028c30b59a22c8e61ff57d335..b6b26aed9664209723982cbdfc04288936a8e65b 100644 (file)
--- 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 fcee56cb533f8b1cb60db416aca20e80dbbea968..0ed05bb605f0221ff56b38b5c3e4bb8c9f344807 100644 (file)
--- 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"));