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

Side by Side Diff: webrtc/api/webrtcsessiondescriptionfactory.cc

Issue 2614813003: Revert of Separating SCTP code from BaseChannel/MediaChannel. (Closed)
Patch Set: Also reverting https://codereview.webrtc.org/2612963002 Created 3 years, 11 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 | « webrtc/api/webrtcsession_unittest.cc ('k') | webrtc/media/BUILD.gn » ('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 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2013 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 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 for (const cricket::ContentInfo& content : 393 for (const cricket::ContentInfo& content :
394 session_->remote_description()->description()->contents()) { 394 session_->remote_description()->description()->contents()) {
395 // According to http://tools.ietf.org/html/rfc5245#section-9.2.1.1 395 // According to http://tools.ietf.org/html/rfc5245#section-9.2.1.1
396 // an answer should also contain new ICE ufrag and password if an offer 396 // an answer should also contain new ICE ufrag and password if an offer
397 // has been received with new ufrag and password. 397 // has been received with new ufrag and password.
398 request.options.transport_options[content.name].ice_restart = 398 request.options.transport_options[content.name].ice_restart =
399 session_->IceRestartPending(content.name); 399 session_->IceRestartPending(content.name);
400 // We should pass the current SSL role to the transport description 400 // We should pass the current SSL role to the transport description
401 // factory, if there is already an existing ongoing session. 401 // factory, if there is already an existing ongoing session.
402 rtc::SSLRole ssl_role; 402 rtc::SSLRole ssl_role;
403 if (session_->GetSslRole(content.name, &ssl_role)) { 403 if (session_->GetSslRole(session_->GetChannel(content.name), &ssl_role)) {
404 request.options.transport_options[content.name].prefer_passive_role = 404 request.options.transport_options[content.name].prefer_passive_role =
405 (rtc::SSL_SERVER == ssl_role); 405 (rtc::SSL_SERVER == ssl_role);
406 } 406 }
407 } 407 }
408 } 408 }
409 409
410 cricket::SessionDescription* desc(session_desc_factory_.CreateAnswer( 410 cricket::SessionDescription* desc(session_desc_factory_.CreateAnswer(
411 session_->remote_description() 411 session_->remote_description()
412 ? session_->remote_description()->description() 412 ? session_->remote_description()->description()
413 : nullptr, 413 : nullptr,
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 if (create_session_description_requests_.front().type == 500 if (create_session_description_requests_.front().type ==
501 CreateSessionDescriptionRequest::kOffer) { 501 CreateSessionDescriptionRequest::kOffer) {
502 InternalCreateOffer(create_session_description_requests_.front()); 502 InternalCreateOffer(create_session_description_requests_.front());
503 } else { 503 } else {
504 InternalCreateAnswer(create_session_description_requests_.front()); 504 InternalCreateAnswer(create_session_description_requests_.front());
505 } 505 }
506 create_session_description_requests_.pop(); 506 create_session_description_requests_.pop();
507 } 507 }
508 } 508 }
509 } // namespace webrtc 509 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/webrtcsession_unittest.cc ('k') | webrtc/media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698