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

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

Issue 1337673002: Change WebRTC SslCipher to be exposed as number only. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 3 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 174 }
175 175
176 bool TransportChannelProxy::GetSrtpCipher(std::string* cipher) { 176 bool TransportChannelProxy::GetSrtpCipher(std::string* cipher) {
177 ASSERT(rtc::Thread::Current() == worker_thread_); 177 ASSERT(rtc::Thread::Current() == worker_thread_);
178 if (!impl_) { 178 if (!impl_) {
179 return false; 179 return false;
180 } 180 }
181 return impl_->GetSrtpCipher(cipher); 181 return impl_->GetSrtpCipher(cipher);
182 } 182 }
183 183
184 bool TransportChannelProxy::GetSslCipher(std::string* cipher) { 184 bool TransportChannelProxy::GetSslCipher(rtc::SslCipher* 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 rtc::scoped_refptr<rtc::RTCCertificate> 192 rtc::scoped_refptr<rtc::RTCCertificate>
193 TransportChannelProxy::GetLocalCertificate() const { 193 TransportChannelProxy::GetLocalCertificate() const {
194 ASSERT(rtc::Thread::Current() == worker_thread_); 194 ASSERT(rtc::Thread::Current() == worker_thread_);
(...skipping 72 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 receiving or writable, push up those signals. 270 // If impl_ is already receiving or writable, push up those signals.
271 set_writable(impl_ ? impl_->writable() : false); 271 set_writable(impl_ ? impl_->writable() : false);
272 set_receiving(impl_ ? impl_->receiving() : false); 272 set_receiving(impl_ ? impl_->receiving() : false);
273 } 273 }
274 } 274 }
275 275
276 } // namespace cricket 276 } // namespace cricket
OLDNEW
« webrtc/base/sslstreamadapter.cc ('K') | « webrtc/p2p/base/transportchannelproxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698