[2786] Implemented pack function of OptionString class.

diff --git a/src/lib/dhcp/option_string.cc b/src/lib/dhcp/option_string.cc
index c88a92ef4bded6315d9c45400ca1f3ef9f19727f..fe7a3734f8e9eaaf082c60520ff47d66c4bcfbaa 100644 (file)
--- a/src/lib/dhcp/option_string.cc
+++ b/src/lib/dhcp/option_string.cc
@@ -31,9 +31,28 @@ OptionString::OptionString(const Option::Universe u, const uint16_t type,
     unpack(begin, end);
 }
 
+uint16_t
+OptionString::len() {
+    return (getHeaderLen() + value_.size());
+}
 
 void
-OptionString::pack(isc::util::OutputBuffer&/* buf*/) {
+OptionString::pack(isc::util::OutputBuffer& buf) {
+    // Sanity check that the string value is at least one byte long.
+    // This is a requirement for all currently defined options which
+    // carry a string value.
+    if (value_.empty()) {
+        isc_throw(isc::OutOfRange, "string value carried in the option"
+                  << " must not be empty");
+    }
+
+    // Pack option header.
+    packHeader(buf);
+    // Pack data.
+    buf.writeData(value_.c_str(), value_.size());
+
+    // That's it. We don't pack any sub-options here, because this option
+    // must not contain sub-options.
 }
 
 void

diff --git a/src/lib/dhcp/option_string.h b/src/lib/dhcp/option_string.h
index 83620baa8dd5859443b1c9f279bde455e2afc2f3..a0a270b8ed5aacc8a8dd8ddff92be53459437640 100644 (file)
--- a/src/lib/dhcp/option_string.h
+++ b/src/lib/dhcp/option_string.h
@@ -60,6 +60,11 @@ public:
     OptionString(const Option::Universe u, const uint16_t type,
                  OptionBufferConstIter begin, OptionBufferConstIter end);
 
+    /// @brief Returns length of the whole option, including header.
+    ///
+    /// @return length of the whole option.
+    virtual uint16_t len();
+
     /// @brief Returns the string value held by the option.
     ///
     /// @return string value held by the option.

diff --git a/src/lib/dhcp/tests/option_string_unittest.cc b/src/lib/dhcp/tests/option_string_unittest.cc
index 6e81aebd202ae2c2ec3c27acc4eadee188b9486b..a2523df5c6d7eec3e0f2e4f5a8d297cbbdc4d35d 100644 (file)
--- a/src/lib/dhcp/tests/option_string_unittest.cc
+++ b/src/lib/dhcp/tests/option_string_unittest.cc
@@ -43,18 +43,22 @@ public:
 // This test verifies that the constructor which creates an option instance
 // from a string value will create it properly.
 TEST_F(OptionStringTest, constructorFromString) {
-    OptionString optv4(Option::V4, 123, "some option");
+    const std::string optv4_value = "some option";
+    OptionString optv4(Option::V4, 123, optv4_value);
     EXPECT_EQ(Option::V4, optv4.getUniverse());
     EXPECT_EQ(123, optv4.getType());
-    EXPECT_EQ("some option", optv4.getValue());
+    EXPECT_EQ(optv4_value, optv4.getValue());
+    EXPECT_EQ(Option::OPTION4_HDR_LEN + optv4_value.size(), optv4.len());
 
     // Do another test with the same constructor to make sure that
     // different set of parameters would initialize the class members
     // to different values.
-    OptionString optv6(Option::V6, 234, "other option");
+    const std::string optv6_value = "other option";
+    OptionString optv6(Option::V6, 234, optv6_value);
     EXPECT_EQ(Option::V6, optv6.getUniverse());
     EXPECT_EQ(234, optv6.getType());
     EXPECT_EQ("other option", optv6.getValue());
+    EXPECT_EQ(Option::OPTION6_HDR_LEN + optv6_value.size(), optv6.len());
 }
 
 // This test verifies that the constructor which creates an option instance
@@ -73,17 +77,36 @@ TEST_F(OptionStringTest, constructorFromBuffer) {
     // function wide. The initialization (constructor invocation)
     // is pushed to the ASSERT_NO_THROW macro below, as it may
     // throw exception if buffer is truncated.
+    boost::scoped_ptr<OptionString> optv4;
+    ASSERT_NO_THROW(
+        optv4.reset(new OptionString(Option::V4, 234, buf_.begin(), buf_.end()));
+    );
+    // Make sure that it has been initialized to non-NULL value.
+    ASSERT_TRUE(optv4);
+
+    // Test the instance of the created option.
+    const std::string optv4_value = "This is a test string";
+    EXPECT_EQ(Option::V4, optv4->getUniverse());
+    EXPECT_EQ(234, optv4->getType());
+    EXPECT_EQ(Option::OPTION4_HDR_LEN + buf_.size(), optv4->len());
+    EXPECT_EQ(optv4_value, optv4->getValue());
+
+    // Do the same test for V6 option.
     boost::scoped_ptr<OptionString> optv6;
     ASSERT_NO_THROW(
-        optv6.reset(new OptionString(Option::V6, 123, buf_.begin(), buf_.end()));
+        // Let's reduce the size of the buffer by one byte and see if our option
+        // will absorb this little change.
+        optv6.reset(new OptionString(Option::V6, 123, buf_.begin(), buf_.end() - 1));
     );
     // Make sure that it has been initialized to non-NULL value.
     ASSERT_TRUE(optv6);
 
     // Test the instance of the created option.
+    const std::string optv6_value = "This is a test strin";
     EXPECT_EQ(Option::V6, optv6->getUniverse());
     EXPECT_EQ(123, optv6->getType());
-    EXPECT_EQ("This is a test string", optv6->getValue());
+    EXPECT_EQ(Option::OPTION6_HDR_LEN + buf_.size(), optv6->len());
+    EXPECT_EQ(optv6_value, optv6->getValue());
 }
 
 // This test verifies that the current option value can be overriden