Commit cb45060b authored by Andrii Grynenko's avatar Andrii Grynenko Committed by Facebook GitHub Bot

Update AsyncSSLSocket factory functions to return unique_ptr

Reviewed By: yfeldblum

Differential Revision: D27695785

fbshipit-source-id: da8666781e03667a0060e8a7daab4206f60fc71d
parent 656319d7
......@@ -283,25 +283,25 @@ class AsyncSSLSocket : public AsyncSocket {
/**
* Helper function to create a server/client shared_ptr<AsyncSSLSocket>.
*/
static std::shared_ptr<AsyncSSLSocket> newSocket(
static UniquePtr newSocket(
const std::shared_ptr<folly::SSLContext>& ctx,
EventBase* evb,
NetworkSocket fd,
bool server = true,
bool deferSecurityNegotiation = false) {
return std::shared_ptr<AsyncSSLSocket>(AsyncSSLSocket::UniquePtr(
new AsyncSSLSocket(ctx, evb, fd, server, deferSecurityNegotiation)));
return AsyncSSLSocket::UniquePtr(
new AsyncSSLSocket(ctx, evb, fd, server, deferSecurityNegotiation));
}
/**
* Helper function to create a client shared_ptr<AsyncSSLSocket>.
*/
static std::shared_ptr<AsyncSSLSocket> newSocket(
static UniquePtr newSocket(
const std::shared_ptr<folly::SSLContext>& ctx,
EventBase* evb,
bool deferSecurityNegotiation = false) {
return std::shared_ptr<AsyncSSLSocket>(AsyncSSLSocket::UniquePtr(
new AsyncSSLSocket(ctx, evb, deferSecurityNegotiation)));
return AsyncSSLSocket::UniquePtr(
new AsyncSSLSocket(ctx, evb, deferSecurityNegotiation));
}
#if FOLLY_OPENSSL_HAS_SNI
......@@ -337,13 +337,13 @@ class AsyncSSLSocket : public AsyncSocket {
const std::string& serverName,
bool deferSecurityNegotiation = false);
static std::shared_ptr<AsyncSSLSocket> newSocket(
static UniquePtr newSocket(
const std::shared_ptr<folly::SSLContext>& ctx,
EventBase* evb,
const std::string& serverName,
bool deferSecurityNegotiation = false) {
return std::shared_ptr<AsyncSSLSocket>(AsyncSSLSocket::UniquePtr(
new AsyncSSLSocket(ctx, evb, serverName, deferSecurityNegotiation)));
return AsyncSSLSocket::UniquePtr(
new AsyncSSLSocket(ctx, evb, serverName, deferSecurityNegotiation));
}
#endif // FOLLY_OPENSSL_HAS_SNI
......
......@@ -2180,7 +2180,8 @@ TEST(AsyncSSLSocketTest, UnencryptedTest) {
getctx(clientCtx, serverCtx);
auto client =
AsyncSSLSocket::newSocket(clientCtx, &base, fds[0], false, true);
auto server = AsyncSSLSocket::newSocket(serverCtx, &base, fds[1], true, true);
std::shared_ptr<AsyncSSLSocket> server =
AsyncSSLSocket::newSocket(serverCtx, &base, fds[1], true, true);
ReadCallbackTerminator readCallback(&base, nullptr);
server->setReadCB(&readCallback);
......
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