base::Bind: Convert StreamSocket::Connect.

jingle/glue/pseudotcp_adapter.cc

 // Copyright (c) 2011 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 "jingle/glue/pseudotcp_adapter.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "net/base/address_list.h"
@@ skipping 16 matching lines @@
  public:
   Core(net::Socket* socket);
   virtual ~Core();
 
   // Functions used to implement net::StreamSocket.
   int Read(net::IOBuffer* buffer, int buffer_size,
            net::OldCompletionCallback* callback);
   int Write(net::IOBuffer* buffer, int buffer_size,
             net::OldCompletionCallback* callback);
   int Connect(net::OldCompletionCallback* callback);
+  int Connect(const net::CompletionCallback& callback);
   void Disconnect();
   bool IsConnected() const;
 
   // cricket::IPseudoTcpNotify interface.
   // These notifications are triggered from NotifyPacket.
   virtual void OnTcpOpen(cricket::PseudoTcp* tcp) OVERRIDE;
   virtual void OnTcpReadable(cricket::PseudoTcp* tcp) OVERRIDE;
   virtual void OnTcpWriteable(cricket::PseudoTcp* tcp) OVERRIDE;
   // This is triggered by NotifyClock or NotifyPacket.
   virtual void OnTcpClosed(cricket::PseudoTcp* tcp, uint32 error) OVERRIDE;
@@ skipping 14 matching lines @@
 
   // These may trigger callbacks, so the holder must hold a reference on
   // the stack while calling them.
   void DoReadFromSocket();
   void HandleReadResults(int result);
   void HandleTcpClock();
 
   // This re-sets |timer| without triggering callbacks.
   void AdjustClock();
 
-  net::OldCompletionCallback* connect_callback_;
+  net::OldCompletionCallback* old_connect_callback_;
+  net::CompletionCallback connect_callback_;
   net::OldCompletionCallback* read_callback_;
   net::OldCompletionCallback* write_callback_;
 
   cricket::PseudoTcp pseudo_tcp_;
   scoped_ptr<net::Socket> socket_;
 
   scoped_refptr<net::IOBuffer> read_buffer_;
   int read_buffer_size_;
   scoped_refptr<net::IOBuffer> write_buffer_;
   int write_buffer_size_;
 
   bool socket_write_pending_;
   scoped_refptr<net::IOBuffer> socket_read_buffer_;
 
   net::OldCompletionCallbackImpl<Core> socket_read_callback_;
   net::OldCompletionCallbackImpl<Core> socket_write_callback_;
 
   base::OneShotTimer<Core> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
 
 PseudoTcpAdapter::Core::Core(net::Socket* socket)
-    : connect_callback_(NULL),
+    : old_connect_callback_(NULL),
       read_callback_(NULL),
       write_callback_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(pseudo_tcp_(this, 0)),
       socket_(socket),
       socket_write_pending_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           socket_read_callback_(this, &PseudoTcpAdapter::Core::OnRead)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           socket_write_callback_(this, &PseudoTcpAdapter::Core::OnWritten)) {
   // Doesn't trigger callbacks.
@@ skipping 57 matching lines @@
   // Reference the Core in case a callback deletes the adapter.
   scoped_refptr<Core> core(this);
 
   // Start the connection attempt.
   int result = pseudo_tcp_.Connect();
   if (result < 0)
     return net::ERR_FAILED;
 
   AdjustClock();
 
+  old_connect_callback_ = callback;
+  connect_callback_.Reset();
+  DoReadFromSocket();
+
+  return net::ERR_IO_PENDING;
+}
+
+int PseudoTcpAdapter::Core::Connect(const net::CompletionCallback& callback) {
+  DCHECK_EQ(pseudo_tcp_.State(), cricket::PseudoTcp::TCP_LISTEN);
+
+  // Reference the Core in case a callback deletes the adapter.
+  scoped_refptr<Core> core(this);
+
+  // Start the connection attempt.
+  int result = pseudo_tcp_.Connect();
+  if (result < 0)
+    return net::ERR_FAILED;
+
+  AdjustClock();
+
+  old_connect_callback_ = NULL;
   connect_callback_ = callback;
   DoReadFromSocket();
 
   return net::ERR_IO_PENDING;
 }
 
 void PseudoTcpAdapter::Core::Disconnect() {
   // Don't dispatch outstanding callbacks, as mandated by net::StreamSocket.
   read_callback_ = NULL;
   read_buffer_ = NULL;
   write_callback_ = NULL;
   write_buffer_ = NULL;
-  connect_callback_ = NULL;
+  old_connect_callback_ = NULL;
+  connect_callback_.Reset();
 
   // TODO(wez): Connect should succeed if called after Disconnect, which
   // PseudoTcp doesn't support, so we need to teardown the internal PseudoTcp
   // and create a new one in Connect.
   // TODO(wez): Close sets a shutdown flag inside PseudoTcp but has no other
   // effect.  This should be addressed in PseudoTcp, really.
   // In the meantime we can fake OnTcpClosed notification and tear down the
   // PseudoTcp.
   pseudo_tcp_.Close(true);
 }
 
 bool PseudoTcpAdapter::Core::IsConnected() const {
   return pseudo_tcp_.State() == PseudoTcp::TCP_ESTABLISHED;
 }
 
 void PseudoTcpAdapter::Core::OnTcpOpen(PseudoTcp* tcp) {
   DCHECK(tcp == &pseudo_tcp_);
 
-  if (connect_callback_) {
-    net::OldCompletionCallback* callback = connect_callback_;
-    connect_callback_ = NULL;
+  if (old_connect_callback_) {
+    net::OldCompletionCallback* callback = old_connect_callback_;
+    old_connect_callback_ = NULL;
     callback->Run(net::OK);
+  } else if (!connect_callback_.is_null()) {
+    net::CompletionCallback callback = connect_callback_;
+    connect_callback_.Reset();
+    callback.Run(net::OK);
   }
 
   OnTcpReadable(tcp);
   OnTcpWriteable(tcp);
 }
 
 void PseudoTcpAdapter::Core::OnTcpReadable(PseudoTcp* tcp) {
   DCHECK_EQ(tcp, &pseudo_tcp_);
   if (!read_callback_)
     return;
@@ skipping 31 matching lines @@
 
   net::OldCompletionCallback* callback = write_callback_;
   write_callback_ = NULL;
   write_buffer_ = NULL;
   callback->Run(result);
 }
 
 void PseudoTcpAdapter::Core::OnTcpClosed(PseudoTcp* tcp, uint32 error) {
   DCHECK_EQ(tcp, &pseudo_tcp_);
 
-  if (connect_callback_) {
-    net::OldCompletionCallback* callback = connect_callback_;
-    connect_callback_ = NULL;
+  if (old_connect_callback_) {
+    net::OldCompletionCallback* callback = old_connect_callback_;
+    old_connect_callback_ = NULL;
     callback->Run(net::MapSystemError(error));
+  } else if (!connect_callback_.is_null()) {
+    net::CompletionCallback callback = connect_callback_;
+    connect_callback_.Reset();
+    callback.Run(net::MapSystemError(error));
   }
 
   if (read_callback_) {
     net::OldCompletionCallback* callback = read_callback_;
     read_callback_ = NULL;
     callback->Run(net::MapSystemError(error));
   }
 
   if (write_callback_) {
     net::OldCompletionCallback* callback = write_callback_;
@@ skipping 149 matching lines @@
 int PseudoTcpAdapter::Connect(net::OldCompletionCallback* callback) {
   DCHECK(CalledOnValidThread());
 
   // net::StreamSocket requires that Connect return OK if already connected.
   if (IsConnected())
     return net::OK;
 
   return core_->Connect(callback);
 }
 
+int PseudoTcpAdapter::Connect(const net::CompletionCallback& callback) {
+  DCHECK(CalledOnValidThread());
+
+  // net::StreamSocket requires that Connect return OK if already connected.
+  if (IsConnected())
+    return net::OK;
+
+  return core_->Connect(callback);
+}
+
 void PseudoTcpAdapter::Disconnect() {
   DCHECK(CalledOnValidThread());
   core_->Disconnect();
 }
 
 bool PseudoTcpAdapter::IsConnected() const {
   return core_->IsConnected();
 }
 
 bool PseudoTcpAdapter::IsConnectedAndIdle() const {
@@ skipping 58 matching lines @@
   DCHECK(CalledOnValidThread());
   core_->SetAckDelay(delay_ms);
 }
 
 void PseudoTcpAdapter::SetNoDelay(bool no_delay) {
   DCHECK(CalledOnValidThread());
   core_->SetNoDelay(no_delay);
 }
 
 }  // namespace jingle_glue