| Index: net/socket/tcp_socket_nacl.h
|
| diff --git a/net/socket/tcp_socket_win.h b/net/socket/tcp_socket_nacl.h
|
| similarity index 52%
|
| copy from net/socket/tcp_socket_win.h
|
| copy to net/socket/tcp_socket_nacl.h
|
| index df5fbf09aecc9bd29ca802be3797fd2650a26f80..d23a0ffd923b3b34cbc89c169e21f7513df7189d 100644
|
| --- a/net/socket/tcp_socket_win.h
|
| +++ b/net/socket/tcp_socket_nacl.h
|
| @@ -1,22 +1,21 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 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.
|
|
|
| -#ifndef NET_SOCKET_TCP_SOCKET_WIN_H_
|
| -#define NET_SOCKET_TCP_SOCKET_WIN_H_
|
| -
|
| -#include <winsock2.h>
|
| +#ifndef NET_SOCKET_TCP_SOCKET_NACL_H_
|
| +#define NET_SOCKET_TCP_SOCKET_NACL_H_
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/threading/non_thread_safe.h"
|
| -#include "base/win/object_watcher.h"
|
| #include "net/base/address_family.h"
|
| #include "net/base/completion_callback.h"
|
| #include "net/base/net_export.h"
|
| #include "net/base/net_log.h"
|
| +#include "net/socket/socket_descriptor.h"
|
|
|
| namespace net {
|
|
|
| @@ -24,20 +23,19 @@ class AddressList;
|
| class IOBuffer;
|
| class IPEndPoint;
|
|
|
| -class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| - public base::win::ObjectWatcher::Delegate {
|
| +class NET_EXPORT TCPSocketNacl : public base::NonThreadSafe {
|
| public:
|
| - TCPSocketWin(NetLog* net_log, const NetLog::Source& source);
|
| - virtual ~TCPSocketWin();
|
| + TCPSocketNacl(NetLog* net_log, const NetLog::Source& source);
|
| + virtual ~TCPSocketNacl();
|
|
|
| int Open(AddressFamily family);
|
| // Takes ownership of |socket|.
|
| - int AdoptConnectedSocket(SOCKET socket, const IPEndPoint& peer_address);
|
| + int AdoptConnectedSocket(int socket, const IPEndPoint& peer_address);
|
|
|
| int Bind(const IPEndPoint& address);
|
|
|
| int Listen(int backlog);
|
| - int Accept(scoped_ptr<TCPSocketWin>* socket,
|
| + int Accept(scoped_ptr<TCPSocketNacl>* socket,
|
| IPEndPoint* address,
|
| const CompletionCallback& callback);
|
|
|
| @@ -55,14 +53,13 @@ class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
|
|
| // Sets various socket options.
|
| // The commonly used options for server listening sockets:
|
| - // - SetExclusiveAddrUse().
|
| + // - SetAddressReuse(true).
|
| int SetDefaultOptionsForServer();
|
| // The commonly used options for client sockets and accepted sockets:
|
| - // - Increase the socket buffer sizes for WinXP;
|
| // - SetNoDelay(true);
|
| // - SetKeepAlive(true, 45).
|
| void SetDefaultOptionsForClient();
|
| - int SetExclusiveAddrUse();
|
| + int SetAddressReuse(bool allow);
|
| bool SetReceiveBufferSize(int32 size);
|
| bool SetSendBufferSize(int32 size);
|
| bool SetKeepAlive(bool enable, int delay);
|
| @@ -71,7 +68,7 @@ class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| void Close();
|
|
|
| bool UsingTCPFastOpen() const;
|
| - bool IsValid() const { return socket_ != INVALID_SOCKET; }
|
| + bool IsValid() const { return false; }
|
|
|
| // Marks the start/end of a series of connect attempts for logging purpose.
|
| //
|
| @@ -89,62 +86,11 @@ class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| const BoundNetLog& net_log() const { return net_log_; }
|
|
|
| private:
|
| - class Core;
|
| -
|
| - // base::ObjectWatcher::Delegate implementation.
|
| - virtual void OnObjectSignaled(HANDLE object) OVERRIDE;
|
| -
|
| - int AcceptInternal(scoped_ptr<TCPSocketWin>* socket,
|
| - IPEndPoint* address);
|
| -
|
| - int DoConnect();
|
| - void DoConnectComplete(int result);
|
| -
|
| - void LogConnectBegin(const AddressList& addresses);
|
| - void LogConnectEnd(int net_error);
|
| -
|
| - int DoRead(IOBuffer* buf, int buf_len, const CompletionCallback& callback);
|
| - void DidCompleteConnect();
|
| - void DidCompleteWrite();
|
| - void DidSignalRead();
|
| -
|
| - SOCKET socket_;
|
| -
|
| - HANDLE accept_event_;
|
| - base::win::ObjectWatcher accept_watcher_;
|
| -
|
| - scoped_ptr<TCPSocketWin>* accept_socket_;
|
| - IPEndPoint* accept_address_;
|
| - CompletionCallback accept_callback_;
|
| -
|
| - // The various states that the socket could be in.
|
| - bool waiting_connect_;
|
| - bool waiting_read_;
|
| - bool waiting_write_;
|
| -
|
| - // The core of the socket that can live longer than the socket itself. We pass
|
| - // resources to the Windows async IO functions and we have to make sure that
|
| - // they are not destroyed while the OS still references them.
|
| - scoped_refptr<Core> core_;
|
| -
|
| - // External callback; called when connect or read is complete.
|
| - CompletionCallback read_callback_;
|
| -
|
| - // External callback; called when write is complete.
|
| - CompletionCallback write_callback_;
|
| -
|
| - scoped_ptr<IPEndPoint> peer_address_;
|
| - // The OS error that a connect attempt last completed with.
|
| - int connect_os_error_;
|
| -
|
| - bool logging_multiple_connect_attempts_;
|
| -
|
| BoundNetLog net_log_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(TCPSocketWin);
|
| + DISALLOW_COPY_AND_ASSIGN(TCPSocketNacl);
|
| };
|
|
|
| } // namespace net
|
|
|
| -#endif // NET_SOCKET_TCP_SOCKET_WIN_H_
|
| -
|
| +#endif // NET_SOCKET_TCP_SOCKET_NACL_H_
|
|
|