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

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

Issue 1494373004: Revert "Allow remote fingerprint update during a call" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years 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 | « talk/session/media/srtpfilter.h ('k') | webrtc/p2p/base/dtlstransportchannel.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 2011 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2011 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 void OnReceivingState(TransportChannel* channel); 209 void OnReceivingState(TransportChannel* channel);
210 void OnDtlsEvent(rtc::StreamInterface* stream_, int sig, int err); 210 void OnDtlsEvent(rtc::StreamInterface* stream_, int sig, int err);
211 bool SetupDtls(); 211 bool SetupDtls();
212 bool MaybeStartDtls(); 212 bool MaybeStartDtls();
213 bool HandleDtlsPacket(const char* data, size_t size); 213 bool HandleDtlsPacket(const char* data, size_t size);
214 void OnGatheringState(TransportChannelImpl* channel); 214 void OnGatheringState(TransportChannelImpl* channel);
215 void OnCandidateGathered(TransportChannelImpl* channel, const Candidate& c); 215 void OnCandidateGathered(TransportChannelImpl* channel, const Candidate& c);
216 void OnRoleConflict(TransportChannelImpl* channel); 216 void OnRoleConflict(TransportChannelImpl* channel);
217 void OnRouteChange(TransportChannel* channel, const Candidate& candidate); 217 void OnRouteChange(TransportChannel* channel, const Candidate& candidate);
218 void OnConnectionRemoved(TransportChannelImpl* channel); 218 void OnConnectionRemoved(TransportChannelImpl* channel);
219 void Reconnect();
220 219
221 Transport* transport_; // The transport_ that created us. 220 Transport* transport_; // The transport_ that created us.
222 rtc::Thread* worker_thread_; // Everything should occur on this thread. 221 rtc::Thread* worker_thread_; // Everything should occur on this thread.
223 // Underlying channel, owned by transport_. 222 // Underlying channel, owned by transport_.
224 TransportChannelImpl* const channel_; 223 TransportChannelImpl* const channel_;
225 rtc::scoped_ptr<rtc::SSLStreamAdapter> dtls_; // The DTLS stream 224 rtc::scoped_ptr<rtc::SSLStreamAdapter> dtls_; // The DTLS stream
226 StreamInterfaceChannel* downward_; // Wrapper for channel_, owned by dtls_. 225 StreamInterfaceChannel* downward_; // Wrapper for channel_, owned by dtls_.
227 std::vector<int> srtp_ciphers_; // SRTP ciphers to use with DTLS. 226 std::vector<int> srtp_ciphers_; // SRTP ciphers to use with DTLS.
228 bool dtls_active_ = false; 227 bool dtls_active_ = false;
229 rtc::scoped_refptr<rtc::RTCCertificate> local_certificate_; 228 rtc::scoped_refptr<rtc::RTCCertificate> local_certificate_;
230 rtc::SSLRole ssl_role_; 229 rtc::SSLRole ssl_role_;
231 rtc::SSLProtocolVersion ssl_max_version_; 230 rtc::SSLProtocolVersion ssl_max_version_;
232 rtc::Buffer remote_fingerprint_value_; 231 rtc::Buffer remote_fingerprint_value_;
233 std::string remote_fingerprint_algorithm_; 232 std::string remote_fingerprint_algorithm_;
234 233
235 RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper); 234 RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper);
236 }; 235 };
237 236
238 } // namespace cricket 237 } // namespace cricket
239 238
240 #endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_ 239 #endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
OLDNEW
« no previous file with comments | « talk/session/media/srtpfilter.h ('k') | webrtc/p2p/base/dtlstransportchannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698