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

Side by Side Diff: remoting/protocol/jingle_session.cc

Issue 6930014: Rename ClientSocket to StreamSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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
« no previous file with comments | « remoting/protocol/jingle_session.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 23 matching lines...) Expand all
34 34
35 namespace { 35 namespace {
36 const char kControlChannelName[] = "control"; 36 const char kControlChannelName[] = "control";
37 const char kEventChannelName[] = "event"; 37 const char kEventChannelName[] = "event";
38 const char kVideoChannelName[] = "video"; 38 const char kVideoChannelName[] = "video";
39 const char kVideoRtpChannelName[] = "videortp"; 39 const char kVideoRtpChannelName[] = "videortp";
40 const char kVideoRtcpChannelName[] = "videortcp"; 40 const char kVideoRtcpChannelName[] = "videortcp";
41 41
42 // Helper method to create a SSL client socket. 42 // Helper method to create a SSL client socket.
43 net::SSLClientSocket* CreateSSLClientSocket( 43 net::SSLClientSocket* CreateSSLClientSocket(
44 net::ClientSocket* socket, scoped_refptr<net::X509Certificate> cert, 44 net::StreamSocket* socket, scoped_refptr<net::X509Certificate> cert,
45 net::CertVerifier* cert_verifier) { 45 net::CertVerifier* cert_verifier) {
46 net::SSLConfig ssl_config; 46 net::SSLConfig ssl_config;
47 ssl_config.false_start_enabled = false; 47 ssl_config.false_start_enabled = false;
48 ssl_config.ssl3_enabled = true; 48 ssl_config.ssl3_enabled = true;
49 ssl_config.tls1_enabled = true; 49 ssl_config.tls1_enabled = true;
50 50
51 // Certificate provided by the host doesn't need authority. 51 // Certificate provided by the host doesn't need authority.
52 net::SSLConfig::CertAndStatus cert_and_status; 52 net::SSLConfig::CertAndStatus cert_and_status;
53 cert_and_status.cert_status = net::CERT_STATUS_AUTHORITY_INVALID; 53 cert_and_status.cert_status = net::CERT_STATUS_AUTHORITY_INVALID;
54 cert_and_status.cert = cert; 54 cert_and_status.cert = cert;
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 509
510 state_ = new_state; 510 state_ = new_state;
511 if (!closed_ && state_change_callback_.get()) 511 if (!closed_ && state_change_callback_.get())
512 state_change_callback_->Run(new_state); 512 state_change_callback_->Run(new_state);
513 } 513 }
514 } 514 }
515 515
516 } // namespace protocol 516 } // namespace protocol
517 517
518 } // namespace remoting 518 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/jingle_session.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698