remoting/protocol/jingle_session.cc - Issue 7054010: Update SSLServerSocket to provide the net::StreamSocket interface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/protocol/jingle_session.cc

Issue 7054010: Update SSLServerSocket to provide the net::StreamSocket interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix missed Connect call to Handshake in unit test. Created 9 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:

Index: remoting/protocol/jingle_session.cc

diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc

index abffdc95b0ea046538af468a0efe15d1d51d4025..20747a4c50256adb2931188cf6443a3a66fc7e71 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) {

« no previous file with comments | « net/socket/ssl_server_socket_unittest.cc ('k') | no next file » | no next file with comments »