BIND 10 trac2721, updated. 03b6bd8461d7aee84ac34da1c737fed4a3c16c22 [2721] Addressed review comments. Corrected spacing, function descriptions, and replaced use of local variable tmp in checkNakResponse.

[BIND 10 source code commits]

The branch, trac2721 has been updated
       via  03b6bd8461d7aee84ac34da1c737fed4a3c16c22 (commit)
       via  cbaab234b0fe61e09b559c7623e3f29bc89ba1b9 (commit)
      from  e07f341d540ce584b3edc424a8cf9a8f1b9a542c (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 03b6bd8461d7aee84ac34da1c737fed4a3c16c22
Author: Thomas Markwalder <tmark at isc.org>
Date:   Mon Mar 25 08:13:43 2013 -0400

    [2721] Addressed review comments. Corrected spacing, function descriptions,
    and replaced use of local variable tmp in checkNakResponse.

commit cbaab234b0fe61e09b559c7623e3f29bc89ba1b9
Author: Thomas Markwalder <tmark at isc.org>
Date:   Mon Mar 25 08:09:00 2013 -0400

    Revert "[2721] Added unit test change comment"
    
    This reverts commit e07f341d540ce584b3edc424a8cf9a8f1b9a542c.

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

Summary of changes:
 ChangeLog                                 |    4 ----
 src/bin/dhcp6/tests/dhcp6_srv_unittest.cc |   14 ++++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 9a50668..2c1f6bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-5XX.    [func]]       tmark
-	b10-dhcp6: Added unit tests for handling requests when no 
-	v6 subnets are configured/defined. (See Trac #2719)
-	(Trac #2721, git TBD)
 583.	[func]*		jelte
 	b10-cmdctl-usermgr has been updated and its options and arguments
 	have changed; it now defaults to the same accounts file as
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index f00f79f..8d06b0d 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -134,17 +134,19 @@ public:
         EXPECT_TRUE(expected_clientid->getData() == tmp->getData());
     }
 
+    // Checks if server response is a NAK
     void checkNakResponse(const Pkt6Ptr& rsp, uint8_t expected_message_type,
-                       uint32_t expected_transid, uint16_t expected_status_code) {
+                          uint32_t expected_transid, 
+                          uint16_t expected_status_code) {
         // Check if we get response at all
         checkResponse(rsp, expected_message_type, expected_transid);
 
         // Check that IA_NA was returned 
-        OptionPtr tmp = rsp->getOption(D6O_IA_NA);
-        ASSERT_TRUE(tmp);
+        OptionPtr option_ia_na = rsp->getOption(D6O_IA_NA);
+        ASSERT_TRUE(option_ia_na);
 
         // check that the status is no address available
-        boost::shared_ptr<Option6IA> ia = boost::dynamic_pointer_cast<Option6IA>(tmp);
+        boost::shared_ptr<Option6IA> ia = boost::dynamic_pointer_cast<Option6IA>(option_ia_na);
         ASSERT_TRUE(ia);
 
         checkIA_NAStatusCode(ia, expected_status_code);
@@ -312,7 +314,7 @@ public:
     Pool6Ptr pool_;
 };
 
-// This test verifies that incoming SOLICIT can be handled properly, even when
+// This test verifies that incoming SOLICIT can be handled properly when
 // there are no subnets configured. 
 //
 // This test sends a SOLICIT and the expected response 
@@ -334,7 +336,7 @@ TEST_F(NakedDhcpv6SrvTest, SolicitNoSubnet) {
     checkNakResponse (reply, DHCPV6_ADVERTISE, 1234, STATUS_NoAddrsAvail);
 }
 
-// This test verifies that incoming SOLICIT can be handled properly, even when
+// This test verifies that incoming REQUEST can be handled properly when
 // there are no subnets configured. 
 //
 // This test sends a REQUEST and the expected response