BIND 10 trac3036, updated. 2babc7e39394de13cf72b0009e47c3c994f346c8 [3036] Remove outstanding NameChangeRequests from the queue when idle.

[BIND 10 source code commits]

The branch, trac3036 has been updated
       via  2babc7e39394de13cf72b0009e47c3c994f346c8 (commit)
      from  91cc21601ba76a1a99a42b31530a55948d7a9c93 (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 2babc7e39394de13cf72b0009e47c3c994f346c8
Author: Marcin Siodelski <marcin at isc.org>
Date:   Mon Aug 5 09:32:48 2013 +0200

    [3036] Remove outstanding NameChangeRequests from the queue when idle.

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

Summary of changes:
 src/bin/dhcp6/dhcp6_srv.cc |   15 +++++++++++++++
 src/bin/dhcp6/dhcp6_srv.h  |   11 +++++++++++
 2 files changed, 26 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 7885f23..da892b1 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -277,6 +277,11 @@ bool Dhcpv6Srv::run() {
                     LOG_ERROR(dhcp6_logger, DHCP6_PACK_FAIL);
                 }
             }
+
+            // Although we don't support sending the NameChangeRequests to
+            // bind10-d2 module, we already call sendNameChangeRequets() here
+            // to empty the queue. Otherwise, the queue would bloat.
+            sendNameChangeRequests();
         }
     }
 
@@ -914,6 +919,16 @@ Dhcpv6Srv::createRemovalNameChangeRequest(const Lease6Ptr& lease) {
 
 }
 
+void
+Dhcpv6Srv::sendNameChangeRequests() {
+    while (!name_change_reqs_.empty()) {
+        // @todo Once next NameChangeRequest is picked from the queue
+        // we should send it to the bind10-d2 module. Currently we
+        // just drop it.
+        name_change_reqs_.pop();
+    }
+}
+
 
 OptionPtr
 Dhcpv6Srv::assignIA_NA(const Subnet6Ptr& subnet, const DuidPtr& duid,
diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index d1359fc..3df5a21 100644
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -344,6 +344,17 @@ protected:
     /// records will be performed.
     void createRemovalNameChangeRequest(const Lease6Ptr& lease);
 
+    /// @brief Sends all outstanding NameChangeRequests to bind10-d2 module.
+    ///
+    /// The purpose of this function is to pick all outstanding
+    /// NameChangeRequests from the FIFO queue and send them to bind10-d2
+    /// module.
+    ///
+    /// @todo Currently this function simply removes all requests from the
+    /// queue but doesn't send them anywhere. In the future, the
+    /// NameChangeSender will be used to deliver requests to the other module.
+    void sendNameChangeRequests();
+
     /// @brief Attempts to renew received addresses
     ///
     /// It iterates through received IA_NA options and attempts to renew