| 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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 << static_cast<int>(config_.default_nomination_mode); | 427 << static_cast<int>(config_.default_nomination_mode); |
| 428 } | 428 } |
| 429 } | 429 } |
| 430 | 430 |
| 431 const IceConfig& P2PTransportChannel::config() const { | 431 const IceConfig& P2PTransportChannel::config() const { |
| 432 return config_; | 432 return config_; |
| 433 } | 433 } |
| 434 | 434 |
| 435 void P2PTransportChannel::MaybeStartGathering() { | 435 void P2PTransportChannel::MaybeStartGathering() { |
| 436 if (ice_parameters_.ufrag.empty() || ice_parameters_.pwd.empty()) { | 436 if (ice_parameters_.ufrag.empty() || ice_parameters_.pwd.empty()) { |
| 437 LOG(LS_ERROR) << "Cannot gather candidates because ICE parameters are empty" |
| 438 << " ufrag: " << ice_parameters_.ufrag |
| 439 << " pwd: " << ice_parameters_.pwd; |
| 437 return; | 440 return; |
| 438 } | 441 } |
| 439 // Start gathering if we never started before, or if an ICE restart occurred. | 442 // Start gathering if we never started before, or if an ICE restart occurred. |
| 440 if (allocator_sessions_.empty() || | 443 if (allocator_sessions_.empty() || |
| 441 IceCredentialsChanged(allocator_sessions_.back()->ice_ufrag(), | 444 IceCredentialsChanged(allocator_sessions_.back()->ice_ufrag(), |
| 442 allocator_sessions_.back()->ice_pwd(), | 445 allocator_sessions_.back()->ice_pwd(), |
| 443 ice_parameters_.ufrag, ice_parameters_.pwd)) { | 446 ice_parameters_.ufrag, ice_parameters_.pwd)) { |
| 444 if (gathering_state_ != kIceGatheringGathering) { | 447 if (gathering_state_ != kIceGatheringGathering) { |
| 445 gathering_state_ = kIceGatheringGathering; | 448 gathering_state_ = kIceGatheringGathering; |
| 446 SignalGatheringState(this); | 449 SignalGatheringState(this); |
| (...skipping 1513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1960 | 1963 |
| 1961 // During the initial state when nothing has been pinged yet, return the first | 1964 // During the initial state when nothing has been pinged yet, return the first |
| 1962 // one in the ordered |connections_|. | 1965 // one in the ordered |connections_|. |
| 1963 return *(std::find_if(connections_.begin(), connections_.end(), | 1966 return *(std::find_if(connections_.begin(), connections_.end(), |
| 1964 [conn1, conn2](Connection* conn) { | 1967 [conn1, conn2](Connection* conn) { |
| 1965 return conn == conn1 || conn == conn2; | 1968 return conn == conn1 || conn == conn2; |
| 1966 })); | 1969 })); |
| 1967 } | 1970 } |
| 1968 | 1971 |
| 1969 } // namespace cricket | 1972 } // namespace cricket |
| OLD | NEW |