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

Unified Diff: webrtc/pc/peerconnectionfactory.cc

Issue 2815513012: Negotiate the same SRTP crypto suites for every DTLS association formed. (Closed)
Patch Set: Merge with master Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/pc/peerconnection_integrationtest.cc ('k') | webrtc/pc/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/peerconnectionfactory.cc
diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc
index 8269a1ad85d818a32e1360afb5a803f24c3e57d2..f9e6dced50b409e5fa240672567fc41e2afa5103 100644
--- a/webrtc/pc/peerconnectionfactory.cc
+++ b/webrtc/pc/peerconnectionfactory.cc
@@ -219,7 +219,6 @@ bool PeerConnectionFactory::Initialize() {
std::move(media_engine), worker_thread_, network_thread_));
channel_manager_->SetVideoRtxEnabled(true);
- channel_manager_->SetCryptoOptions(options_.crypto_options);
if (!channel_manager_->Init()) {
return false;
}
@@ -229,9 +228,6 @@ bool PeerConnectionFactory::Initialize() {
void PeerConnectionFactory::SetOptions(const Options& options) {
options_ = options;
- if (channel_manager_) {
- channel_manager_->SetCryptoOptions(options.crypto_options);
- }
}
rtc::scoped_refptr<AudioSourceInterface>
@@ -370,9 +366,9 @@ cricket::TransportController* PeerConnectionFactory::CreateTransportController(
cricket::PortAllocator* port_allocator,
bool redetermine_role_on_ice_restart) {
RTC_DCHECK(signaling_thread_->IsCurrent());
- return new cricket::TransportController(signaling_thread_, network_thread_,
- port_allocator,
- redetermine_role_on_ice_restart);
+ return new cricket::TransportController(
+ signaling_thread_, network_thread_, port_allocator,
+ redetermine_role_on_ice_restart, options_.crypto_options);
}
rtc::Thread* PeerConnectionFactory::signaling_thread() {
« no previous file with comments | « webrtc/pc/peerconnection_integrationtest.cc ('k') | webrtc/pc/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698