OLD | NEW |
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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 true) { | 178 true) { |
179 RTC_DCHECK(dtls_identity_store_); | 179 RTC_DCHECK(dtls_identity_store_); |
180 | 180 |
181 certificate_request_state_ = CERTIFICATE_WAITING; | 181 certificate_request_state_ = CERTIFICATE_WAITING; |
182 | 182 |
183 identity_request_observer_->SignalRequestFailed.connect( | 183 identity_request_observer_->SignalRequestFailed.connect( |
184 this, &WebRtcSessionDescriptionFactory::OnIdentityRequestFailed); | 184 this, &WebRtcSessionDescriptionFactory::OnIdentityRequestFailed); |
185 identity_request_observer_->SignalCertificateReady.connect( | 185 identity_request_observer_->SignalCertificateReady.connect( |
186 this, &WebRtcSessionDescriptionFactory::SetCertificate); | 186 this, &WebRtcSessionDescriptionFactory::SetCertificate); |
187 | 187 |
188 rtc::KeyType key_type = rtc::KT_DEFAULT; | 188 rtc::KeyParams key_params = rtc::KeyParams(); |
189 LOG(LS_VERBOSE) << "DTLS-SRTP enabled; sending DTLS identity request (key " | 189 LOG(LS_VERBOSE) << "DTLS-SRTP enabled; sending DTLS identity request (key " |
190 << "type: " << key_type << ")."; | 190 << "type: " << key_params.type() << ")."; |
191 | 191 |
192 // Request identity. This happens asynchronously, so the caller will have a | 192 // Request identity. This happens asynchronously, so the caller will have a |
193 // chance to connect to SignalIdentityReady. | 193 // chance to connect to SignalIdentityReady. |
194 dtls_identity_store_->RequestIdentity(key_type, identity_request_observer_); | 194 dtls_identity_store_->RequestIdentity(key_params, |
| 195 rtc::Optional<uint64_t>(), |
| 196 identity_request_observer_); |
195 } | 197 } |
196 | 198 |
197 WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory( | 199 WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory( |
198 rtc::Thread* signaling_thread, | 200 rtc::Thread* signaling_thread, |
199 cricket::ChannelManager* channel_manager, | 201 cricket::ChannelManager* channel_manager, |
200 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate, | 202 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate, |
201 WebRtcSession* session, | 203 WebRtcSession* session, |
202 const std::string& session_id) | 204 const std::string& session_id) |
203 : WebRtcSessionDescriptionFactory(signaling_thread, | 205 : WebRtcSessionDescriptionFactory(signaling_thread, |
204 channel_manager, | 206 channel_manager, |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
508 if (create_session_description_requests_.front().type == | 510 if (create_session_description_requests_.front().type == |
509 CreateSessionDescriptionRequest::kOffer) { | 511 CreateSessionDescriptionRequest::kOffer) { |
510 InternalCreateOffer(create_session_description_requests_.front()); | 512 InternalCreateOffer(create_session_description_requests_.front()); |
511 } else { | 513 } else { |
512 InternalCreateAnswer(create_session_description_requests_.front()); | 514 InternalCreateAnswer(create_session_description_requests_.front()); |
513 } | 515 } |
514 create_session_description_requests_.pop(); | 516 create_session_description_requests_.pop(); |
515 } | 517 } |
516 } | 518 } |
517 } // namespace webrtc | 519 } // namespace webrtc |
OLD | NEW |