[master] ChangeLog updated, comments corrected

diff --git a/ChangeLog b/ChangeLog
index f769fb53c2a0abc671315d4a0c80f4bfd2d4411f..0394f2e8b8567567eb0c0649b5e3d81b1775d7fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1158.  [func]          tomek
+       It is now possible to specify fixed fields (next-server,
+       server-hostname and boot-file-name parameters) for client classes.
+       (Trac #4626, git 89cf54524d8b55cc982ab2146915c0a90fc6efe2)
+
 1157.  [func]          marcin
        Added support for static reservations for fixed fields in
        DHCPv4 messages: siaddr, sname and file.

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index cbef75d5b64be8f56134287dff5aef1d016f58f1..33a2e380589644783d996c22991c4b858dc8a7de 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -1989,7 +1989,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) {
                 // Converting string to (const uint8_t*, size_t len) format is
                 // tricky. reineterpret_cast is not the most elegant solution,
                 // but it does avoid us making unnecessary copy. We will convert
-                // sname and file fields in Pkt4 to string one day and live
+                // sname and file fields in Pkt4 to string one day and life
                 // will be easier.
                 response->setSname(reinterpret_cast<const uint8_t*>(sname.c_str()),
                                    sname.size());
@@ -2000,7 +2000,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) {
                 // Converting string to (const uint8_t*, size_t len) format is
                 // tricky. reineterpret_cast is not the most elegant solution,
                 // but it does avoid us making unnecessary copy. We will convert
-                // sname and file fields in Pkt4 to string one day and live
+                // sname and file fields in Pkt4 to string one day and life
                 // will be easier.
                 response->setFile(reinterpret_cast<const uint8_t*>(filename.c_str()),
                                   filename.size());
@@ -2613,22 +2613,6 @@ void Dhcpv4Srv::classifyByVendor(const Pkt4Ptr& pkt, std::string& classes) {
         return;
     }
 
-    // DOCSIS specific section
-
-    // Let's keep this as a series of checks. So far we're supporting only
-    // docsis3.0, but there are also docsis2.0, docsis1.1 and docsis1.0. We
-    // may come up with adding several classes, e.g. for docsis2.0 we would
-    // add classes docsis2.0, docsis1.1 and docsis1.0.
-
-    // Also we are using find, because we have at least one traffic capture
-    // where the user class was followed by a space ("docsis3.0 ").
-
-    // For now, the code is very simple, but it is expected to get much more
-    // complex soon. One specific case is that the vendor class is an option
-    // sent by the client, so we should not trust it. To confirm that the device
-    // is indeed a modem, John B. suggested to check whether chaddr field
-    // quals subscriber-id option that was inserted by the relay (CMTS).
-    // This kind of logic will appear here soon.
     pkt->addClass(VENDOR_CLASS_PREFIX + vendor_class->getValue());
     classes += VENDOR_CLASS_PREFIX + vendor_class->getValue();
 }