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

Side by Side Diff: webrtc/p2p/base/faketransportcontroller.h

Issue 1380603005: Revert of Change WebRTC SslCipher to be exposed as number only. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « webrtc/p2p/base/dtlstransportchannel_unittest.cc ('k') | webrtc/p2p/base/p2ptransportchannel.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2009 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2009 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 remote_cert_ = cert; 236 remote_cert_ = cert;
237 } 237 }
238 238
239 bool IsDtlsActive() const override { return do_dtls_; } 239 bool IsDtlsActive() const override { return do_dtls_; }
240 240
241 bool SetSrtpCiphers(const std::vector<std::string>& ciphers) override { 241 bool SetSrtpCiphers(const std::vector<std::string>& ciphers) override {
242 srtp_ciphers_ = ciphers; 242 srtp_ciphers_ = ciphers;
243 return true; 243 return true;
244 } 244 }
245 245
246 bool GetSrtpCryptoSuite(std::string* cipher) override { 246 bool GetSrtpCipher(std::string* cipher) override {
247 if (!chosen_srtp_cipher_.empty()) { 247 if (!chosen_srtp_cipher_.empty()) {
248 *cipher = chosen_srtp_cipher_; 248 *cipher = chosen_srtp_cipher_;
249 return true; 249 return true;
250 } 250 }
251 return false; 251 return false;
252 } 252 }
253 253
254 bool GetSslCipherSuite(uint16_t* cipher) override { return false; } 254 bool GetSslCipher(std::string* cipher) override { return false; }
255 255
256 rtc::scoped_refptr<rtc::RTCCertificate> GetLocalCertificate() const { 256 rtc::scoped_refptr<rtc::RTCCertificate> GetLocalCertificate() const {
257 return local_cert_; 257 return local_cert_;
258 } 258 }
259 259
260 bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const override { 260 bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const override {
261 if (!remote_cert_) 261 if (!remote_cert_)
262 return false; 262 return false;
263 263
264 *cert = remote_cert_->GetReference(); 264 *cert = remote_cert_->GetReference();
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 } 531 }
532 } 532 }
533 533
534 private: 534 private:
535 bool fail_create_channel_; 535 bool fail_create_channel_;
536 }; 536 };
537 537
538 } // namespace cricket 538 } // namespace cricket
539 539
540 #endif // WEBRTC_P2P_BASE_FAKETRANSPORTCONTROLLER_H_ 540 #endif // WEBRTC_P2P_BASE_FAKETRANSPORTCONTROLLER_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/dtlstransportchannel_unittest.cc ('k') | webrtc/p2p/base/p2ptransportchannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698