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

Side by Side Diff: webrtc/p2p/base/transport.h

Issue 1304043008: Replacing SSLIdentity* with scoped_refptr<RTCCertificate> in TransportChannel layer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Making overriding "virtual" methods use the override keyword Created 5 years, 3 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
« no previous file with comments | « webrtc/p2p/base/p2ptransportchannel.h ('k') | webrtc/p2p/base/transport.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 void SetChannelReceivingTimeout(int timeout_ms); 201 void SetChannelReceivingTimeout(int timeout_ms);
202 202
203 // Must be called before applying local session description. 203 // Must be called before applying local session description.
204 void SetCertificate( 204 void SetCertificate(
205 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate); 205 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate);
206 206
207 // Get a copy of the local identity provided by SetIdentity. 207 // Get a copy of the local identity provided by SetIdentity.
208 bool GetCertificate(rtc::scoped_refptr<rtc::RTCCertificate>* certificate); 208 bool GetCertificate(rtc::scoped_refptr<rtc::RTCCertificate>* certificate);
209 209
210 // Get a copy of the remote certificate in use by the specified channel. 210 // Get a copy of the remote certificate in use by the specified channel.
211 bool GetRemoteCertificate(rtc::SSLCertificate** cert); 211 bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert);
212 212
213 // Create, destroy, and lookup the channels of this type by their components. 213 // Create, destroy, and lookup the channels of this type by their components.
214 TransportChannelImpl* CreateChannel(int component); 214 TransportChannelImpl* CreateChannel(int component);
215 // Note: GetChannel may lead to race conditions, since the mutex is not held 215 // Note: GetChannel may lead to race conditions, since the mutex is not held
216 // after the pointer is returned. 216 // after the pointer is returned.
217 TransportChannelImpl* GetChannel(int component); 217 TransportChannelImpl* GetChannel(int component);
218 // Note: HasChannel does not lead to race conditions, unlike GetChannel. 218 // Note: HasChannel does not lead to race conditions, unlike GetChannel.
219 bool HasChannel(int component) { 219 bool HasChannel(int component) {
220 return (NULL != GetChannel(component)); 220 return (NULL != GetChannel(component));
221 } 221 }
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 430
431 void SetIceRole_w(IceRole role); 431 void SetIceRole_w(IceRole role);
432 void SetRemoteIceMode_w(IceMode mode); 432 void SetRemoteIceMode_w(IceMode mode);
433 bool SetLocalTransportDescription_w(const TransportDescription& desc, 433 bool SetLocalTransportDescription_w(const TransportDescription& desc,
434 ContentAction action, 434 ContentAction action,
435 std::string* error_desc); 435 std::string* error_desc);
436 bool SetRemoteTransportDescription_w(const TransportDescription& desc, 436 bool SetRemoteTransportDescription_w(const TransportDescription& desc,
437 ContentAction action, 437 ContentAction action,
438 std::string* error_desc); 438 std::string* error_desc);
439 bool GetStats_w(TransportStats* infos); 439 bool GetStats_w(TransportStats* infos);
440 bool GetRemoteCertificate_w(rtc::SSLCertificate** cert); 440 bool GetRemoteSSLCertificate_w(rtc::SSLCertificate** cert);
441 441
442 void SetChannelReceivingTimeout_w(int timeout_ms); 442 void SetChannelReceivingTimeout_w(int timeout_ms);
443 443
444 // Sends SignalCompleted if we are now in that state. 444 // Sends SignalCompleted if we are now in that state.
445 void MaybeCompleted_w(); 445 void MaybeCompleted_w();
446 446
447 rtc::Thread* const signaling_thread_; 447 rtc::Thread* const signaling_thread_;
448 rtc::Thread* const worker_thread_; 448 rtc::Thread* const worker_thread_;
449 const std::string content_name_; 449 const std::string content_name_;
450 PortAllocator* const allocator_; 450 PortAllocator* const allocator_;
(...skipping 18 matching lines...) Expand all
469 // Protects changes to channels and messages 469 // Protects changes to channels and messages
470 rtc::CriticalSection crit_; 470 rtc::CriticalSection crit_;
471 471
472 DISALLOW_COPY_AND_ASSIGN(Transport); 472 DISALLOW_COPY_AND_ASSIGN(Transport);
473 }; 473 };
474 474
475 475
476 } // namespace cricket 476 } // namespace cricket
477 477
478 #endif // WEBRTC_P2P_BASE_TRANSPORT_H_ 478 #endif // WEBRTC_P2P_BASE_TRANSPORT_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/p2ptransportchannel.h ('k') | webrtc/p2p/base/transport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698