Commit 6551536f authored by Orvid King's avatar Orvid King Committed by Facebook Github Bot

Shift SocketAddressTest to use NetworkSocket

Summary: Port it away from raw file descriptors.

Reviewed By: yfeldblum

Differential Revision: D12908626

fbshipit-source-id: 2448c2bfb226dba9de4baa77439c6644b09284a4
parent f327ff50
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <folly/portability/Sockets.h> #include <folly/portability/Sockets.h>
#include <folly/test/SocketAddressTestHelper.h> #include <folly/test/SocketAddressTestHelper.h>
using folly::NetworkSocket;
using folly::SocketAddress; using folly::SocketAddress;
using folly::SocketAddressTestHelper; using folly::SocketAddressTestHelper;
using folly::test::TemporaryDirectory; using folly::test::TemporaryDirectory;
...@@ -34,7 +35,7 @@ using std::cerr; ...@@ -34,7 +35,7 @@ using std::cerr;
using std::endl; using std::endl;
using std::string; using std::string;
namespace fsp = folly::portability::sockets; namespace netops = folly::netops;
TEST(SocketAddress, Size) { TEST(SocketAddress, Size) {
SocketAddress addr; SocketAddress addr;
...@@ -684,14 +685,16 @@ void testSetFromSocket( ...@@ -684,14 +685,16 @@ void testSetFromSocket(
SocketAddress* serverPeerAddrRet, SocketAddress* serverPeerAddrRet,
SocketAddress* clientAddrRet, SocketAddress* clientAddrRet,
SocketAddress* clientPeerAddrRet) { SocketAddress* clientPeerAddrRet) {
int listenSock = fsp::socket(serverBindAddr->getFamily(), SOCK_STREAM, 0); auto listenSock = netops::socket(serverBindAddr->getFamily(), SOCK_STREAM, 0);
REQUIRE_ERRNO(listenSock > 0, "failed to create listen socket"); REQUIRE_ERRNO(
listenSock != NetworkSocket(), "failed to create listen socket");
sockaddr_storage laddr; sockaddr_storage laddr;
serverBindAddr->getAddress(&laddr); serverBindAddr->getAddress(&laddr);
socklen_t laddrLen = serverBindAddr->getActualSize(); socklen_t laddrLen = serverBindAddr->getActualSize();
int rc = bind(listenSock, reinterpret_cast<sockaddr*>(&laddr), laddrLen); int rc =
netops::bind(listenSock, reinterpret_cast<sockaddr*>(&laddr), laddrLen);
REQUIRE_ERRNO(rc == 0, "failed to bind to server socket"); REQUIRE_ERRNO(rc == 0, "failed to bind to server socket");
rc = listen(listenSock, 10); rc = netops::listen(listenSock, 10);
REQUIRE_ERRNO(rc == 0, "failed to listen"); REQUIRE_ERRNO(rc == 0, "failed to listen");
listenAddrRet->setFromLocalAddress(listenSock); listenAddrRet->setFromLocalAddress(listenSock);
...@@ -702,13 +705,14 @@ void testSetFromSocket( ...@@ -702,13 +705,14 @@ void testSetFromSocket(
// Note that we use the family from serverBindAddr here, since we allow // Note that we use the family from serverBindAddr here, since we allow
// clientBindAddr to be nullptr. // clientBindAddr to be nullptr.
int clientSock = fsp::socket(serverBindAddr->getFamily(), SOCK_STREAM, 0); auto clientSock = netops::socket(serverBindAddr->getFamily(), SOCK_STREAM, 0);
REQUIRE_ERRNO(clientSock > 0, "failed to create client socket"); REQUIRE_ERRNO(
clientSock != NetworkSocket(), "failed to create client socket");
if (clientBindAddr != nullptr) { if (clientBindAddr != nullptr) {
sockaddr_storage clientAddr; sockaddr_storage clientAddr;
clientBindAddr->getAddress(&clientAddr); clientBindAddr->getAddress(&clientAddr);
rc = bind( rc = netops::bind(
clientSock, clientSock,
reinterpret_cast<sockaddr*>(&clientAddr), reinterpret_cast<sockaddr*>(&clientAddr),
clientBindAddr->getActualSize()); clientBindAddr->getActualSize());
...@@ -717,7 +721,7 @@ void testSetFromSocket( ...@@ -717,7 +721,7 @@ void testSetFromSocket(
sockaddr_storage listenAddr; sockaddr_storage listenAddr;
listenAddrRet->getAddress(&listenAddr); listenAddrRet->getAddress(&listenAddr);
rc = connect( rc = netops::connect(
clientSock, clientSock,
reinterpret_cast<sockaddr*>(&listenAddr), reinterpret_cast<sockaddr*>(&listenAddr),
listenAddrRet->getActualSize()); listenAddrRet->getActualSize());
...@@ -725,9 +729,9 @@ void testSetFromSocket( ...@@ -725,9 +729,9 @@ void testSetFromSocket(
sockaddr_storage acceptAddr; sockaddr_storage acceptAddr;
socklen_t acceptAddrLen = sizeof(acceptAddr); socklen_t acceptAddrLen = sizeof(acceptAddr);
int serverSock = accept( auto serverSock = netops::accept(
listenSock, reinterpret_cast<sockaddr*>(&acceptAddr), &acceptAddrLen); listenSock, reinterpret_cast<sockaddr*>(&acceptAddr), &acceptAddrLen);
REQUIRE_ERRNO(serverSock > 0, "failed to accept"); REQUIRE_ERRNO(serverSock != NetworkSocket(), "failed to accept");
acceptAddrRet->setFromSockaddr( acceptAddrRet->setFromSockaddr(
reinterpret_cast<sockaddr*>(&acceptAddr), acceptAddrLen); reinterpret_cast<sockaddr*>(&acceptAddr), acceptAddrLen);
...@@ -736,9 +740,9 @@ void testSetFromSocket( ...@@ -736,9 +740,9 @@ void testSetFromSocket(
clientAddrRet->setFromLocalAddress(clientSock); clientAddrRet->setFromLocalAddress(clientSock);
clientPeerAddrRet->setFromPeerAddress(clientSock); clientPeerAddrRet->setFromPeerAddress(clientSock);
close(clientSock); netops::close(clientSock);
close(serverSock); netops::close(serverSock);
close(listenSock); netops::close(listenSock);
} }
TEST(SocketAddress, SetFromSocketIPv4) { TEST(SocketAddress, SetFromSocketIPv4) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment