BIND 10 trac3082, updated. cc2866a7dd9a2eb30d328a24d3257f3179229a8d [3082] Allow converting option to wire format when domain-name is empty.

[BIND 10 source code commits]

The branch, trac3082 has been updated
       via  cc2866a7dd9a2eb30d328a24d3257f3179229a8d (commit)
      from  04f940ed5e4f796ce09e1cf216da863a9c9a0d9d (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 cc2866a7dd9a2eb30d328a24d3257f3179229a8d
Author: Marcin Siodelski <marcin at isc.org>
Date:   Fri Aug 16 16:23:40 2013 +0200

    [3082] Allow converting option to wire format when domain-name is empty.

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

Summary of changes:
 src/lib/dhcp/option4_client_fqdn.cc                |   12 ++++++--
 src/lib/dhcp/tests/option4_client_fqdn_unittest.cc |   31 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/option4_client_fqdn.cc b/src/lib/dhcp/option4_client_fqdn.cc
index 48c057b..7f93a50 100644
--- a/src/lib/dhcp/option4_client_fqdn.cc
+++ b/src/lib/dhcp/option4_client_fqdn.cc
@@ -427,6 +427,11 @@ Option4ClientFqdn::getDomainName() const {
 
 void
 Option4ClientFqdn::packDomainName(isc::util::OutputBuffer& buf) const {
+    // If domain-name is empty, do nothing.
+    if (!impl_->domain_name_) {
+        return;
+    }
+
     if (getFlag(FLAG_E)) {
         // Domain name, encoded as a set of labels.
         isc::dns::LabelSequence labels(*impl_->domain_name_);
@@ -505,10 +510,13 @@ Option4ClientFqdn::toText(int indent) {
 
 uint16_t
 Option4ClientFqdn::len() {
+    uint16_t domain_name_length = 0;
     // If domain name is partial, the NULL terminating character
     // is not included and the option length have to be adjusted.
-    uint16_t domain_name_length = impl_->domain_name_type_ == FULL ?
-        impl_->domain_name_->getLength() : impl_->domain_name_->getLength() - 1;
+    if (impl_->domain_name_) {
+        domain_name_length = impl_->domain_name_type_ == FULL ?
+            impl_->domain_name_->getLength() : impl_->domain_name_->getLength() - 1;
+    }
 
     return (getHeaderLen() + FIXED_FIELDS_LEN + domain_name_length);
 }
diff --git a/src/lib/dhcp/tests/option4_client_fqdn_unittest.cc b/src/lib/dhcp/tests/option4_client_fqdn_unittest.cc
index 6de08ab..cdd7c64 100644
--- a/src/lib/dhcp/tests/option4_client_fqdn_unittest.cc
+++ b/src/lib/dhcp/tests/option4_client_fqdn_unittest.cc
@@ -744,6 +744,37 @@ TEST(Option4ClientFqdnTest, packPartial) {
     EXPECT_EQ(0, memcmp(ref_data, buf.getData(), buf.getLength()));
 }
 
+// This test verifies that it is possible to encode option with empty
+// domain-name in the on-wire format.
+TEST(Option4ClientFqdnTest, packEmpty) {
+    // Create option instance. Check that constructor doesn't throw.
+    const uint8_t flags = Option4ClientFqdn::FLAG_S | Option4ClientFqdn::FLAG_E;
+    boost::scoped_ptr<Option4ClientFqdn> option;
+    ASSERT_NO_THROW(
+        option.reset(new Option4ClientFqdn(flags,
+                                           Option4ClientFqdn::RCODE_CLIENT()))
+    );
+    ASSERT_TRUE(option);
+
+    // Prepare on-wire format of the option.
+    isc::util::OutputBuffer buf(10);
+    ASSERT_NO_THROW(option->pack(buf));
+
+    // Prepare reference data.
+    const uint8_t ref_data[] = {
+        81, 3,                                                 // header
+        Option4ClientFqdn::FLAG_S | Option4ClientFqdn::FLAG_E, // flags
+        0,                                                     // RCODE1
+        0                                                      // RCODE2
+    };
+    size_t ref_data_size = sizeof(ref_data) / sizeof(ref_data[0]);
+
+    // Check if the buffer has the same length as the reference data,
+    // so as they can be compared directly.
+    ASSERT_EQ(ref_data_size, buf.getLength());
+    EXPECT_EQ(0, memcmp(ref_data, buf.getData(), buf.getLength()));
+}
+
 // This test verifies that on-wire option data holding fully qualified domain
 // name is parsed correctly.
 TEST(Option4ClientFqdnTest, unpack) {