diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 19:10:15 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 19:10:15 +0000 |
| commit | a7ac3c36d59bdc812ceccf627d82357fcb1457d1 (patch) | |
| tree | 435b202efb92a28d783faa04bf54f48ed1acf11a /remoting | |
| parent | 38846729c719211e1d0a51f3dfb565be650545ca (diff) | |
| download | chromium_src-a7ac3c36d59bdc812ceccf627d82357fcb1457d1.zip chromium_src-a7ac3c36d59bdc812ceccf627d82357fcb1457d1.tar.gz chromium_src-a7ac3c36d59bdc812ceccf627d82357fcb1457d1.tar.bz2 | |
This change is part of a cleanup of the remoting component's session initialisation.
Have SSLServerSocket implement the StreamSocket interface, since SSL is stream-oriented. Calling code can then make use of methods not available on the more general Socket interface, such as IsConnected and Disconnect.
BUG=
TEST=Unit tests.
Review URL: http://codereview.chromium.org/7054010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/protocol/jingle_session.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc index abffdc9..20747a4 100644 --- a/remoting/protocol/jingle_session.cc +++ b/remoting/protocol/jingle_session.cc @@ -471,7 +471,7 @@ bool JingleSession::EstablishSSLConnection( pseudotcp, local_cert_, local_private_key_.get(), ssl_config); ssl_socket->reset(new SocketWrapper(socket)); - int ret = socket->Accept(&ssl_connect_callback_); + int ret = socket->Handshake(&ssl_connect_callback_); if (ret == net::ERR_IO_PENDING) { return true; } else if (ret != net::OK) { |