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

Unified Diff: net/socket/tcp_socket_posix.cc

Issue 2815993002: Adds a method to TCPServerSocket to adopt a socket. (Closed)
Patch Set: Refined GetSocketDescriptor per review. Created 3 years, 8 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
« no previous file with comments | « net/socket/tcp_socket_posix.h ('k') | net/socket/tcp_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/tcp_socket_posix.cc
diff --git a/net/socket/tcp_socket_posix.cc b/net/socket/tcp_socket_posix.cc
index 82f42a72c0803f095e32bb08f60ca55601c3a73e..51e8b9c3dd24ab5cf9d212215e66ce310644a6b0 100644
--- a/net/socket/tcp_socket_posix.cc
+++ b/net/socket/tcp_socket_posix.cc
@@ -175,7 +175,7 @@ int TCPSocketPosix::Open(AddressFamily family) {
return rv;
}
-int TCPSocketPosix::AdoptConnectedSocket(int socket_fd,
+int TCPSocketPosix::AdoptConnectedSocket(SocketDescriptor socket,
const IPEndPoint& peer_address) {
DCHECK(!socket_);
@@ -187,7 +187,17 @@ int TCPSocketPosix::AdoptConnectedSocket(int socket_fd,
}
socket_.reset(new SocketPosix);
- int rv = socket_->AdoptConnectedSocket(socket_fd, storage);
+ int rv = socket_->AdoptConnectedSocket(socket, storage);
+ if (rv != OK)
+ socket_.reset();
+ return rv;
+}
+
+int TCPSocketPosix::AdoptUnconnectedSocket(SocketDescriptor socket) {
+ DCHECK(!socket_);
+
+ socket_.reset(new SocketPosix);
+ int rv = socket_->AdoptUnconnectedSocket(socket);
if (rv != OK)
socket_.reset();
return rv;
@@ -485,6 +495,12 @@ void TCPSocketPosix::EndLoggingMultipleConnectAttempts(int net_error) {
}
}
+SocketDescriptor TCPSocketPosix::ReleaseSocketDescriptorForTesting() {
+ SocketDescriptor socket_descriptor = socket_->ReleaseConnectedSocket();
+ socket_.reset();
+ return socket_descriptor;
+}
+
void TCPSocketPosix::AcceptCompleted(
std::unique_ptr<TCPSocketPosix>* tcp_socket,
IPEndPoint* address,
« no previous file with comments | « net/socket/tcp_socket_posix.h ('k') | net/socket/tcp_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698