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

Unified Diff: net/socket/tcp_server_socket_libevent.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: Remove bitmap 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
Index: net/socket/tcp_server_socket_libevent.cc
diff --git a/net/socket/tcp_server_socket_libevent.cc b/net/socket/tcp_server_socket_libevent.cc
index ef8d1b1bcbef21f851decf142c01181d9c5e1c30..1475d7b9dfc6f69e6aae7ebe5854b820d156574a 100644
--- a/net/socket/tcp_server_socket_libevent.cc
+++ b/net/socket/tcp_server_socket_libevent.cc
@@ -35,6 +35,7 @@ TCPServerSocketLibevent::TCPServerSocketLibevent(
const net::NetLog::Source& source)
: socket_(kInvalidSocket),
accept_socket_(NULL),
+ reuse_addr_(false),
net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)) {
net_log_.BeginEvent(NetLog::TYPE_SOCKET_ALIVE,
source.ToEventParametersCallback());
@@ -63,11 +64,16 @@ int TCPServerSocketLibevent::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(errno);
@@ -190,4 +196,22 @@ void TCPServerSocketLibevent::OnFileCanWriteWithoutBlocking(int fd) {
NOTREACHED();
}
+void TCPServerSocketLibevent::AllowAddressReuse() {
Sergey Ulanov 2012/09/12 21:52:35 nit: It's best to put method implementations in th
justinlin 2012/09/13 07:12:56 Done.
+ DCHECK(CalledOnValidThread());
+ DCHECK_EQ(socket_, kInvalidSocket);
+
+ reuse_addr_ = true;
+}
+
+int TCPServerSocketLibevent::SetSocketOptions() {
+ int true_value = 1;
+ if (reuse_addr_) {
+ int rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEADDR, &true_value,
+ sizeof(true_value));
+ if (rv < 0)
+ return MapSystemError(errno);
+ }
+ return OK;
+}
+
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698