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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 bool srtp_required) | 165 bool srtp_required) |
166 : worker_thread_(worker_thread), | 166 : worker_thread_(worker_thread), |
167 network_thread_(network_thread), | 167 network_thread_(network_thread), |
168 signaling_thread_(signaling_thread), | 168 signaling_thread_(signaling_thread), |
169 content_name_(content_name), | 169 content_name_(content_name), |
170 rtcp_mux_required_(rtcp_mux_required), | 170 rtcp_mux_required_(rtcp_mux_required), |
171 srtp_required_(srtp_required), | 171 srtp_required_(srtp_required), |
172 media_channel_(media_channel), | 172 media_channel_(media_channel), |
173 selected_candidate_pair_(nullptr) { | 173 selected_candidate_pair_(nullptr) { |
174 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); | 174 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); |
| 175 #if defined(ENABLE_EXTERNAL_AUTH) |
| 176 srtp_filter_->EnableExternalAuth(); |
| 177 #endif |
175 LOG(LS_INFO) << "Created channel for " << content_name; | 178 LOG(LS_INFO) << "Created channel for " << content_name; |
176 } | 179 } |
177 | 180 |
178 BaseChannel::~BaseChannel() { | 181 BaseChannel::~BaseChannel() { |
179 TRACE_EVENT0("webrtc", "BaseChannel::~BaseChannel"); | 182 TRACE_EVENT0("webrtc", "BaseChannel::~BaseChannel"); |
180 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); | 183 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); |
181 Deinit(); | 184 Deinit(); |
182 StopConnectionMonitor(); | 185 StopConnectionMonitor(); |
183 // Eats any outstanding messages or packets. | 186 // Eats any outstanding messages or packets. |
184 worker_thread_->Clear(&invoker_); | 187 worker_thread_->Clear(&invoker_); |
(...skipping 2277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2462 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_READYTOSENDDATA, | 2465 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_READYTOSENDDATA, |
2463 new DataChannelReadyToSendMessageData(writable)); | 2466 new DataChannelReadyToSendMessageData(writable)); |
2464 } | 2467 } |
2465 | 2468 |
2466 void RtpDataChannel::GetSrtpCryptoSuites_n( | 2469 void RtpDataChannel::GetSrtpCryptoSuites_n( |
2467 std::vector<int>* crypto_suites) const { | 2470 std::vector<int>* crypto_suites) const { |
2468 GetSupportedDataCryptoSuites(crypto_options(), crypto_suites); | 2471 GetSupportedDataCryptoSuites(crypto_options(), crypto_suites); |
2469 } | 2472 } |
2470 | 2473 |
2471 } // namespace cricket | 2474 } // namespace cricket |
OLD | NEW |