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

Side by Side 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: Remove const qualifier on RSAPrivateKey parameter. 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/protocol/jingle_session.h" 5 #include "remoting/protocol/jingle_session.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "crypto/rsa_private_key.h" 8 #include "crypto/rsa_private_key.h"
9 #include "jingle/glue/channel_socket_adapter.h" 9 #include "jingle/glue/channel_socket_adapter.h"
10 #include "jingle/glue/pseudotcp_adapter.h" 10 #include "jingle/glue/pseudotcp_adapter.h"
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 if (ret == net::ERR_IO_PENDING) { 393 if (ret == net::ERR_IO_PENDING) {
394 return true; 394 return true;
395 } else if (ret != net::OK) { 395 } else if (ret != net::OK) {
396 LOG(ERROR) << "Failed to establish SSL connection"; 396 LOG(ERROR) << "Failed to establish SSL connection";
397 cricket_session_->Terminate(); 397 cricket_session_->Terminate();
398 return false; 398 return false;
399 } 399 }
400 } else { 400 } else {
401 // Create server SSL socket. 401 // Create server SSL socket.
402 net::SSLConfig ssl_config; 402 net::SSLConfig ssl_config;
403 net::SSLServerSocket* socket = net::CreateSSLServerSocket( 403 net::StreamSocket* socket = net::CreateSSLServerSocket(
404 pseudotcp, server_cert_, key_.get(), ssl_config); 404 pseudotcp, server_cert_, key_.get(), ssl_config);
405 ssl_socket->reset(new SocketWrapper(socket)); 405 ssl_socket->reset(new SocketWrapper(socket));
406 406
407 int ret = socket->Accept(&ssl_connect_callback_); 407 int ret = socket->Connect(&ssl_connect_callback_);
408 if (ret == net::ERR_IO_PENDING) { 408 if (ret == net::ERR_IO_PENDING) {
409 return true; 409 return true;
410 } else if (ret != net::OK) { 410 } else if (ret != net::OK) {
411 LOG(ERROR) << "Failed to establish SSL connection"; 411 LOG(ERROR) << "Failed to establish SSL connection";
412 cricket_session_->Terminate(); 412 cricket_session_->Terminate();
413 return false; 413 return false;
414 } 414 }
415 } 415 }
416 // Reach here if net::OK is received. 416 // Reach here if net::OK is received.
417 ssl_connect_callback_.Run(net::OK); 417 ssl_connect_callback_.Run(net::OK);
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 544
545 state_ = new_state; 545 state_ = new_state;
546 if (!closed_ && state_change_callback_.get()) 546 if (!closed_ && state_change_callback_.get())
547 state_change_callback_->Run(new_state); 547 state_change_callback_->Run(new_state);
548 } 548 }
549 } 549 }
550 550
551 } // namespace protocol 551 } // namespace protocol
552 552
553 } // namespace remoting 553 } // namespace remoting
OLDNEW
« net/socket/ssl_server_socket_openssl.cc ('K') | « net/socket/ssl_server_socket_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698