| 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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 // Updating the remote ICE candidate generation could change the sort order. | 332 // Updating the remote ICE candidate generation could change the sort order. |
| 333 RequestSortAndStateUpdate(); | 333 RequestSortAndStateUpdate(); |
| 334 } | 334 } |
| 335 | 335 |
| 336 void P2PTransportChannel::SetRemoteIceMode(IceMode mode) { | 336 void P2PTransportChannel::SetRemoteIceMode(IceMode mode) { |
| 337 remote_ice_mode_ = mode; | 337 remote_ice_mode_ = mode; |
| 338 } | 338 } |
| 339 | 339 |
| 340 void P2PTransportChannel::SetIceConfig(const IceConfig& config) { | 340 void P2PTransportChannel::SetIceConfig(const IceConfig& config) { |
| 341 if (config_.continual_gathering_policy != config.continual_gathering_policy) { | 341 if (config_.continual_gathering_policy != config.continual_gathering_policy) { |
| 342 config_.continual_gathering_policy = config.continual_gathering_policy; |
| 342 LOG(LS_INFO) << "Set continual_gathering_policy to " | 343 LOG(LS_INFO) << "Set continual_gathering_policy to " |
| 343 << config_.continual_gathering_policy; | 344 << config_.continual_gathering_policy; |
| 344 config_.continual_gathering_policy = config.continual_gathering_policy; | |
| 345 } | 345 } |
| 346 | 346 |
| 347 if (config.backup_connection_ping_interval >= 0 && | 347 if (config.backup_connection_ping_interval >= 0 && |
| 348 config_.backup_connection_ping_interval != | 348 config_.backup_connection_ping_interval != |
| 349 config.backup_connection_ping_interval) { | 349 config.backup_connection_ping_interval) { |
| 350 config_.backup_connection_ping_interval = | 350 config_.backup_connection_ping_interval = |
| 351 config.backup_connection_ping_interval; | 351 config.backup_connection_ping_interval; |
| 352 LOG(LS_INFO) << "Set backup connection ping interval to " | 352 LOG(LS_INFO) << "Set backup connection ping interval to " |
| 353 << config_.backup_connection_ping_interval << " milliseconds."; | 353 << config_.backup_connection_ping_interval << " milliseconds."; |
| 354 } | 354 } |
| (...skipping 1538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1893 | 1893 |
| 1894 // During the initial state when nothing has been pinged yet, return the first | 1894 // During the initial state when nothing has been pinged yet, return the first |
| 1895 // one in the ordered |connections_|. | 1895 // one in the ordered |connections_|. |
| 1896 return *(std::find_if(connections_.begin(), connections_.end(), | 1896 return *(std::find_if(connections_.begin(), connections_.end(), |
| 1897 [conn1, conn2](Connection* conn) { | 1897 [conn1, conn2](Connection* conn) { |
| 1898 return conn == conn1 || conn == conn2; | 1898 return conn == conn1 || conn == conn2; |
| 1899 })); | 1899 })); |
| 1900 } | 1900 } |
| 1901 | 1901 |
| 1902 } // namespace cricket | 1902 } // namespace cricket |
| OLD | NEW |