[3203] Client classes in packets added.

diff --git a/src/lib/dhcp/pkt4.cc b/src/lib/dhcp/pkt4.cc
index 8a5b8abc470a6654da9219f30acf143e71f9aad2..e9bc5d2f8397d2dc5b6f30f7413f66a238d0ad55 100644 (file)
--- a/src/lib/dhcp/pkt4.cc
+++ b/src/lib/dhcp/pkt4.cc
@@ -463,6 +463,18 @@ Pkt4::updateTimestamp() {
     timestamp_ = boost::posix_time::microsec_clock::universal_time();
 }
 
+bool
+Pkt4::inClass(const std::string& client_class) {
+    return (classes_.find(client_class) != classes_.end());
+}
+
+void
+Pkt4::addClass(const std::string& client_class) {
+    if (classes_.find(client_class) == classes_.end()) {
+        classes_.insert(client_class);
+    }
+}
+
 } // end of namespace isc::dhcp
 
 } // end of namespace isc

diff --git a/src/lib/dhcp/pkt4.h b/src/lib/dhcp/pkt4.h
index c8015cd59817385d8f026e91548fa12b3d56ec2a..0e3b81661c178e92b0809af348c364dab1f3f2cd 100644 (file)
--- a/src/lib/dhcp/pkt4.h
+++ b/src/lib/dhcp/pkt4.h
@@ -26,6 +26,7 @@
 
 #include <iostream>
 #include <vector>
+#include <set>
 
 #include <time.h>
 
@@ -52,6 +53,9 @@ public:
     /// to check whether client requested broadcast response.
     const static uint16_t FLAG_BROADCAST_MASK = 0x8000;
 
+    /// Container for storing client classes
+    typedef std::set<std::string> Classes;
+
     /// Constructor, used in replying to a message.
     ///
     /// @param msg_type type of message (e.g. DHCPDISOVER=1)
@@ -532,6 +536,27 @@ public:
     /// performance).
     std::vector<uint8_t> data_;
 
+    /// @brief Checks whether a client belongs to a given class
+    ///
+    /// @param client_class name of the class
+    /// @return true if belongs
+    bool inClass(const std::string& client_class);
+
+    /// @brief Adds packet to a specified class
+    ///
+    /// A packet can be added to the same class repeatedly. Any additional
+    /// attempts to add to a class the packet already belongs to, will be
+    /// ignored silently.
+    ///
+    /// @param client_class name of the class to be added
+    void addClass(const std::string& client_class);
+
+    /// @brief Classes this packet belongs to.
+    ///
+    /// This field is public, so code can iterate over existing classes.
+    /// Having it public also solves the problem of returned reference lifetime.
+    Classes classes_;
+
 private:
 
     /// @brief Generic method that validates and sets HW address.

diff --git a/src/lib/dhcp/pkt6.cc b/src/lib/dhcp/pkt6.cc
index 308880edd82576ccd9cf46224b2dfcdee5ca2252..e359e017ecce641dfac80026bc140bfe5612b813 100644 (file)
--- a/src/lib/dhcp/pkt6.cc
+++ b/src/lib/dhcp/pkt6.cc
@@ -586,6 +586,17 @@ void Pkt6::copyRelayInfo(const Pkt6Ptr& question) {
     }
 }
 
+bool
+Pkt6::inClass(const std::string& client_class) {
+    return (classes_.find(client_class) != classes_.end());
+}
+
+void
+Pkt6::addClass(const std::string& client_class) {
+    if (classes_.find(client_class) == classes_.end()) {
+        classes_.insert(client_class);
+    }
+}
 
 } // end of isc::dhcp namespace
 } // end of isc namespace

diff --git a/src/lib/dhcp/pkt6.h b/src/lib/dhcp/pkt6.h
index 702c42486401b2f96bd88c92df0821d153657e70..1e876dc1a5a5ecf4ec328b27f01ccb121e0e4f95 100644 (file)
--- a/src/lib/dhcp/pkt6.h
+++ b/src/lib/dhcp/pkt6.h
@@ -23,6 +23,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include <iostream>
+#include <set>
 
 #include <time.h>
 
@@ -47,6 +48,9 @@ public:
         TCP = 1  // there are TCP DHCPv6 packets (bulk leasequery, failover)
     };
 
+    /// Container for storing client classes
+    typedef std::set<std::string> Classes;
+
     /// @brief defines relay search pattern
     ///
     /// Defines order in which options are searched in a message that
@@ -426,6 +430,27 @@ public:
     /// data format change etc.
     OptionBuffer data_;
 
+    /// @brief Checks whether a client belongs to a given class
+    ///
+    /// @param client_class name of the class
+    /// @return true if belongs
+    bool inClass(const std::string& client_class);
+
+    /// @brief Adds packet to a specified class
+    ///
+    /// A packet can be added to the same class repeatedly. Any additional
+    /// attempts to add to a class the packet already belongs to, will be
+    /// ignored silently.
+    ///
+    /// @param client_class name of the class to be added
+    void addClass(const std::string& client_class);
+
+    /// @brief Classes this packet belongs to.
+    ///
+    /// This field is public, so code can iterate over existing classes.
+    /// Having it public also solves the problem of returned reference lifetime.
+    Classes classes_;
+
 protected:
     /// Builds on wire packet for TCP transmission.
     ///

diff --git a/src/lib/dhcp/tests/pkt4_unittest.cc b/src/lib/dhcp/tests/pkt4_unittest.cc
index 72ffff7048f48e5c9daa02330091f00af8c08c96..365b10fd650bcbf6f0b808e70d388095da03b70f 100644 (file)
--- a/src/lib/dhcp/tests/pkt4_unittest.cc
+++ b/src/lib/dhcp/tests/pkt4_unittest.cc
@@ -798,4 +798,31 @@ TEST_F(Pkt4Test, hwaddrSrcRemote) {
                            remote_addr->hwaddr_.begin()));
 }
 
+// Tests whether a packet can be assigned to a class and later
+// checked if it belongs to a given class
+TEST_F(Pkt4Test, clientClasses) {
+    Pkt4 pkt(DHCPOFFER, 1234);
+
+    // Default values (do not belong to any class)
+    EXPECT_FALSE(pkt.inClass("eRouter1.0"));
+    EXPECT_FALSE(pkt.inClass("docsis3.0"));
+    EXPECT_TRUE(pkt.classes_.empty());
+
+    // Add to the first class
+    pkt.addClass("eRouter1.0");
+    EXPECT_TRUE(pkt.inClass("eRouter1.0"));
+    EXPECT_FALSE(pkt.inClass("docsis3.0"));
+    ASSERT_FALSE(pkt.classes_.empty());
+
+    // Add to a second class
+    pkt.addClass("docsis3.0");
+    EXPECT_TRUE(pkt.inClass("eRouter1.0"));
+    EXPECT_TRUE(pkt.inClass("docsis3.0"));
+
+    // Check that it's ok to add to the same class repeatedly
+    EXPECT_NO_THROW(pkt.addClass("foo"));
+    EXPECT_NO_THROW(pkt.addClass("foo"));
+    EXPECT_NO_THROW(pkt.addClass("foo"));
+}
+
 } // end of anonymous namespace

diff --git a/src/lib/dhcp/tests/pkt6_unittest.cc b/src/lib/dhcp/tests/pkt6_unittest.cc
index e18b545cbd28ccd3906ab3f5151b46b4fac59a60..a0139df5777bd8752d294fb79b47bb8577d1f65e 100644 (file)
--- a/src/lib/dhcp/tests/pkt6_unittest.cc
+++ b/src/lib/dhcp/tests/pkt6_unittest.cc
@@ -779,4 +779,31 @@ TEST_F(Pkt6Test, getAnyRelayOption) {
     EXPECT_FALSE(opt);
 }
 
+// Tests whether a packet can be assigned to a class and later
+// checked if it belongs to a given class
+TEST_F(Pkt6Test, clientClasses) {
+    Pkt6 pkt(DHCPV6_ADVERTISE, 1234);
+
+    // Default values (do not belong to any class)
+    EXPECT_FALSE(pkt.inClass("eRouter1.0"));
+    EXPECT_FALSE(pkt.inClass("docsis3.0"));
+    EXPECT_TRUE(pkt.classes_.empty());
+
+    // Add to the first class
+    pkt.addClass("eRouter1.0");
+    EXPECT_TRUE(pkt.inClass("eRouter1.0"));
+    EXPECT_FALSE(pkt.inClass("docsis3.0"));
+    ASSERT_FALSE(pkt.classes_.empty());
+
+    // Add to a second class
+    pkt.addClass("docsis3.0");
+    EXPECT_TRUE(pkt.inClass("eRouter1.0"));
+    EXPECT_TRUE(pkt.inClass("docsis3.0"));
+
+    // Check that it's ok to add to the same class repeatedly
+    EXPECT_NO_THROW(pkt.addClass("foo"));
+    EXPECT_NO_THROW(pkt.addClass("foo"));
+    EXPECT_NO_THROW(pkt.addClass("foo"));
+}
+
 }