[master] Merge branch 'trac3353' (fix in eRouter1.0 class processing)

Conflicts:
	ChangeLog

ChangeLog

@@ -1,3 +1,8 @@
+765.	[bug]		tomek
+	b10-dhcp4: Fixed a minor bug in eRouter1.0 class processing. The server
+	no longer sets giaddr field.
+	(Trac #3353, git 23c22e9b1141c699f361d45c309e737dfecf6f3f)
+
 764.	[bug]		tomek
 	b10-dhcp4: Fixed a bug caused client classification to not work
 	properly.

src/bin/dhcp4/dhcp4_srv.cc

@@ -1867,7 +1867,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"));