Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: p2p/base/jseptransport.cc

Issue 3011133002: Remove the support of fallback from DTLS to SDES. (Closed)
Patch Set: Merge and address the comments. Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | p2p/base/transportcontroller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 desc << fp_tmp->ToString(); 323 desc << fp_tmp->ToString();
324 desc << " Got: " << fingerprint->ToString(); 324 desc << " Got: " << fingerprint->ToString();
325 return BadTransportDescription(desc.str(), error_desc); 325 return BadTransportDescription(desc.str(), error_desc);
326 } 326 }
327 327
328 bool JsepTransport::ApplyLocalTransportDescription( 328 bool JsepTransport::ApplyLocalTransportDescription(
329 DtlsTransportInternal* dtls_transport, 329 DtlsTransportInternal* dtls_transport,
330 std::string* error_desc) { 330 std::string* error_desc) {
331 dtls_transport->ice_transport()->SetIceParameters( 331 dtls_transport->ice_transport()->SetIceParameters(
332 local_description_->GetIceParameters()); 332 local_description_->GetIceParameters());
333 bool ret = true; 333 return true;
334 if (certificate_) {
335 ret = dtls_transport->SetLocalCertificate(certificate_);
336 RTC_DCHECK(ret);
337 }
338 return ret;
339 } 334 }
340 335
341 bool JsepTransport::ApplyRemoteTransportDescription( 336 bool JsepTransport::ApplyRemoteTransportDescription(
342 DtlsTransportInternal* dtls_transport, 337 DtlsTransportInternal* dtls_transport,
343 std::string* error_desc) { 338 std::string* error_desc) {
344 dtls_transport->ice_transport()->SetRemoteIceParameters( 339 dtls_transport->ice_transport()->SetRemoteIceParameters(
345 remote_description_->GetIceParameters()); 340 remote_description_->GetIceParameters());
346 dtls_transport->ice_transport()->SetRemoteIceMode( 341 dtls_transport->ice_transport()->SetRemoteIceMode(
347 remote_description_->ice_mode); 342 remote_description_->ice_mode);
348 return true; 343 return true;
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 } 488 }
494 489
495 // If local is passive, local will act as server. 490 // If local is passive, local will act as server.
496 } 491 }
497 492
498 ssl_role_.emplace(is_remote_server ? rtc::SSL_CLIENT : rtc::SSL_SERVER); 493 ssl_role_.emplace(is_remote_server ? rtc::SSL_CLIENT : rtc::SSL_SERVER);
499 return true; 494 return true;
500 } 495 }
501 496
502 } // namespace cricket 497 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | p2p/base/transportcontroller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698