BIND 10 master, updated. 92e4a51039c3783141753e099e70dddf205ede93 [master] Merge branch 'trac3353' (fix in eRouter1.0 class processing)

[BIND 10 source code commits]

The branch, master has been updated
       via  92e4a51039c3783141753e099e70dddf205ede93 (commit)
       via  b78dc55330b08c2a71367c9bb45c82bd4e08c4ae (commit)
       via  1801400ac874380e7a565d373b4bae96a49e21f7 (commit)
       via  23c22e9b1141c699f361d45c309e737dfecf6f3f (commit)
       via  0f3239b105f9abc8d7f31a1a0b487fda90ba53f8 (commit)
       via  9e14f6e2223c2c96c82986148689a59e537c832c (commit)
      from  5d336003d1e961ab0facd77bab25478cbdf47aec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 92e4a51039c3783141753e099e70dddf205ede93
Merge: b78dc55 23c22e9
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Thu Feb 27 18:33:59 2014 +0100

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

commit b78dc55330b08c2a71367c9bb45c82bd4e08c4ae
Merge: 5d33600 1801400
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Thu Feb 27 18:32:43 2014 +0100

    [master] Merge branch 'trac3343' (DHCPv4 client classification fix)
    
    Conflicts:
    	ChangeLog

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |   10 ++++++++++
 src/bin/dhcp4/dhcp4_srv.cc |   10 ++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index c538df2..2211918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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.
+	(Trac #3343, git 1801400ac874380e7a565d373b4bae96a49e21f7)
+
 763.	[func]		tmark
 	b10-dhcp-ddns may now be configured to disable DNS updates in
 	in a given direction by simply not defining any domains for that
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index fcee56c..dee4e41 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:
@@ -1865,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"));