BIND 10 trac3232, updated. 4593a9abb2ba1c6cc8c81fbe3ea95a2e3b6c7585 [3232] Renamed two functions in the test DHCPv6 client.

[BIND 10 source code commits]

The branch, trac3232 has been updated
       via  4593a9abb2ba1c6cc8c81fbe3ea95a2e3b6c7585 (commit)
      from  1b86037d33ea30c2bacb991a65a43f5c2a24c747 (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 4593a9abb2ba1c6cc8c81fbe3ea95a2e3b6c7585
Author: Marcin Siodelski <marcin at isc.org>
Date:   Tue Feb 25 08:55:34 2014 +0100

    [3232] Renamed two functions in the test DHCPv6 client.

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

Summary of changes:
 src/bin/dhcp6/tests/dhcp6_client.cc |    8 ++++----
 src/bin/dhcp6/tests/dhcp6_client.h  |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/tests/dhcp6_client.cc b/src/bin/dhcp6/tests/dhcp6_client.cc
index bd60260..ce51283 100644
--- a/src/bin/dhcp6/tests/dhcp6_client.cc
+++ b/src/bin/dhcp6/tests/dhcp6_client.cc
@@ -181,15 +181,15 @@ Dhcp6Client::createMsg(const uint8_t msg_type) {
 
 void
 Dhcp6Client::doSARR() {
-    doSolicitAdvertise();
+    doSolicit();
     // Don't send the Request if there was no Advertise.
     if (context_.response_) {
-        doRequestReply();
+        doRequest();
     }
 }
 
 void
-Dhcp6Client::doSolicitAdvertise() {
+Dhcp6Client::doSolicit() {
     context_.query_ = createMsg(DHCPV6_SOLICIT);
     if (use_na_) {
         context_.query_->addOption(Option6IAPtr(new Option6IA(D6O_IA_NA,
@@ -206,7 +206,7 @@ Dhcp6Client::doSolicitAdvertise() {
 }
 
 void
-Dhcp6Client::doRequestReply() {
+Dhcp6Client::doRequest() {
     Pkt6Ptr query = createMsg(DHCPV6_REQUEST);
     query->addOption(context_.response_->getOption(D6O_SERVERID));
     copyIAs(context_.response_, query);
diff --git a/src/bin/dhcp6/tests/dhcp6_client.h b/src/bin/dhcp6/tests/dhcp6_client.h
index bc2cd7e..b01c0f1 100644
--- a/src/bin/dhcp6/tests/dhcp6_client.h
+++ b/src/bin/dhcp6/tests/dhcp6_client.h
@@ -102,7 +102,7 @@ public:
     /// This function simulates the first transaction of the 4-way exchange,
     /// i.e. sends a Solicit to the server and receives Advertise. It doesn't
     /// set the lease configuration in the @c config_.
-    void doSolicitAdvertise();
+    void doSolicit();
 
     /// @brief Sends a Rebind to the server and receives the Reply.
     ///
@@ -120,7 +120,7 @@ public:
     /// from the current context (server's Advertise) to request acquisition
     /// of offered IAs. If the server responds to the Request (leases are
     /// acquired) the client's lease configuration is updated.
-    void doRequestReply();
+    void doRequest();
 
     /// @brief Simulates aging of leases by the specified number of seconds.
     ///