| 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 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 467 // enough population. | 467 // enough population. |
| 468 if (redetermine_role_on_ice_restart_ && transport->local_description() && | 468 if (redetermine_role_on_ice_restart_ && transport->local_description() && |
| 469 IceCredentialsChanged(transport->local_description()->ice_ufrag, | 469 IceCredentialsChanged(transport->local_description()->ice_ufrag, |
| 470 transport->local_description()->ice_pwd, | 470 transport->local_description()->ice_pwd, |
| 471 tdesc.ice_ufrag, tdesc.ice_pwd)) { | 471 tdesc.ice_ufrag, tdesc.ice_pwd)) { |
| 472 IceRole new_ice_role = | 472 IceRole new_ice_role = |
| 473 (action == CA_OFFER) ? ICEROLE_CONTROLLING : ICEROLE_CONTROLLED; | 473 (action == CA_OFFER) ? ICEROLE_CONTROLLING : ICEROLE_CONTROLLED; |
| 474 SetIceRole(new_ice_role); | 474 SetIceRole(new_ice_role); |
| 475 } | 475 } |
| 476 | 476 |
| 477 LOG(LS_INFO) << "Set local transport description on " << transport_name; |
| 477 return transport->SetLocalTransportDescription(tdesc, action, err); | 478 return transport->SetLocalTransportDescription(tdesc, action, err); |
| 478 } | 479 } |
| 479 | 480 |
| 480 bool TransportController::SetRemoteTransportDescription_n( | 481 bool TransportController::SetRemoteTransportDescription_n( |
| 481 const std::string& transport_name, | 482 const std::string& transport_name, |
| 482 const TransportDescription& tdesc, | 483 const TransportDescription& tdesc, |
| 483 ContentAction action, | 484 ContentAction action, |
| 484 std::string* err) { | 485 std::string* err) { |
| 485 RTC_DCHECK(network_thread_->IsCurrent()); | 486 RTC_DCHECK(network_thread_->IsCurrent()); |
| 486 | 487 |
| 487 Transport* transport = GetTransport_n(transport_name); | 488 Transport* transport = GetTransport_n(transport_name); |
| 488 if (!transport) { | 489 if (!transport) { |
| 489 // If we didn't find a transport, that's not an error; | 490 // If we didn't find a transport, that's not an error; |
| 490 // it could have been deleted as a result of bundling. | 491 // it could have been deleted as a result of bundling. |
| 491 // TODO(deadbeef): Make callers smarter so they won't attempt to set a | 492 // TODO(deadbeef): Make callers smarter so they won't attempt to set a |
| 492 // description on a deleted transport. | 493 // description on a deleted transport. |
| 493 return true; | 494 return true; |
| 494 } | 495 } |
| 495 | 496 |
| 497 LOG(LS_INFO) << "Set remote transport description on " << transport_name; |
| 496 return transport->SetRemoteTransportDescription(tdesc, action, err); | 498 return transport->SetRemoteTransportDescription(tdesc, action, err); |
| 497 } | 499 } |
| 498 | 500 |
| 499 void TransportController::MaybeStartGathering_n() { | 501 void TransportController::MaybeStartGathering_n() { |
| 500 for (const auto& kv : transports_) { | 502 for (const auto& kv : transports_) { |
| 501 kv.second->MaybeStartGathering(); | 503 kv.second->MaybeStartGathering(); |
| 502 } | 504 } |
| 503 } | 505 } |
| 504 | 506 |
| 505 bool TransportController::AddRemoteCandidates_n( | 507 bool TransportController::AddRemoteCandidates_n( |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 696 RTC_FROM_HERE, this, MSG_ICEGATHERINGSTATE, | 698 RTC_FROM_HERE, this, MSG_ICEGATHERINGSTATE, |
| 697 new rtc::TypedMessageData<IceGatheringState>(new_gathering_state)); | 699 new rtc::TypedMessageData<IceGatheringState>(new_gathering_state)); |
| 698 } | 700 } |
| 699 } | 701 } |
| 700 | 702 |
| 701 void TransportController::OnDtlsHandshakeError(rtc::SSLHandshakeError error) { | 703 void TransportController::OnDtlsHandshakeError(rtc::SSLHandshakeError error) { |
| 702 SignalDtlsHandshakeError(error); | 704 SignalDtlsHandshakeError(error); |
| 703 } | 705 } |
| 704 | 706 |
| 705 } // namespace cricket | 707 } // namespace cricket |
| OLD | NEW |