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

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

Issue 2004463003: Handle any number of role conflicts; not just the first. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | webrtc/p2p/base/transportcontroller.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 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 rtc::SSLProtocolVersion ssl_max_version_ = rtc::SSL_PROTOCOL_DTLS_12; 213 rtc::SSLProtocolVersion ssl_max_version_ = rtc::SSL_PROTOCOL_DTLS_12;
214 214
215 // Aggregate state for TransportChannelImpls. 215 // Aggregate state for TransportChannelImpls.
216 IceConnectionState connection_state_ = kIceConnectionConnecting; 216 IceConnectionState connection_state_ = kIceConnectionConnecting;
217 bool receiving_ = false; 217 bool receiving_ = false;
218 IceGatheringState gathering_state_ = kIceGatheringNew; 218 IceGatheringState gathering_state_ = kIceGatheringNew;
219 219
220 // TODO(deadbeef): Move the fields below down to the transports themselves 220 // TODO(deadbeef): Move the fields below down to the transports themselves
221 IceConfig ice_config_; 221 IceConfig ice_config_;
222 IceRole ice_role_ = ICEROLE_CONTROLLING; 222 IceRole ice_role_ = ICEROLE_CONTROLLING;
223 // Flag which will be set to true after the first role switch
224 bool ice_role_switch_ = false;
225 uint64_t ice_tiebreaker_ = rtc::CreateRandomId64(); 223 uint64_t ice_tiebreaker_ = rtc::CreateRandomId64();
226 rtc::scoped_refptr<rtc::RTCCertificate> certificate_; 224 rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
227 rtc::AsyncInvoker invoker_; 225 rtc::AsyncInvoker invoker_;
228 // True if QUIC is used instead of DTLS. 226 // True if QUIC is used instead of DTLS.
229 bool quic_ = false; 227 bool quic_ = false;
230 }; 228 };
231 229
232 } // namespace cricket 230 } // namespace cricket
233 231
234 #endif // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_ 232 #endif // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/p2p/base/transportcontroller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698