| OLD | NEW |
| 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 void UpdateAggregateStates_w(); | 191 void UpdateAggregateStates_w(); |
| 192 | 192 |
| 193 rtc::Thread* const signaling_thread_ = nullptr; | 193 rtc::Thread* const signaling_thread_ = nullptr; |
| 194 rtc::Thread* const worker_thread_ = nullptr; | 194 rtc::Thread* const worker_thread_ = nullptr; |
| 195 typedef std::map<std::string, Transport*> TransportMap; | 195 typedef std::map<std::string, Transport*> TransportMap; |
| 196 TransportMap transports_; | 196 TransportMap transports_; |
| 197 | 197 |
| 198 std::vector<RefCountedChannel> channels_; | 198 std::vector<RefCountedChannel> channels_; |
| 199 | 199 |
| 200 PortAllocator* const port_allocator_ = nullptr; | 200 PortAllocator* const port_allocator_ = nullptr; |
| 201 rtc::SSLProtocolVersion ssl_max_version_ = rtc::SSL_PROTOCOL_DTLS_10; | 201 rtc::SSLProtocolVersion ssl_max_version_ = rtc::SSL_PROTOCOL_DTLS_12; |
| 202 | 202 |
| 203 // Aggregate state for TransportChannelImpls. | 203 // Aggregate state for TransportChannelImpls. |
| 204 IceConnectionState connection_state_ = kIceConnectionConnecting; | 204 IceConnectionState connection_state_ = kIceConnectionConnecting; |
| 205 bool receiving_ = false; | 205 bool receiving_ = false; |
| 206 IceGatheringState gathering_state_ = kIceGatheringNew; | 206 IceGatheringState gathering_state_ = kIceGatheringNew; |
| 207 | 207 |
| 208 // TODO(deadbeef): Move the fields below down to the transports themselves | 208 // TODO(deadbeef): Move the fields below down to the transports themselves |
| 209 IceConfig ice_config_; | 209 IceConfig ice_config_; |
| 210 IceRole ice_role_ = ICEROLE_CONTROLLING; | 210 IceRole ice_role_ = ICEROLE_CONTROLLING; |
| 211 // Flag which will be set to true after the first role switch | 211 // Flag which will be set to true after the first role switch |
| 212 bool ice_role_switch_ = false; | 212 bool ice_role_switch_ = false; |
| 213 uint64_t ice_tiebreaker_ = rtc::CreateRandomId64(); | 213 uint64_t ice_tiebreaker_ = rtc::CreateRandomId64(); |
| 214 rtc::scoped_refptr<rtc::RTCCertificate> certificate_; | 214 rtc::scoped_refptr<rtc::RTCCertificate> certificate_; |
| 215 }; | 215 }; |
| 216 | 216 |
| 217 } // namespace cricket | 217 } // namespace cricket |
| 218 | 218 |
| 219 #endif // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_ | 219 #endif // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_ |
| OLD | NEW |