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

Unified Diff: webrtc/pc/channelmanager.cc

Issue 1528843005: Add support for GCM cipher suites from RFC 7714. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix failing SRTP-but-no-DTLS tests. Created 4 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
Index: webrtc/pc/channelmanager.cc
diff --git a/webrtc/pc/channelmanager.cc b/webrtc/pc/channelmanager.cc
index f59a3df9c72f7059e0c1a66aed639a66e2dbe518..3dc6dcd7d3ee3abe9af9f454a1804c80d1af6abb 100644
--- a/webrtc/pc/channelmanager.cc
+++ b/webrtc/pc/channelmanager.cc
@@ -99,6 +99,12 @@ bool ChannelManager::SetVideoRtxEnabled(bool enable) {
}
}
+bool ChannelManager::SetCryptoOptions(
+ const rtc::CryptoOptions& crypto_options) {
+ crypto_options_ = crypto_options;
mattdr 2016/05/06 22:34:14 Maybe this should fail or log if there are active
joachim 2016/05/09 23:21:40 Done (added warning log and comment in header but
+ return true;
+}
+
void ChannelManager::GetSupportedAudioCodecs(
std::vector<AudioCodec>* codecs) const {
codecs->clear();
@@ -230,6 +236,7 @@ VoiceChannel* ChannelManager::CreateVoiceChannel_w(
VoiceChannel* voice_channel =
new VoiceChannel(worker_thread_, media_engine_.get(), media_channel,
transport_controller, content_name, rtcp);
+ voice_channel->SetCryptoOptions(crypto_options_);
if (!voice_channel->Init()) {
delete voice_channel;
return nullptr;
@@ -288,6 +295,7 @@ VideoChannel* ChannelManager::CreateVideoChannel_w(
VideoChannel* video_channel = new VideoChannel(
worker_thread_, media_channel, transport_controller, content_name, rtcp);
+ video_channel->SetCryptoOptions(crypto_options_);
if (!video_channel->Init()) {
delete video_channel;
return NULL;
@@ -346,6 +354,7 @@ DataChannel* ChannelManager::CreateDataChannel_w(
DataChannel* data_channel = new DataChannel(
worker_thread_, media_channel, transport_controller, content_name, rtcp);
+ data_channel->SetCryptoOptions(crypto_options_);
if (!data_channel->Init()) {
LOG(LS_WARNING) << "Failed to init data channel.";
delete data_channel;

Powered by Google App Engine
This is Rietveld 408576698