Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1273)

Unified Diff: net/socket/tcp_server_socket.cc

Issue 23881002: Windows only: Move client socket functionality from TCPClientSocket into TCPSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/socket/tcp_server_socket.cc
diff --git a/net/socket/tcp_server_socket.cc b/net/socket/tcp_server_socket.cc
index 13e9de1e59638f9efe10f28ef9b127cfa4f1d8b7..45012dbba357cd76b76d398f852310de130f1b14 100644
--- a/net/socket/tcp_server_socket.cc
+++ b/net/socket/tcp_server_socket.cc
@@ -88,17 +88,17 @@ int TCPServerSocket::ConvertAcceptedSocket(
if (result != OK)
return result;
+ // TODO(yzshen): Once we switch TCPClientSocketLibevent to take a connected
+ // TCPSocket object, we don't need to do platform-specific handling.
+#if defined(OS_WIN)
+ scoped_ptr<TCPClientSocket> client_socket(new TCPClientSocket(
+ temp_accepted_socket.Pass(), accepted_address_));
+#elif defined(OS_POSIX)
scoped_ptr<TCPClientSocket> client_socket(new TCPClientSocket(
AddressList(accepted_address_),
temp_accepted_socket->net_log().net_log(),
temp_accepted_socket->net_log().source()));
- // TODO(yzshen): Once we switch TCPClientSocket::AdoptSocket() to take a
- // TCPSocket object, we don't need to do platform-specific handling.
-#if defined(OS_WIN)
- SOCKET raw_socket = temp_accepted_socket->Release();
-#elif defined(OS_POSIX)
int raw_socket = temp_accepted_socket->Release();
-#endif
result = client_socket->AdoptSocket(raw_socket);
if (result != OK) {
// |client_socket| won't take ownership of |raw_socket| on failure.
@@ -106,6 +106,7 @@ int TCPServerSocket::ConvertAcceptedSocket(
temp_accepted_socket->Adopt(raw_socket);
return result;
}
+#endif
*output_accepted_socket = client_socket.Pass();
return OK;

Powered by Google App Engine
This is Rietveld 408576698