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

Unified Diff: net/socket/tcp_server_socket_win.cc

Issue 10907154: Allow server sockets to rebind to same port if there is nothing actively listening on that port. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review changes Created 8 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
« net/socket/tcp_server_socket_win.h ('K') | « net/socket/tcp_server_socket_win.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/tcp_server_socket_win.cc
diff --git a/net/socket/tcp_server_socket_win.cc b/net/socket/tcp_server_socket_win.cc
index eb15ffbdaf9bb691a57642e77e4b9fa46a357f86..4a336c0476d0c20ac2fb11e7c5707ffd268ea272 100644
--- a/net/socket/tcp_server_socket_win.cc
+++ b/net/socket/tcp_server_socket_win.cc
@@ -56,11 +56,16 @@ int TCPServerSocketWin::Listen(const IPEndPoint& address, int backlog) {
return result;
}
+ int result = SetSocketOptions();
+ if (result < 0) {
+ return result;
+ }
+
SockaddrStorage storage;
if (!address.ToSockAddr(storage.addr, &storage.addr_len))
return ERR_INVALID_ARGUMENT;
- int result = bind(socket_, storage.addr, storage.addr_len);
+ result = bind(socket_, storage.addr, storage.addr_len);
if (result < 0) {
PLOG(ERROR) << "bind() returned an error";
result = MapSystemError(WSAGetLastError());
@@ -180,4 +185,23 @@ void TCPServerSocketWin::OnObjectSignaled(HANDLE object) {
}
}
+void TCPServerSocketWin::AllowAddressReuse() {
+ DCHECK(CalledOnValidThread());
+ DCHECK_EQ(socket_, INVALID_SOCKET);
+ DCHECK_EQ(socket_event_, WSA_INVALID_EVENT);
+
+ socket_options_ |= SOCKET_OPTION_REUSE_ADDRESS;
+}
+
+int TCPServerSocketWin::SetSocketOptions() {
+ int true_value = 1;
+ if (socket_options_ & SOCKET_OPTION_REUSE_ADDRESS) {
+ int rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEADDR, &true_value,
+ sizeof(true_value));
+ if (rv < 0)
+ return MapSystemError(errno);
+ }
+ return OK;
+}
+
} // namespace net
« net/socket/tcp_server_socket_win.h ('K') | « net/socket/tcp_server_socket_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698