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

Side by Side Diff: webrtc/p2p/base/transportchannelimpl.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: 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
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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 // It is assumed that the Transport will have checked validity 78 // It is assumed that the Transport will have checked validity
79 // before forwarding. 79 // before forwarding.
80 sigslot::signal2<TransportChannelImpl*, 80 sigslot::signal2<TransportChannelImpl*,
81 const Candidate&> SignalCandidateReady; 81 const Candidate&> SignalCandidateReady;
82 virtual void OnCandidate(const Candidate& candidate) = 0; 82 virtual void OnCandidate(const Candidate& candidate) = 0;
83 83
84 // DTLS methods 84 // DTLS methods
85 // Set DTLS local identity. The identity object is not copied, but the caller 85 // Set DTLS local identity. The identity object is not copied, but the caller
86 // retains ownership and must delete it after this TransportChannelImpl is 86 // retains ownership and must delete it after this TransportChannelImpl is
87 // destroyed. 87 // destroyed.
88 // TODO(bemasc): Fix the ownership semantics of this method. 88 // TODO(bemasc): Fix the ownership semantics of this method.
tommi 2015/09/03 20:06:04 maybe you can remove this todo now?
hbos 2015/09/07 08:11:01 Done.
89 virtual bool SetLocalIdentity(rtc::SSLIdentity* identity) = 0; 89 virtual bool SetLocalCertificate(
90 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) = 0;
90 91
91 // Set DTLS Remote fingerprint. Must be after local identity set. 92 // Set DTLS Remote fingerprint. Must be after local identity set.
92 virtual bool SetRemoteFingerprint(const std::string& digest_alg, 93 virtual bool SetRemoteFingerprint(const std::string& digest_alg,
93 const uint8* digest, 94 const uint8* digest,
94 size_t digest_len) = 0; 95 size_t digest_len) = 0;
95 96
96 virtual bool SetSslRole(rtc::SSLRole role) = 0; 97 virtual bool SetSslRole(rtc::SSLRole role) = 0;
97 98
98 // TransportChannel is forwarding this signal from PortAllocatorSession. 99 // TransportChannel is forwarding this signal from PortAllocatorSession.
99 sigslot::signal1<TransportChannelImpl*> SignalCandidatesAllocationDone; 100 sigslot::signal1<TransportChannelImpl*> SignalCandidatesAllocationDone;
100 101
101 // Invoked when there is conflict in the ICE role between local and remote 102 // Invoked when there is conflict in the ICE role between local and remote
102 // agents. 103 // agents.
103 sigslot::signal1<TransportChannelImpl*> SignalRoleConflict; 104 sigslot::signal1<TransportChannelImpl*> SignalRoleConflict;
104 105
105 // Emitted whenever the number of connections available to the transport 106 // Emitted whenever the number of connections available to the transport
106 // channel decreases. 107 // channel decreases.
107 sigslot::signal1<TransportChannelImpl*> SignalConnectionRemoved; 108 sigslot::signal1<TransportChannelImpl*> SignalConnectionRemoved;
108 109
109 private: 110 private:
110 DISALLOW_COPY_AND_ASSIGN(TransportChannelImpl); 111 DISALLOW_COPY_AND_ASSIGN(TransportChannelImpl);
111 }; 112 };
112 113
113 } // namespace cricket 114 } // namespace cricket
114 115
115 #endif // WEBRTC_P2P_BASE_TRANSPORTCHANNELIMPL_H_ 116 #endif // WEBRTC_P2P_BASE_TRANSPORTCHANNELIMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698