[1613] data mangle wasn't necessary, reverted

diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index 77cff86b7fb477dc27a33cc65610c4a1cd190dbc..4938476666c664ebaa63904f92c8708dee459195 100644 (file)
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -177,27 +177,6 @@ TEST_F(AuthSrvTest, builtInQuery) {
     checkAllRcodeCountersZeroExcept(Rcode::NOERROR(), 1);
 }
 
-// Callback used in createRequestMessage that mangles the
-// wiredata to something that should not be parseable (to test
-// really badly formed queries)
-// This specific one simply increments every octet in the array
-void requestMangler(uint8_t* data, size_t data_len) {
-    for (size_t i = 0; i < data_len; ++i) {
-        data[i]++;
-    }
-}
-
-// Same as buildInQuery, but completely malform the sent query
-TEST_F(AuthSrvTest, builtInMalformedQuery) {
-    UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
-                                       default_qid, Name("version.bind"),
-                                       RRClass::CH(), RRType::TXT());
-    createRequestPacket(request_message, IPPROTO_UDP, NULL, &requestMangler);
-    server.processMessage(*io_message, parse_message, response_obuffer,
-                          &dnsserv);
-    checkAllRcodeCountersZeroExcept(Rcode::FORMERR(), 1);
-}
-
 // Same test emulating the UDPServer class behavior (defined in libasiolink).
 // This is not a good test in that it assumes internal implementation details
 // of UDPServer, but we've encountered a regression due to the introduction

diff --git a/src/lib/testutils/srv_test.cc b/src/lib/testutils/srv_test.cc
index ca632d59ab30490dc7f28281fe080b8d18959ee0..9d38eb759a3d3c811f4d21dbbaac73faeb8a887a 100644 (file)
--- a/src/lib/testutils/srv_test.cc
+++ b/src/lib/testutils/srv_test.cc
@@ -72,8 +72,7 @@ SrvTestBase::createDataFromFile(const char* const datafile,
 
 void
 SrvTestBase::createRequestPacket(Message& message,
-                                    const int protocol, TSIGContext* context,
-                                    void (*callback)(uint8_t*, size_t))
+                                    const int protocol, TSIGContext* context)
 {
     if (context == NULL) {
         message.toWire(request_renderer);
@@ -88,16 +87,9 @@ SrvTestBase::createRequestPacket(Message& message,
     io_sock = (protocol == IPPROTO_UDP) ? &IOSocket::getDummyUDPSocket() :
         &IOSocket::getDummyTCPSocket();
 
-    const void *data = request_renderer.getData();
-    size_t data_len = request_renderer.getLength();
-
-    if (callback) {
-        // convert to non-const uint8_t for easy manipulation by the callback
-        uint8_t *mdata = const_cast<uint8_t*>(static_cast<const uint8_t*>(data));
-        callback(mdata, data_len);
-    }
-    
-    io_message = new IOMessage(data, data_len, *io_sock, *endpoint);
+    io_message = new IOMessage(request_renderer.getData(),
+                               request_renderer.getLength(),
+                               *io_sock, *endpoint);
 }
 
 // Unsupported requests.  Should result in NOTIMP.

diff --git a/src/lib/testutils/srv_test.h b/src/lib/testutils/srv_test.h
index fe97da7f88bfae78d8b106635f621ce39436459f..630232c04a8976ab5d4a9753cbf3f41cbb0b8b3d 100644 (file)
--- a/src/lib/testutils/srv_test.h
+++ b/src/lib/testutils/srv_test.h
@@ -83,16 +83,9 @@ protected:
     /// It constructs wire-format DNS packet data from \c message in the
     /// form of \c IOMessage in \c io_message.
     /// The existing content of \c io_message, if any, will be deleted.
-    ///
-    /// If callback is given, it is called after rendering the message,
-    /// but before 'sending' it; this allows the given callback to modify
-    /// the data and introduce bad requests that would otherwise be hard
-    /// to reproduce (it passes the wire-format data as non-const uint8_t,
-    /// so tread lightly when using this).
     void createRequestPacket(isc::dns::Message& message,
                              const int protocol = IPPROTO_UDP,
-                             isc::dns::TSIGContext* context = NULL,
-                             void (*callback)(uint8_t*, size_t) = NULL);
+                             isc::dns::TSIGContext* context = NULL);
 
     MockSession notify_session;
     MockServer dnsserv;