]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#769,!452] Removed socksession class 769-remove-bind10-leftovers
authorTomek Mrugalski <tomasz@isc.org>
Thu, 8 Aug 2019 17:31:39 +0000 (19:31 +0200)
committerTomek Mrugalski <tomek@isc.org>
Sun, 11 Aug 2019 21:55:17 +0000 (17:55 -0400)
src/lib/util/Makefile.am
src/lib/util/tests/Makefile.am
src/lib/util/tests/socketsession_unittest.cc [deleted file]

index 60a36fe919a080b84408b693e1ab9a74a6d6a655..e7178ec84920da895fbf916a3525b05fc9b3b9da 100644 (file)
@@ -88,8 +88,7 @@ libkea_util_io_include_HEADERS = \
        io/fd.h \
        io/fd_share.h \
        io/pktinfo_utilities.h \
-       io/sockaddr_util.h \
-       io/socketsession.h
+       io/sockaddr_util.h
 
 libkea_util_random_includedir = $(pkgincludedir)/util/random
 libkea_util_random_include_HEADERS = \
index b43f2f15a0b8f5b96e0eb80f2a4445789e475d32..2361540dda4fb86dda9bb0fbef9c00a0055121f0 100644 (file)
@@ -49,7 +49,6 @@ run_unittests_SOURCES += pid_file_unittest.cc
 run_unittests_SOURCES += process_spawn_unittest.cc
 run_unittests_SOURCES += qid_gen_unittest.cc
 run_unittests_SOURCES += random_number_generator_unittest.cc
-run_unittests_SOURCES += socketsession_unittest.cc
 run_unittests_SOURCES += staged_value_unittest.cc
 run_unittests_SOURCES += state_model_unittest.cc
 run_unittests_SOURCES += strutil_unittest.cc
diff --git a/src/lib/util/tests/socketsession_unittest.cc b/src/lib/util/tests/socketsession_unittest.cc
deleted file mode 100644 (file)
index 7892399..0000000
+++ /dev/null
@@ -1,862 +0,0 @@
-// Copyright (C) 2011-2019 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-
-#include <fcntl.h>
-#include <netdb.h>
-#include <unistd.h>
-
-#include <cerrno>
-#include <cstring>
-#include <cstdlib>
-
-#include <algorithm>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
-
-#include <gtest/gtest.h>
-#include <testutils/sandbox.h>
-
-#include <exceptions/exceptions.h>
-
-#include <util/buffer.h>
-#include <util/io/fd_share.h>
-#include <util/io/socketsession.h>
-#include <util/io/sockaddr_util.h>
-
-using namespace std;
-using namespace isc;
-using boost::scoped_ptr;
-using namespace isc::util::io;
-using namespace isc::util::io::internal;
-
-namespace {
-
-const char* const TEST_PORT = "53535";
-const char* const TEST_PORT2 = "53536"; // use this in case we need 2 ports
-const char TEST_DATA[] = "Kea test";
-
-// A simple helper structure to automatically close test sockets on return
-// or exception in a RAII manner.  non copyable to prevent duplicate close.
-struct ScopedSocket : boost::noncopyable {
-    ScopedSocket() : fd(-1) {}
-    ScopedSocket(int sock) : fd(sock) {}
-    ~ScopedSocket() {
-        closeSocket();
-    }
-    void reset(int sock) {
-        closeSocket();
-        fd = sock;
-    }
-    int fd;
-private:
-    void closeSocket() {
-        if (fd >= 0) {
-            close(fd);
-        }
-    }
-};
-
-// A helper function that makes a test socket non block so that a certain
-// kind of test failure (such as missing send) won't cause hangup.
-void
-setNonBlock(int s, bool on) {
-    int fcntl_flags = fcntl(s, F_GETFL, 0);
-    if (on) {
-        fcntl_flags |= O_NONBLOCK;
-    } else {
-        fcntl_flags &= ~O_NONBLOCK;
-    }
-    if (fcntl(s, F_SETFL, fcntl_flags) == -1) {
-        isc_throw(isc::Unexpected, "fcntl(O_NONBLOCK) failed: " <<
-                  strerror(errno));
-    }
-}
-
-// A helper to impose some reasonable amount of wait on recv(from)
-// if possible.  It returns an option flag to be set for the system call
-// (when necessary).
-int
-setRecvDelay(int s) {
-    const struct timeval timeo = { 10, 0 };
-    if (setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeo, sizeof(timeo)) == -1) {
-        if (errno == ENOPROTOOPT) {
-            // Workaround for Solaris: see recursive_query_unittest
-            return (MSG_DONTWAIT);
-        } else {
-            isc_throw(isc::Unexpected, "set RCVTIMEO failed: " <<
-                      strerror(errno));
-        }
-    }
-    return (0);
-}
-
-// A shortcut type that is convenient to be used for socket related
-// system calls, which generally require this pair
-typedef pair<const struct sockaddr*, socklen_t> SockAddrInfo;
-
-// A helper class to convert textual representation of IP address and port
-// to a pair of sockaddr and its length (in the form of a SockAddrInfo
-// pair).  Its get method uses getaddrinfo(3) for the conversion and stores
-// the result in the addrinfo_list_ vector until the object is destroyed.
-// The allocated resources will be automatically freed in an RAII manner.
-class SockAddrCreator {
-public:
-    ~SockAddrCreator() {
-        vector<struct addrinfo*>::const_iterator it;
-        for (it = addrinfo_list_.begin(); it != addrinfo_list_.end(); ++it) {
-            freeaddrinfo(*it);
-        }
-    }
-    SockAddrInfo get(const string& addr_str, const string& port_str) {
-        struct addrinfo hints, *res;
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
-        hints.ai_family = AF_UNSPEC;
-        hints.ai_socktype = SOCK_DGRAM; // could be either DGRAM or STREAM here
-        const int error = getaddrinfo(addr_str.c_str(), port_str.c_str(),
-                                      &hints, &res);
-        if (error != 0) {
-            isc_throw(isc::Unexpected, "getaddrinfo failed for " <<
-                      addr_str << ", " << port_str << ": " <<
-                      gai_strerror(error));
-        }
-
-        // Technically, this is not entirely exception safe; if push_back
-        // throws, the resources allocated for 'res' will leak.  We prefer
-        // brevity here and ignore the minor failure mode.
-        addrinfo_list_.push_back(res);
-
-        return (SockAddrInfo(res->ai_addr, res->ai_addrlen));
-    }
-private:
-    vector<struct addrinfo*> addrinfo_list_;
-};
-
-class ForwardTest : public ::testing::Test {
-protected:
-    isc::test::Sandbox sandbox;
-
-    /// @brief Returns socket path (using either hardcoded path or env variable)
-    /// @return path to the unix socket
-    std::string getSocketPath() {
-        std::string socket_path;
-        const char* env = getenv("KEA_SOCKET_TEST_DIR");
-        if (env) {
-            socket_path = string(env) + "/test.unix";
-        } else {
-            socket_path = sandbox.join("test.unix");
-        }
-        return (socket_path);
-    }
-
-    ForwardTest() : listen_fd_(-1), forwarder_(getSocketPath()),
-                    large_text_(65535, 'a'),
-                    test_un_len_(2 + strlen(getSocketPath().c_str()))
-    {
-        std::string unix_file = getSocketPath();
-
-        static_cast<void>(remove(unix_file.c_str()));
-        test_un_.sun_family = AF_UNIX;
-        strncpy(test_un_.sun_path, unix_file.c_str(), sizeof(test_un_.sun_path));
-#ifdef HAVE_SA_LEN
-        test_un_.sun_len = test_un_len_;
-#endif
-    }
-
-    ~ForwardTest() {
-        if (listen_fd_ != -1) {
-            close(listen_fd_);
-        }
-        static_cast<void>(remove(getSocketPath().c_str()));
-    }
-
-    // Start an internal "socket session server".
-    void startListen() {
-        if (listen_fd_ != -1) {
-            isc_throw(isc::Unexpected, "duplicate call to startListen()");
-        }
-        listen_fd_ = socket(AF_UNIX, SOCK_STREAM, 0);
-        if (listen_fd_ == -1) {
-            isc_throw(isc::Unexpected, "failed to create UNIX domain socket" <<
-                      strerror(errno));
-        }
-        if (::bind(listen_fd_, convertSockAddr(&test_un_), test_un_len_) == -1) {
-            isc_throw(isc::Unexpected, "failed to bind UNIX domain socket" <<
-                      strerror(errno));
-        }
-        // 10 is an arbitrary choice, should be sufficient for a single test
-        if (listen(listen_fd_, 10) == -1) {
-            isc_throw(isc::Unexpected, "failed to listen on UNIX domain socket"
-                      << strerror(errno));
-        }
-    }
-
-    int dummyConnect() const {
-        const int s = socket(AF_UNIX, SOCK_STREAM, 0);
-        if (s == -1) {
-            isc_throw(isc::Unexpected,
-                      "failed to create a test UNIX domain socket");
-        }
-        setNonBlock(s, true);
-        if (connect(s, convertSockAddr(&test_un_), sizeof(test_un_)) == -1) {
-            isc_throw(isc::Unexpected,
-                      "failed to connect to the test SocketSessionForwarder");
-        }
-        return (s);
-    }
-
-    // Accept a new connection from a SocketSessionForwarder and return
-    // the socket FD of the new connection.  This assumes startListen()
-    // has been called.
-    int acceptForwarder() {
-        setNonBlock(listen_fd_, true); // prevent the test from hanging up
-        struct sockaddr_un from;
-        socklen_t from_len = sizeof(from);
-        const int s = accept(listen_fd_, convertSockAddr(&from), &from_len);
-        if (s == -1) {
-            isc_throw(isc::Unexpected, "accept failed: " << strerror(errno));
-        }
-        // Make sure the socket is *blocking*.  We may pass large data, through
-        // it, and apparently non blocking read could cause some unexpected
-        // partial read on some systems.
-        setNonBlock(s, false);
-        return (s);
-    }
-
-    // A convenient shortcut for the namespace-scope version of getSockAddr
-    SockAddrInfo getSockAddr(const string& addr_str, const string& port_str) {
-        return (addr_creator_.get(addr_str, port_str));
-    }
-
-    // A helper method that creates a specified type of socket that is
-    // supposed to be passed via a SocketSessionForwarder.  It will bound
-    // to the specified address and port in sainfo.  If do_listen is true
-    // and it's a TCP socket, it will also start listening to new connection
-    // requests.
-    int createSocket(int family, int type, int protocol,
-                     const SockAddrInfo& sainfo, bool do_listen)
-    {
-        int s = socket(family, type, protocol);
-        if (s < 0) {
-            isc_throw(isc::Unexpected, "socket(2) failed: " <<
-                      strerror(errno));
-        }
-        const int on = 1;
-        if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
-            isc_throw(isc::Unexpected, "setsockopt(SO_REUSEADDR) failed: " <<
-                      strerror(errno));
-        }
-        if (bind(s, sainfo.first, sainfo.second) < 0) {
-            close(s);
-            isc_throw(isc::Unexpected, "bind(2) failed: " <<
-                      strerror(errno));
-        }
-        if (do_listen && protocol == IPPROTO_TCP) {
-            if (listen(s, 1) == -1) {
-                isc_throw(isc::Unexpected, "listen(2) failed: " <<
-                          strerror(errno));
-            }
-        }
-        return (s);
-    }
-
-    // A helper method to push some (normally bogus) socket session header
-    // via a Unix domain socket that pretends to be a valid
-    // SocketSessionForwarder.  It first opens the Unix domain socket,
-    // and connect to the test receiver server (startListen() is expected to
-    // be called beforehand), forwards a valid file descriptor ("stdin" is
-    // used for simplicity), the pushed a 2-byte header length field of the
-    // session header.  The internal receiver_ pointer will be set to a
-    // newly created receiver object for the connection.
-    //
-    // \param hdrlen: The header length to be pushed.  It may or may not be
-    //                valid.
-    // \param hdrlen_len: The length of the actually pushed data as "header
-    //                    length".  Normally it should be 2 (the default), but
-    //                    could be a bogus value for testing.
-    // \param push_fd: Whether to forward the FD.  Normally it should be true,
-    //                 but can be false for testing.
-    void pushSessionHeader(uint16_t hdrlen,
-                           size_t hdrlen_len = sizeof(uint16_t),
-                           bool push_fd = true,
-                           int fd = 0)
-    {
-        isc::util::OutputBuffer obuffer(0);
-        obuffer.clear();
-
-        dummy_forwarder_.reset(dummyConnect());
-        if (push_fd && send_fd(dummy_forwarder_.fd, fd) != 0) {
-            isc_throw(isc::Unexpected, "Failed to pass FD");
-        }
-        obuffer.writeUint16(hdrlen);
-        if (hdrlen_len > 0) {
-            if (send(dummy_forwarder_.fd, obuffer.getData(), hdrlen_len, 0) !=
-                hdrlen_len) {
-                isc_throw(isc::Unexpected,
-                          "Failed to pass session header len");
-            }
-        }
-        accept_sock_.reset(acceptForwarder());
-        receiver_.reset(new SocketSessionReceiver(accept_sock_.fd));
-    }
-
-    // A helper method to push some (normally bogus) socket session via a
-    // Unix domain socket pretending to be a valid SocketSessionForwarder.
-    // It internally calls pushSessionHeader() for setup and pushing the
-    // header, and pass (often bogus) header data and session data based
-    // on the function parameters.  The parameters are generally compatible
-    // to those for SocketSessionForwarder::push, but could be invalid for
-    // testing purposes.  For session data, we use TEST_DATA and its size
-    // by default for simplicity, but the size can be tweaked for testing.
-    void pushSession(int family, int type, int protocol, socklen_t local_len,
-                     const sockaddr& local, socklen_t remote_len,
-                     const sockaddr& remote,
-                     size_t data_len = sizeof(TEST_DATA))
-    {
-        isc::util::OutputBuffer obuffer(0);
-        obuffer.writeUint32(static_cast<uint32_t>(family));
-        obuffer.writeUint32(static_cast<uint32_t>(type));
-        obuffer.writeUint32(static_cast<uint32_t>(protocol));
-        obuffer.writeUint32(static_cast<uint32_t>(local_len));
-        obuffer.writeData(&local, min(local_len, getSALength(local)));
-        obuffer.writeUint32(static_cast<uint32_t>(remote_len));
-        obuffer.writeData(&remote, min(remote_len, getSALength(remote)));
-        obuffer.writeUint32(static_cast<uint32_t>(data_len));
-        pushSessionHeader(obuffer.getLength());
-        if (send(dummy_forwarder_.fd, obuffer.getData(), obuffer.getLength(),
-                 0) != obuffer.getLength()) {
-            isc_throw(isc::Unexpected, "Failed to pass session header");
-        }
-        if (send(dummy_forwarder_.fd, TEST_DATA, sizeof(TEST_DATA), 0) !=
-            sizeof(TEST_DATA)) {
-            isc_throw(isc::Unexpected, "Failed to pass session data");
-        }
-    }
-
-    // See below
-    void checkPushAndPop(int family, int type, int protocol,
-                         const SockAddrInfo& local,
-                         const SockAddrInfo& remote, const void* const data,
-                         size_t data_len, bool new_connection);
-
-protected:
-    int listen_fd_;
-    SocketSessionForwarder forwarder_;
-    ScopedSocket dummy_forwarder_; // forwarder "like" socket to pass bad data
-    scoped_ptr<SocketSessionReceiver> receiver_;
-    ScopedSocket accept_sock_;
-    const string large_text_;
-
-private:
-    struct sockaddr_un test_un_;
-    const socklen_t test_un_len_;
-    SockAddrCreator addr_creator_;
-};
-
-TEST_F(ForwardTest, construct) {
-    // On construction the existence of the file doesn't matter.
-    SocketSessionForwarder("some_file");
-
-    // But too long a path should be rejected
-    struct sockaddr_un s;     // can't be const; some compiler complains
-    EXPECT_THROW(SocketSessionForwarder(string(sizeof(s.sun_path), 'x')),
-                 SocketSessionError);
-    // If it's one byte shorter it should be okay
-    SocketSessionForwarder(string(sizeof(s.sun_path) - 1, 'x'));
-}
-
-TEST_F(ForwardTest, connect) {
-    // File doesn't exist (we assume the file "no_such_file" doesn't exist)
-    SocketSessionForwarder forwarder("no_such_file");
-    EXPECT_THROW(forwarder.connectToReceiver(), SocketSessionError);
-    // The socket should be closed internally, so close() should result in
-    // error.
-    EXPECT_THROW(forwarder.close(), BadValue);
-
-    // Set up the receiver and connect.  It should succeed.
-    SocketSessionForwarder forwarder2(getSocketPath().c_str());
-    startListen();
-    forwarder2.connectToReceiver();
-    // And it can be closed successfully.
-    forwarder2.close();
-    // Duplicate close should fail
-    EXPECT_THROW(forwarder2.close(), BadValue);
-    // Once closed, reconnect is okay.
-    forwarder2.connectToReceiver();
-    forwarder2.close();
-
-    // Duplicate connect should be rejected
-    forwarder2.connectToReceiver();
-    EXPECT_THROW(forwarder2.connectToReceiver(), BadValue);
-
-    // Connect then destroy.  Should be internally closed, but unfortunately
-    // it's not easy to test it directly.  We only check no disruption happens.
-    SocketSessionForwarder* forwarderp =
-        new SocketSessionForwarder(getSocketPath().c_str());
-    forwarderp->connectToReceiver();
-    delete forwarderp;
-}
-
-TEST_F(ForwardTest, close) {
-    // can't close before connect
-    EXPECT_THROW(SocketSessionForwarder(getSocketPath().c_str()).close(), BadValue);
-}
-
-void
-checkSockAddrs(const sockaddr& expected, const sockaddr& actual) {
-    char hbuf_expected[NI_MAXHOST], sbuf_expected[NI_MAXSERV],
-        hbuf_actual[NI_MAXHOST], sbuf_actual[NI_MAXSERV];
-    EXPECT_EQ(0, getnameinfo(&expected, getSALength(expected),
-                             hbuf_expected, sizeof(hbuf_expected),
-                             sbuf_expected, sizeof(sbuf_expected),
-                             NI_NUMERICHOST | NI_NUMERICSERV));
-    EXPECT_EQ(0, getnameinfo(&actual, getSALength(actual),
-                             hbuf_actual, sizeof(hbuf_actual),
-                             sbuf_actual, sizeof(sbuf_actual),
-                             NI_NUMERICHOST | NI_NUMERICSERV));
-    EXPECT_EQ(string(hbuf_expected), string(hbuf_actual));
-    EXPECT_EQ(string(sbuf_expected), string(sbuf_actual));
-}
-
-// This is a commonly used test case that confirms normal behavior of
-// session passing.  It first creates a "local" socket (which is supposed
-// to act as a "server") bound to the 'local' parameter.  It then forwards
-// the descriptor of the FD of the local socket along with given data.
-// Next, it creates an Receiver object to receive the forwarded FD itself,
-// receives the FD, and sends test data from the received FD.  The
-// test finally checks if it can receive the test data from the local socket
-// at the Forwarder side.  In the case of TCP it's a bit complicated because
-// it first needs to establish a new connection, but essentially the test
-// scenario is the same.  See the diagram below for more details.
-//
-// UDP:
-//   Forwarder          Receiver
-//   sock -- (pass) --> passed_sock
-//   (check)  <-------- send TEST_DATA
-//
-// TCP:
-//   Forwarder               Receiver
-//   server_sock---(pass)--->passed_sock
-//     ^                        |
-//     |(connect)               |
-//   client_sock                |
-//      (check)<---------send TEST_DATA
-void
-ForwardTest::checkPushAndPop(int family, int type, int protocol,
-                             const SockAddrInfo& local,
-                             const SockAddrInfo& remote,
-                             const void* const data,
-                             size_t data_len, bool new_connection)
-{
-    // Create an original socket to be passed
-    const ScopedSocket sock(createSocket(family, type, protocol, local, true));
-    int fwd_fd = sock.fd;       // default FD to be forwarded
-    ScopedSocket client_sock;   // for TCP test we need a separate "client"..
-    ScopedSocket server_sock;   // ..and a separate socket for the connection
-    if (protocol == IPPROTO_TCP) {
-        // Use unspecified port for the "client" to avoid bind(2) failure
-        const SockAddrInfo client_addr = getSockAddr(family == AF_INET6 ?
-                                                     "::1" : "127.0.0.1", "0");
-        client_sock.reset(createSocket(family, type, protocol, client_addr,
-                                       false));
-        setNonBlock(client_sock.fd, true);
-        // This connect would "fail" due to EINPROGRESS.  Ignore it for now.
-        static_cast<void>(connect(client_sock.fd, local.first, local.second));
-        sockaddr_storage ss;
-        socklen_t salen = sizeof(ss);
-        server_sock.reset(accept(sock.fd, convertSockAddr(&ss), &salen));
-        if (server_sock.fd == -1) {
-            isc_throw(isc::Unexpected, "internal accept failed: " <<
-                      strerror(errno));
-        }
-        fwd_fd = server_sock.fd;
-    }
-
-    // If a new connection is required, start the "server", have the
-    // internal forwarder connect to it, and then internally accept it.
-    if (new_connection) {
-        startListen();
-        forwarder_.connectToReceiver();
-        accept_sock_.reset(acceptForwarder());
-    }
-
-    // Then push one socket session via the forwarder.
-    forwarder_.push(fwd_fd, family, type, protocol, *local.first,
-                    *remote.first, data, data_len);
-
-    // Pop the socket session we just pushed from a local receiver, and
-    // check the content.  Since we do blocking read on the receiver's socket,
-    // we set up an alarm to prevent hangup in case there's a bug that really
-    // makes the blocking happen.
-    SocketSessionReceiver receiver(accept_sock_.fd);
-    alarm(1);                   // set up 1-sec timer, an arbitrary choice.
-    const SocketSession sock_session = receiver.pop();
-    alarm(0);                   // then cancel it.
-    const ScopedSocket passed_sock(sock_session.getSocket());
-    EXPECT_LE(0, passed_sock.fd);
-    // The passed FD should be different from the original FD
-    EXPECT_NE(fwd_fd, passed_sock.fd);
-    EXPECT_EQ(family, sock_session.getFamily());
-    EXPECT_EQ(type, sock_session.getType());
-    EXPECT_EQ(protocol, sock_session.getProtocol());
-    checkSockAddrs(*local.first, sock_session.getLocalEndpoint());
-    checkSockAddrs(*remote.first, sock_session.getRemoteEndpoint());
-    ASSERT_EQ(data_len, sock_session.getDataLength());
-    EXPECT_EQ(0, memcmp(data, sock_session.getData(), data_len));
-
-    // Check if the passed FD is usable by sending some data from it.
-    setNonBlock(passed_sock.fd, false);
-    if (protocol == IPPROTO_UDP) {
-        EXPECT_EQ(sizeof(TEST_DATA),
-                  sendto(passed_sock.fd, TEST_DATA, sizeof(TEST_DATA), 0,
-                         convertSockAddr(local.first), local.second));
-    } else {
-        server_sock.reset(-1);
-        EXPECT_EQ(sizeof(TEST_DATA),
-                  send(passed_sock.fd, TEST_DATA, sizeof(TEST_DATA), 0));
-    }
-    // We don't use non blocking read below as it doesn't seem to be always
-    // reliable.  Instead we impose some reasonably large upper time limit of
-    // blocking (normally it shouldn't even block at all; the limit is to
-    // force the test to stop even if there's some bug and recv fails).
-    char recvbuf[sizeof(TEST_DATA) + 1] = { };
-    sockaddr_storage ss;
-    socklen_t sa_len = sizeof(ss);
-    if (protocol == IPPROTO_UDP) {
-        EXPECT_EQ(sizeof(TEST_DATA),
-                  recvfrom(fwd_fd, recvbuf, sizeof(TEST_DATA),
-                           setRecvDelay(fwd_fd), convertSockAddr(&ss),
-                           &sa_len));
-    } else {
-        setNonBlock(client_sock.fd, false);
-        EXPECT_EQ(sizeof(TEST_DATA),
-                  recv(client_sock.fd, recvbuf, sizeof(TEST_DATA),
-                       setRecvDelay(client_sock.fd)));
-    }
-    EXPECT_EQ(string(TEST_DATA), string(recvbuf));
-}
-
-TEST_F(ForwardTest, pushAndPop) {
-    // Pass a UDP/IPv6 session.  We use different ports for different UDP
-    // tests because Solaris 11 seems to prohibit reusing the same port for
-    // some short period once the socket FD is forwarded, even if the sockets
-    // are closed.  See Trac #2028.
-    const SockAddrInfo sai_local6(getSockAddr("::1", TEST_PORT));
-    const SockAddrInfo sai_local6_alt(getSockAddr("::1", TEST_PORT2));
-    const SockAddrInfo sai_remote6(getSockAddr("2001:db8::1", "5300"));
-    {
-        SCOPED_TRACE("Passing UDP/IPv6 session");
-        checkPushAndPop(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, sai_local6,
-                        sai_remote6, TEST_DATA, sizeof(TEST_DATA), true);
-    }
-    // Pass a TCP/IPv6 session.
-    {
-        SCOPED_TRACE("Passing TCP/IPv6 session");
-        checkPushAndPop(AF_INET6, SOCK_STREAM, IPPROTO_TCP, sai_local6,
-                        sai_remote6, TEST_DATA, sizeof(TEST_DATA), false);
-    }
-
-    // Pass a UDP/IPv4 session.  This reuses the same pair of forwarder and
-    // receiver, which should be usable for multiple attempts of passing,
-    // regardless of family of the passed session
-    const SockAddrInfo sai_local4(getSockAddr("127.0.0.1", TEST_PORT));
-    const SockAddrInfo sai_local4_alt(getSockAddr("127.0.0.1", TEST_PORT2));
-    const SockAddrInfo sai_remote4(getSockAddr("192.0.2.2", "5300"));
-    {
-        SCOPED_TRACE("Passing UDP/IPv4 session");
-        checkPushAndPop(AF_INET, SOCK_DGRAM, IPPROTO_UDP, sai_local4,
-                        sai_remote4, TEST_DATA, sizeof(TEST_DATA), false);
-    }
-    // Pass a TCP/IPv4 session.
-    {
-        SCOPED_TRACE("Passing TCP/IPv4 session");
-        checkPushAndPop(AF_INET, SOCK_STREAM, IPPROTO_TCP, sai_local4,
-                        sai_remote4, TEST_DATA, sizeof(TEST_DATA), false);
-    }
-
-    // Also try large data
-    {
-        SCOPED_TRACE("Passing UDP/IPv6 session with large data");
-        checkPushAndPop(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, sai_local6_alt,
-                        sai_remote6, large_text_.c_str(), large_text_.length(),
-                        false);
-    }
-    {
-        SCOPED_TRACE("Passing TCP/IPv6 session with large data");
-        checkPushAndPop(AF_INET6, SOCK_STREAM, IPPROTO_TCP, sai_local6,
-                        sai_remote6, large_text_.c_str(), large_text_.length(),
-                        false);
-    }
-    {
-        SCOPED_TRACE("Passing UDP/IPv4 session with large data");
-        checkPushAndPop(AF_INET, SOCK_DGRAM, IPPROTO_UDP, sai_local4_alt,
-                        sai_remote4, large_text_.c_str(), large_text_.length(),
-                        false);
-    }
-    {
-        SCOPED_TRACE("Passing TCP/IPv4 session with large data");
-        checkPushAndPop(AF_INET, SOCK_STREAM, IPPROTO_TCP, sai_local4,
-                        sai_remote4, large_text_.c_str(), large_text_.length(),
-                        false);
-    }
-}
-
-TEST_F(ForwardTest, badPush) {
-    // push before connect
-    EXPECT_THROW(forwarder_.push(1, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                                 *getSockAddr("192.0.2.1", "53").first,
-                                 *getSockAddr("192.0.2.2", "53").first,
-                                 TEST_DATA, sizeof(TEST_DATA)),
-                 BadValue);
-
-    // Now connect the forwarder for the rest of tests
-    startListen();
-    forwarder_.connectToReceiver();
-
-    // Invalid address family
-    struct sockaddr sockaddr_unspec;
-    sockaddr_unspec.sa_family = AF_UNSPEC;
-    EXPECT_THROW(forwarder_.push(1, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                                 sockaddr_unspec,
-                                 *getSockAddr("192.0.2.2", "53").first,
-                                 TEST_DATA, sizeof(TEST_DATA)),
-                 BadValue);
-    EXPECT_THROW(forwarder_.push(1, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                                 *getSockAddr("192.0.2.2", "53").first,
-                                 sockaddr_unspec, TEST_DATA,
-                                 sizeof(TEST_DATA)),
-                 BadValue);
-
-    // Inconsistent address family
-    EXPECT_THROW(forwarder_.push(1, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                                 *getSockAddr("2001:db8::1", "53").first,
-                                 *getSockAddr("192.0.2.2", "53").first,
-                                 TEST_DATA, sizeof(TEST_DATA)),
-                 BadValue);
-    EXPECT_THROW(forwarder_.push(1, AF_INET6, SOCK_DGRAM, IPPROTO_UDP,
-                                 *getSockAddr("2001:db8::1", "53").first,
-                                 *getSockAddr("192.0.2.2", "53").first,
-                                 TEST_DATA, sizeof(TEST_DATA)),
-                 BadValue);
-
-    // Empty data: we reject them at least for now
-    EXPECT_THROW(forwarder_.push(1, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                                 *getSockAddr("192.0.2.1", "53").first,
-                                 *getSockAddr("192.0.2.2", "53").first,
-                                 TEST_DATA, 0),
-                 BadValue);
-    EXPECT_THROW(forwarder_.push(1, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                                 *getSockAddr("192.0.2.1", "53").first,
-                                 *getSockAddr("192.0.2.2", "53").first,
-                                 NULL, sizeof(TEST_DATA)),
-                 BadValue);
-
-    // Too big data: we reject them at least for now
-    EXPECT_THROW(forwarder_.push(1, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                                 *getSockAddr("192.0.2.1", "53").first,
-                                 *getSockAddr("192.0.2.2", "53").first,
-                                 string(65536, 'd').c_str(), 65536),
-                 BadValue);
-
-    // Close the receiver before push.  It will result in SIGPIPE (should be
-    // ignored) and EPIPE, which will be converted to SocketSessionError.
-    const int receiver_fd = acceptForwarder();
-    close(receiver_fd);
-    EXPECT_THROW(forwarder_.push(1, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                                 *getSockAddr("192.0.2.1", "53").first,
-                                 *getSockAddr("192.0.2.2", "53").first,
-                                 TEST_DATA, sizeof(TEST_DATA)),
-                 SocketSessionError);
-}
-
-// A subroutine for pushTooFast, continuously pushing socket sessions
-// with full-size DNS messages (65535 bytes) without receiving them.
-// the push attempts will eventually fill the socket send buffer and trigger
-// an exception.  Unfortunately exactly how many we can forward depends on
-// the internal system implementation; it should be close to 3, because
-// in our current implementation it sets the send buffer to a size that
-// is sufficiently large to hold 2 sessions (but not much larger than that),
-// but (for example) Linux internally doubles the specified upper limit.
-// Experimentally we know 10 is enough to produce a reliable result, but
-// if it turns out to be not the case, we should do it a bit harder, e.g.,
-// by probing the actual buffer size by getsockopt(SO_SNDBUF).
-void
-multiPush(SocketSessionForwarder& forwarder, const struct sockaddr& sa,
-          const void* data, size_t data_len)
-{
-    for (int i = 0; i < 10; ++i) {
-        forwarder.push(1, AF_INET, SOCK_DGRAM, IPPROTO_UDP, sa, sa,
-                       data, data_len);
-    }
-}
-
-TEST_F(ForwardTest, pushTooFast) {
-    // Emulate the situation where the forwarder is pushing sessions too fast.
-    // It should eventually fail without blocking.
-    startListen();
-    forwarder_.connectToReceiver();
-    EXPECT_THROW(multiPush(forwarder_, *getSockAddr("192.0.2.1", "53").first,
-                           large_text_.c_str(), large_text_.length()),
-                 SocketSessionError);
-}
-
-TEST_F(ForwardTest, badPop) {
-    startListen();
-
-    // Close the forwarder socket before pop() without sending anything.
-    pushSessionHeader(0, 0, false);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Pretending to be a forwarder but don't actually pass FD.
-    pushSessionHeader(0, 1, false);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Pass a valid FD (stdin), but provide short data for the hdrlen
-    pushSessionHeader(0, 1);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Pass a valid FD, but provides too large hdrlen
-    pushSessionHeader(0xffff);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Don't provide full header
-    pushSessionHeader(sizeof(uint32_t));
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Pushed header is too short
-    const uint8_t dummy_data = 0;
-    pushSessionHeader(1);
-    send(dummy_forwarder_.fd, &dummy_data, 1, 0);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // socket addresses commonly used below (the values don't matter).
-    const SockAddrInfo sai_local(getSockAddr("192.0.2.1", "53535"));
-    const SockAddrInfo sai_remote(getSockAddr("192.0.2.2", "53536"));
-    const SockAddrInfo sai6(getSockAddr("2001:db8::1", "53537"));
-
-    // Pass invalid address family (AF_UNSPEC)
-    pushSession(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, sai_local.second,
-                *sai_local.first, sai_remote.second, *sai_remote.first);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Pass inconsistent address family for local
-    pushSession(AF_INET, SOCK_DGRAM, IPPROTO_UDP, sai6.second,
-                *sai6.first, sai_remote.second, *sai_remote.first);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Same for remote
-    pushSession(AF_INET, SOCK_DGRAM, IPPROTO_UDP, sai_local.second,
-                *sai_local.first, sai6.second, *sai6.first);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Pass too big sa length for local
-    pushSession(AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                sizeof(struct sockaddr_storage) + 1, *sai_local.first,
-                sai_remote.second, *sai_remote.first);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Same for remote
-    pushSession(AF_INET, SOCK_DGRAM, IPPROTO_UDP, sai_local.second,
-                *sai_local.first, sizeof(struct sockaddr_storage) + 1,
-                *sai_remote.first);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Pass too small sa length for local
-    pushSession(AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                sizeof(struct sockaddr_in) - 1, *sai_local.first,
-                sai_remote.second, *sai_remote.first);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Same for remote
-    pushSession(AF_INET6, SOCK_DGRAM, IPPROTO_UDP,
-                sai6.second, *sai6.first, sizeof(struct sockaddr_in6) - 1,
-                *sai6.first);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Data length is too large
-    pushSession(AF_INET, SOCK_DGRAM, IPPROTO_UDP, sai_local.second,
-                *sai_local.first, sai_remote.second,
-                *sai_remote.first, 65536);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Empty data
-    pushSession(AF_INET, SOCK_DGRAM, IPPROTO_UDP, sai_local.second,
-                *sai_local.first, sai_remote.second,
-                *sai_remote.first, 0);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Not full data are passed
-    pushSession(AF_INET, SOCK_DGRAM, IPPROTO_UDP, sai_local.second,
-                *sai_local.first, sai_remote.second,
-                *sai_remote.first, sizeof(TEST_DATA) + 1);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-
-    // Check the forwarded FD is closed on failure
-    ScopedSocket sock(createSocket(AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                                   getSockAddr("127.0.0.1", TEST_PORT),
-                                   false));
-    pushSessionHeader(0, 1, true, sock.fd);
-    dummy_forwarder_.reset(-1);
-    EXPECT_THROW(receiver_->pop(), SocketSessionError);
-    // Close the original socket
-    sock.reset(-1);
-    // The passed one should have been closed, too, so we should be able
-    // to bind a new socket to the same port.
-    sock.reset(createSocket(AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                            getSockAddr("127.0.0.1", TEST_PORT),
-                            false));
-}
-
-TEST(SocketSessionTest, badValue) {
-    // normal cases are confirmed in ForwardTest.  We only check some
-    // abnormal cases here.
-
-    SockAddrCreator addr_creator;
-
-    EXPECT_THROW(SocketSession(42, AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL,
-                               addr_creator.get("192.0.2.1", "53").first,
-                               TEST_DATA, sizeof(TEST_DATA)),
-                 BadValue);
-    EXPECT_THROW(SocketSession(42, AF_INET6, SOCK_STREAM, IPPROTO_TCP,
-                               addr_creator.get("2001:db8::1", "53").first,
-                               NULL, TEST_DATA , sizeof(TEST_DATA)), BadValue);
-    EXPECT_THROW(SocketSession(42, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                               addr_creator.get("192.0.2.1", "53").first,
-                               addr_creator.get("192.0.2.2", "5300").first,
-                               TEST_DATA, 0), BadValue);
-    EXPECT_THROW(SocketSession(42, AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                               addr_creator.get("192.0.2.1", "53").first,
-                               addr_creator.get("192.0.2.2", "5300").first,
-                               NULL, sizeof(TEST_DATA)), BadValue);
-}
-}