diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 22:46:00 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 22:46:00 +0000 |
| commit | c3af26f3314bf48f478cec8128b5c15cc3f98940 (patch) | |
| tree | 0d3d0802a3a9b8e05487626f90c7dbf0dcecdea9 /remoting/jingle_glue | |
| parent | 5bcab699da1cedb4fc666c9f5d0099574a27c2fe (diff) | |
| download | chromium_src-c3af26f3314bf48f478cec8128b5c15cc3f98940.zip chromium_src-c3af26f3314bf48f478cec8128b5c15cc3f98940.tar.gz chromium_src-c3af26f3314bf48f478cec8128b5c15cc3f98940.tar.bz2 | |
Use new Chromotocol code in host andclient.
1. ProtocolDecoder renamed to MessagesDecoder and moved to remoting/protocol.
2. base/protocol_util.[h|cc] split into base/util.[h|cc] and protocol/util.[h|cc].
3. Added StreamReader and StreamWriter classes for events and video channels.
4. Client and host changed to use the new protocol code.
BUG=None
TEST=Unittests
Review URL: http://codereview.chromium.org/3595012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/stream_socket_adapter.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/jingle_glue/stream_socket_adapter.cc b/remoting/jingle_glue/stream_socket_adapter.cc index cb84941..3155328 100644 --- a/remoting/jingle_glue/stream_socket_adapter.cc +++ b/remoting/jingle_glue/stream_socket_adapter.cc @@ -65,6 +65,7 @@ int StreamSocketAdapter::Write( if (result == net::ERR_CONNECTION_CLOSED && stream_->GetState() == talk_base::SS_OPENING) result = net::ERR_IO_PENDING; + if (result == net::ERR_IO_PENDING) { write_pending_ = true; write_callback_ = callback; |