| 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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 314     TransportChannelImpl* channel = GetChannel(candidate.component()); | 314     TransportChannelImpl* channel = GetChannel(candidate.component()); | 
| 315     if (channel != nullptr) { | 315     if (channel != nullptr) { | 
| 316       channel->RemoveRemoteCandidate(candidate); | 316       channel->RemoveRemoteCandidate(candidate); | 
| 317     } | 317     } | 
| 318   } | 318   } | 
| 319   return true; | 319   return true; | 
| 320 } | 320 } | 
| 321 | 321 | 
| 322 bool Transport::ApplyLocalTransportDescription(TransportChannelImpl* ch, | 322 bool Transport::ApplyLocalTransportDescription(TransportChannelImpl* ch, | 
| 323                                                std::string* error_desc) { | 323                                                std::string* error_desc) { | 
| 324   ch->SetIceCredentials(local_description_->ice_ufrag, | 324   ch->SetIceParameters(local_description_->GetIceParameters()); | 
| 325                         local_description_->ice_pwd); |  | 
| 326   return true; | 325   return true; | 
| 327 } | 326 } | 
| 328 | 327 | 
| 329 bool Transport::ApplyRemoteTransportDescription(TransportChannelImpl* ch, | 328 bool Transport::ApplyRemoteTransportDescription(TransportChannelImpl* ch, | 
| 330                                                 std::string* error_desc) { | 329                                                 std::string* error_desc) { | 
| 331   ch->SetRemoteIceCredentials(remote_description_->ice_ufrag, | 330   ch->SetRemoteIceParameters(remote_description_->GetIceParameters()); | 
| 332                               remote_description_->ice_pwd); |  | 
| 333   return true; | 331   return true; | 
| 334 } | 332 } | 
| 335 | 333 | 
| 336 bool Transport::ApplyNegotiatedTransportDescription( | 334 bool Transport::ApplyNegotiatedTransportDescription( | 
| 337     TransportChannelImpl* channel, | 335     TransportChannelImpl* channel, | 
| 338     std::string* error_desc) { | 336     std::string* error_desc) { | 
| 339   channel->SetRemoteIceMode(remote_ice_mode_); | 337   channel->SetRemoteIceMode(remote_ice_mode_); | 
| 340   return true; | 338   return true; | 
| 341 } | 339 } | 
| 342 | 340 | 
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 465     } | 463     } | 
| 466 | 464 | 
| 467     // If local is passive, local will act as server. | 465     // If local is passive, local will act as server. | 
| 468   } | 466   } | 
| 469 | 467 | 
| 470   *ssl_role = is_remote_server ? rtc::SSL_CLIENT : rtc::SSL_SERVER; | 468   *ssl_role = is_remote_server ? rtc::SSL_CLIENT : rtc::SSL_SERVER; | 
| 471   return true; | 469   return true; | 
| 472 } | 470 } | 
| 473 | 471 | 
| 474 }  // namespace cricket | 472 }  // namespace cricket | 
| OLD | NEW | 
|---|