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

Side by Side Diff: webrtc/p2p/base/transportchannelproxy.cc

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Merge with master Created 5 years, 4 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
OLDNEW
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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 } 182 }
183 183
184 bool TransportChannelProxy::GetSslCipher(std::string* cipher) { 184 bool TransportChannelProxy::GetSslCipher(std::string* cipher) {
185 ASSERT(rtc::Thread::Current() == worker_thread_); 185 ASSERT(rtc::Thread::Current() == worker_thread_);
186 if (!impl_) { 186 if (!impl_) {
187 return false; 187 return false;
188 } 188 }
189 return impl_->GetSslCipher(cipher); 189 return impl_->GetSslCipher(cipher);
190 } 190 }
191 191
192 bool TransportChannelProxy::GetLocalIdentity( 192 bool TransportChannelProxy::GetLocalCertificate(
193 rtc::SSLIdentity** identity) const { 193 rtc::scoped_refptr<webrtc::DtlsCertificate>* certificate) const {
194 ASSERT(rtc::Thread::Current() == worker_thread_); 194 ASSERT(rtc::Thread::Current() == worker_thread_);
195 if (!impl_) { 195 if (!impl_) {
196 return false; 196 return false;
197 } 197 }
198 return impl_->GetLocalIdentity(identity); 198 return impl_->GetLocalCertificate(certificate);
199 } 199 }
200 200
201 bool TransportChannelProxy::GetRemoteCertificate( 201 bool TransportChannelProxy::GetRemoteCertificate(
202 rtc::SSLCertificate** cert) const { 202 rtc::SSLCertificate** cert) const {
203 ASSERT(rtc::Thread::Current() == worker_thread_); 203 ASSERT(rtc::Thread::Current() == worker_thread_);
204 if (!impl_) { 204 if (!impl_) {
205 return false; 205 return false;
206 } 206 }
207 return impl_->GetRemoteCertificate(cert); 207 return impl_->GetRemoteCertificate(cert);
208 } 208 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 void TransportChannelProxy::OnMessage(rtc::Message* msg) { 267 void TransportChannelProxy::OnMessage(rtc::Message* msg) {
268 ASSERT(rtc::Thread::Current() == worker_thread_); 268 ASSERT(rtc::Thread::Current() == worker_thread_);
269 if (msg->message_id == MSG_UPDATESTATE) { 269 if (msg->message_id == MSG_UPDATESTATE) {
270 // If impl_ is already readable or writable, push up those signals. 270 // If impl_ is already readable or writable, push up those signals.
271 set_readable(impl_ ? impl_->readable() : false); 271 set_readable(impl_ ? impl_->readable() : false);
272 set_writable(impl_ ? impl_->writable() : false); 272 set_writable(impl_ ? impl_->writable() : false);
273 } 273 }
274 } 274 }
275 275
276 } // namespace cricket 276 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698