[1539] make sure ddns forwarder establishes connection only once.

diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index c22765db5b32d8e56a6c1cfb9befda55a5511ddd..a48f9da8dd4e73d550143b211e1e2151b04ac48f 100644 (file)
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -110,6 +110,27 @@ public:
 private:
     MessageRenderer& renderer_;
 };
+
+/// TBD document it.
+class SocketSessionForwarderHolder {
+public:
+    SocketSessionForwarderHolder(BaseSocketSessionForwarder& forwarder) :
+        forwarder_(forwarder), connected_(false)
+    {}
+    ~SocketSessionForwarderHolder() {}
+
+    void connect() {
+        if (!connected_) {
+            forwarder_.connectToReceiver();
+            connected_ = true;
+        }
+    }
+
+    BaseSocketSessionForwarder& forwarder_;
+
+private:
+    bool connected_;
+};
 }
 
 class AuthSrvImpl {
@@ -196,7 +217,7 @@ private:
     bool xfrout_connected_;
     AbstractXfroutClient& xfrout_client_;
 
-    BaseSocketSessionForwarder& ddns_forwarder_;
+    SocketSessionForwarderHolder ddns_forwarder_;
 
     /// Increment query counter
     void incCounter(const int protocol);
@@ -763,7 +784,8 @@ AuthSrvImpl::processUpdate(const IOMessage& /*io_message*/,
                            std::auto_ptr<TSIGContext> /*tsig_context*/)
 {
     // hardcode for initial test
-    ddns_forwarder_.connectToReceiver();
+    ddns_forwarder_.connect();
+
     return (false);
 }
 

diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index df0c2f014c07a8bf8f7f2e7b585fcb109848cb14..66c95ed777c1aa3da08200d063e5f0a88cb36adc 100644 (file)
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -1392,14 +1392,19 @@ TEST_F(AuthSrvTest, queryWithThrowingInToWire) {
 TEST_F(AuthSrvTest, DDNSForward) {
     EXPECT_FALSE(ddns_forwarder.isConnected());
 
-    UnitTestUtil::createRequestMessage(request_message, Opcode::UPDATE(),
-                                       default_qid, Name("example.com"),
-                                       RRClass::IN(), RRType::SOA());
-    createRequestPacket(request_message, IPPROTO_UDP);
-    server.processMessage(*io_message, *parse_message, *response_obuffer,
-                          &dnsserv);
-    EXPECT_FALSE(dnsserv.hasAnswer());
-    EXPECT_TRUE(ddns_forwarder.isConnected());
+    // Repeat sending an update request two times.  By doing that we'll
+    // confirm the forwarder connection will be established exactly once,
+    // and kept established.
+    for (size_t i = 0; i < 2; ++i) {
+        UnitTestUtil::createRequestMessage(request_message, Opcode::UPDATE(),
+                                           default_qid, Name("example.com"),
+                                           RRClass::IN(), RRType::SOA());
+        createRequestPacket(request_message, IPPROTO_UDP);
+        server.processMessage(*io_message, *parse_message, *response_obuffer,
+                              &dnsserv);
+        EXPECT_FALSE(dnsserv.hasAnswer());
+        EXPECT_TRUE(ddns_forwarder.isConnected());
+    }
 }
 
 }

diff --git a/src/lib/testutils/mockups.h b/src/lib/testutils/mockups.h
index e48da508042d2b3689395ea5789208f46f051231..4f4c27b2ea3c4d4860ef092aceed3b745e5b0a39 100644 (file)
--- a/src/lib/testutils/mockups.h
+++ b/src/lib/testutils/mockups.h
@@ -218,6 +218,9 @@ public:
             isc_throw(isc::util::io::SocketSessionError, "socket session "
                       "forwarding connection disabled for test");
         }
+        if (is_connected_) {
+            isc_throw(isc::util::io::SocketSessionError, "duplicate connect");
+        }
         is_connected_ = true;
     }
     virtual void close() {}