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

Unified Diff: remoting/jingle_glue/ssl_socket_adapter.h

Issue 10543069: Fix SSLSocketAdapter to handle asynchronous writes appropriately. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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
« no previous file with comments | « no previous file | remoting/jingle_glue/ssl_socket_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/jingle_glue/ssl_socket_adapter.h
diff --git a/remoting/jingle_glue/ssl_socket_adapter.h b/remoting/jingle_glue/ssl_socket_adapter.h
index dee1d18d58764a14ce26f9163e4f79ca30120b84..9d32911bba66b9e32dd60a10d9ea277a60203178 100644
--- a/remoting/jingle_glue/ssl_socket_adapter.h
+++ b/remoting/jingle_glue/ssl_socket_adapter.h
@@ -116,17 +116,14 @@ class SSLSocketAdapter : public talk_base::SSLAdapter {
SSLSTATE_NONE,
SSLSTATE_WAIT,
SSLSTATE_CONNECTED,
- };
-
- enum IOState {
- IOSTATE_NONE,
- IOSTATE_PENDING,
- IOSTATE_COMPLETE,
+ SSLSTATE_ERROR,
};
void OnConnected(int result);
void OnRead(int result);
- void OnWrite(int result);
+ void OnWritten(int result);
+
+ void DoWrite();
virtual void OnConnectEvent(talk_base::AsyncSocket* socket) OVERRIDE;
@@ -142,10 +139,12 @@ class SSLSocketAdapter : public talk_base::SSLAdapter {
scoped_ptr<net::SSLClientSocket> ssl_socket_;
SSLState ssl_state_;
- IOState read_state_;
- IOState write_state_;
- scoped_refptr<net::IOBuffer> transport_buf_;
- int data_transferred_;
+
+ bool read_pending_;
+ scoped_refptr<net::GrowableIOBuffer> read_buffer_;
+
+ bool write_pending_;
+ scoped_refptr<net::DrainableIOBuffer> write_buffer_;
DISALLOW_COPY_AND_ASSIGN(SSLSocketAdapter);
};
« no previous file with comments | « no previous file | remoting/jingle_glue/ssl_socket_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698