Move server socket functionality from TCPServerSocket into TCPSocket.

net/socket/tcp_server_socket_libevent.cc

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
deleted file mode 100644
index 38dda962f46a4f0d4e85fd684a7945e08a80dfcb..0000000000000000000000000000000000000000
--- a/net/socket/tcp_server_socket_libevent.cc
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "net/socket/tcp_server_socket_libevent.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <sys/socket.h>
-
-#include "build/build_config.h"
-
-#if defined(OS_POSIX)
-#include <netinet/in.h>
-#endif
-
-#include "base/posix/eintr_wrapper.h"
-#include "net/base/ip_endpoint.h"
-#include "net/base/net_errors.h"
-#include "net/base/net_util.h"
-#include "net/socket/socket_net_log_params.h"
-#include "net/socket/tcp_client_socket.h"
-
-namespace net {
-
-namespace {
-
-const int kInvalidSocket = -1;
-
-}  // namespace
-
-TCPServerSocketLibevent::TCPServerSocketLibevent(
-    net::NetLog* net_log,
-    const net::NetLog::Source& source)
-    : socket_(kInvalidSocket),
-      accept_socket_(NULL),
-      net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)) {
-  net_log_.BeginEvent(NetLog::TYPE_SOCKET_ALIVE,
-                      source.ToEventParametersCallback());
-}
-
-TCPServerSocketLibevent::~TCPServerSocketLibevent() {
-  if (socket_ != kInvalidSocket)
-    Close();
-  net_log_.EndEvent(NetLog::TYPE_SOCKET_ALIVE);
-}
-
-int TCPServerSocketLibevent::Listen(const IPEndPoint& address, int backlog) {
-  DCHECK(CalledOnValidThread());
-  DCHECK_GT(backlog, 0);
-  DCHECK_EQ(socket_, kInvalidSocket);
-
-  socket_ = socket(address.GetSockAddrFamily(), SOCK_STREAM, IPPROTO_TCP);
-  if (socket_ < 0) {
-    PLOG(ERROR) << "socket() returned an error";
-    return MapSystemError(errno);
-  }
-
-  if (SetNonBlocking(socket_)) {
-    int result = MapSystemError(errno);
-    Close();
-    return result;
-  }
-
-  int result = SetSocketOptions();
-  if (result != OK) {
-    Close();
-    return result;
-  }
-
-  SockaddrStorage storage;
-  if (!address.ToSockAddr(storage.addr, &storage.addr_len)) {
-    Close();
-    return ERR_ADDRESS_INVALID;
-  }
-
-  result = bind(socket_, storage.addr, storage.addr_len);
-  if (result < 0) {
-    PLOG(ERROR) << "bind() returned an error";
-    result = MapSystemError(errno);
-    Close();
-    return result;
-  }
-
-  result = listen(socket_, backlog);
-  if (result < 0) {
-    PLOG(ERROR) << "listen() returned an error";
-    result = MapSystemError(errno);
-    Close();
-    return result;
-  }
-
-  return OK;
-}
-
-int TCPServerSocketLibevent::GetLocalAddress(IPEndPoint* address) const {
-  DCHECK(CalledOnValidThread());
-  DCHECK(address);
-
-  SockaddrStorage storage;
-  if (getsockname(socket_, storage.addr, &storage.addr_len) < 0)
-    return MapSystemError(errno);
-  if (!address->FromSockAddr(storage.addr, storage.addr_len))
-    return ERR_FAILED;
-
-  return OK;
-}
-
-int TCPServerSocketLibevent::Accept(
-    scoped_ptr<StreamSocket>* socket, const CompletionCallback& callback) {
-  DCHECK(CalledOnValidThread());
-  DCHECK(socket);
-  DCHECK(!callback.is_null());
-  DCHECK(accept_callback_.is_null());
-
-  net_log_.BeginEvent(NetLog::TYPE_TCP_ACCEPT);
-
-  int result = AcceptInternal(socket);
-
-  if (result == ERR_IO_PENDING) {
-    if (!base::MessageLoopForIO::current()->WatchFileDescriptor(
-            socket_, true, base::MessageLoopForIO::WATCH_READ,
-            &accept_socket_watcher_, this)) {
-      PLOG(ERROR) << "WatchFileDescriptor failed on read";
-      return MapSystemError(errno);
-    }
-
-    accept_socket_ = socket;
-    accept_callback_ = callback;
-  }
-
-  return result;
-}
-
-int TCPServerSocketLibevent::SetSocketOptions() {
-  // SO_REUSEADDR is useful for server sockets to bind to a recently unbound
-  // port. When a socket is closed, the end point changes its state to TIME_WAIT
-  // and wait for 2 MSL (maximum segment lifetime) to ensure the remote peer
-  // acknowledges its closure. For server sockets, it is usually safe to
-  // bind to a TIME_WAIT end point immediately, which is a widely adopted
-  // behavior.
-  //
-  // Note that on *nix, SO_REUSEADDR does not enable the TCP socket to bind to
-  // an end point that is already bound by another socket. To do that one must
-  // set SO_REUSEPORT instead. This option is not provided on Linux prior
-  // to 3.9.
-  //
-  // SO_REUSEPORT is provided in MacOS X and iOS.
-  int true_value = 1;
-  int rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEADDR, &true_value,
-                      sizeof(true_value));
-  if (rv < 0)
-    return MapSystemError(errno);
-  return OK;
-}
-
-int TCPServerSocketLibevent::AcceptInternal(
-    scoped_ptr<StreamSocket>* socket) {
-  SockaddrStorage storage;
-  int new_socket = HANDLE_EINTR(accept(socket_,
-                                       storage.addr,
-                                       &storage.addr_len));
-  if (new_socket < 0) {
-    int net_error = MapSystemError(errno);
-    if (net_error != ERR_IO_PENDING)
-      net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, net_error);
-    return net_error;
-  }
-
-  IPEndPoint address;
-  if (!address.FromSockAddr(storage.addr, storage.addr_len)) {
-    NOTREACHED();
-    if (HANDLE_EINTR(close(new_socket)) < 0)
-      PLOG(ERROR) << "close";
-    net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, ERR_FAILED);
-    return ERR_FAILED;
-  }
-  scoped_ptr<TCPClientSocket> tcp_socket(new TCPClientSocket(
-      AddressList(address),
-      net_log_.net_log(), net_log_.source()));
-  int adopt_result = tcp_socket->AdoptSocket(new_socket);
-  if (adopt_result != OK) {
-    if (HANDLE_EINTR(close(new_socket)) < 0)
-      PLOG(ERROR) << "close";
-    net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, adopt_result);
-    return adopt_result;
-  }
-  socket->reset(tcp_socket.release());
-  net_log_.EndEvent(NetLog::TYPE_TCP_ACCEPT,
-                    CreateNetLogIPEndPointCallback(&address));
-  return OK;
-}
-
-void TCPServerSocketLibevent::Close() {
-  if (socket_ != kInvalidSocket) {
-    bool ok = accept_socket_watcher_.StopWatchingFileDescriptor();
-    DCHECK(ok);
-    if (HANDLE_EINTR(close(socket_)) < 0)
-      PLOG(ERROR) << "close";
-    socket_ = kInvalidSocket;
-  }
-}
-
-void TCPServerSocketLibevent::OnFileCanReadWithoutBlocking(int fd) {
-  DCHECK(CalledOnValidThread());
-
-  int result = AcceptInternal(accept_socket_);
-  if (result != ERR_IO_PENDING) {
-    accept_socket_ = NULL;
-    bool ok = accept_socket_watcher_.StopWatchingFileDescriptor();
-    DCHECK(ok);
-    CompletionCallback callback = accept_callback_;
-    accept_callback_.Reset();
-    callback.Run(result);
-  }
-}
-
-void TCPServerSocketLibevent::OnFileCanWriteWithoutBlocking(int fd) {
-  NOTREACHED();
-}
-
-}  // namespace net