| OLD | NEW |
| 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 typedef std::vector<TransportChannelStats> TransportChannelStatsList; | 132 typedef std::vector<TransportChannelStats> TransportChannelStatsList; |
| 133 | 133 |
| 134 // Information about the stats of a transport. | 134 // Information about the stats of a transport. |
| 135 struct TransportStats { | 135 struct TransportStats { |
| 136 std::string transport_name; | 136 std::string transport_name; |
| 137 TransportChannelStatsList channel_stats; | 137 TransportChannelStatsList channel_stats; |
| 138 }; | 138 }; |
| 139 | 139 |
| 140 // Information about ICE configuration. | 140 // Information about ICE configuration. |
| 141 struct IceConfig { | 141 struct IceConfig { |
| 142 // The ICE connection receiving timeout value. | 142 // The ICE connection receiving timeout value in milliseconds. |
| 143 // TODO(honghaiz): Remove suffix _ms to be consistent. | 143 int receiving_timeout = -1; |
| 144 int receiving_timeout_ms = -1; | |
| 145 // Time interval in milliseconds to ping a backup connection when the ICE | 144 // Time interval in milliseconds to ping a backup connection when the ICE |
| 146 // channel is strongly connected. | 145 // channel is strongly connected. |
| 147 int backup_connection_ping_interval = -1; | 146 int backup_connection_ping_interval = -1; |
| 148 // If true, the most recent port allocator session will keep on running. | 147 // If true, the most recent port allocator session will keep on running. |
| 149 bool gather_continually = false; | 148 bool gather_continually = false; |
| 150 | 149 |
| 151 // Whether we should prioritize Relay/Relay candidate when nothing | 150 // Whether we should prioritize Relay/Relay candidate when nothing |
| 152 // is writable yet. | 151 // is writable yet. |
| 153 bool prioritize_most_likely_candidate_pairs = false; | 152 bool prioritize_most_likely_candidate_pairs = false; |
| 154 | 153 |
| 155 // If the current best connection is both writable and receiving, | 154 // If the current best connection is both writable and receiving, |
| 156 // then we will also try hard to make sure it is pinged at this rate | 155 // then we will also try hard to make sure it is pinged at this rate |
| 157 // (Default value is a little less than 2 * STRONG_PING_DELAY). | 156 // (Default value is a little less than 2 * STRONG_PING_INTERVAL). |
| 158 int max_strong_delay = -1; | 157 int max_strong_interval = -1; |
| 159 | 158 |
| 160 IceConfig() {} | 159 IceConfig() {} |
| 161 IceConfig(int receiving_timeout, | 160 IceConfig(int receiving_timeout_ms, |
| 162 int backup_connection_ping_interval, | 161 int backup_connection_ping_interval, |
| 163 bool gather_continually, | 162 bool gather_continually, |
| 164 bool prioritize_most_likely_candidate_pairs, | 163 bool prioritize_most_likely_candidate_pairs, |
| 165 int max_strong_delay) | 164 int max_strong_interval_ms) |
| 166 : receiving_timeout_ms(receiving_timeout), | 165 : receiving_timeout(receiving_timeout_ms), |
| 167 backup_connection_ping_interval(backup_connection_ping_interval), | 166 backup_connection_ping_interval(backup_connection_ping_interval), |
| 168 gather_continually(gather_continually), | 167 gather_continually(gather_continually), |
| 169 prioritize_most_likely_candidate_pairs( | 168 prioritize_most_likely_candidate_pairs( |
| 170 prioritize_most_likely_candidate_pairs), | 169 prioritize_most_likely_candidate_pairs), |
| 171 max_strong_delay(max_strong_delay) {} | 170 max_strong_interval(max_strong_interval_ms) {} |
| 172 }; | 171 }; |
| 173 | 172 |
| 174 bool BadTransportDescription(const std::string& desc, std::string* err_desc); | 173 bool BadTransportDescription(const std::string& desc, std::string* err_desc); |
| 175 | 174 |
| 176 bool IceCredentialsChanged(const std::string& old_ufrag, | 175 bool IceCredentialsChanged(const std::string& old_ufrag, |
| 177 const std::string& old_pwd, | 176 const std::string& old_pwd, |
| 178 const std::string& new_ufrag, | 177 const std::string& new_ufrag, |
| 179 const std::string& new_pwd); | 178 const std::string& new_pwd); |
| 180 | 179 |
| 181 class Transport : public sigslot::has_slots<> { | 180 class Transport : public sigslot::has_slots<> { |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 | 338 |
| 340 ChannelMap channels_; | 339 ChannelMap channels_; |
| 341 | 340 |
| 342 RTC_DISALLOW_COPY_AND_ASSIGN(Transport); | 341 RTC_DISALLOW_COPY_AND_ASSIGN(Transport); |
| 343 }; | 342 }; |
| 344 | 343 |
| 345 | 344 |
| 346 } // namespace cricket | 345 } // namespace cricket |
| 347 | 346 |
| 348 #endif // WEBRTC_P2P_BASE_TRANSPORT_H_ | 347 #endif // WEBRTC_P2P_BASE_TRANSPORT_H_ |
| OLD | NEW |