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

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

Issue 2237853002: Remove obosolete SessionId setter/getter from PortAllocator. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove deprecation include again. Created 4 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
« no previous file with comments | « no previous file | webrtc/p2p/base/p2ptransportchannel.cc » ('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 2011 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2011 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 int SetOption(rtc::Socket::Option opt, int value) override { 111 int SetOption(rtc::Socket::Option opt, int value) override {
112 return channel_->SetOption(opt, value); 112 return channel_->SetOption(opt, value);
113 } 113 }
114 bool GetOption(rtc::Socket::Option opt, int* value) override { 114 bool GetOption(rtc::Socket::Option opt, int* value) override {
115 return channel_->GetOption(opt, value); 115 return channel_->GetOption(opt, value);
116 } 116 }
117 int GetError() override { return channel_->GetError(); } 117 int GetError() override { return channel_->GetError(); }
118 bool GetStats(ConnectionInfos* infos) override { 118 bool GetStats(ConnectionInfos* infos) override {
119 return channel_->GetStats(infos); 119 return channel_->GetStats(infos);
120 } 120 }
121 const std::string SessionId() const override { return channel_->SessionId(); }
122 121
123 virtual bool SetSslMaxProtocolVersion(rtc::SSLProtocolVersion version); 122 virtual bool SetSslMaxProtocolVersion(rtc::SSLProtocolVersion version);
124 123
125 // Set up the ciphers to use for DTLS-SRTP. If this method is not called 124 // Set up the ciphers to use for DTLS-SRTP. If this method is not called
126 // before DTLS starts, or |ciphers| is empty, SRTP keys won't be negotiated. 125 // before DTLS starts, or |ciphers| is empty, SRTP keys won't be negotiated.
127 // This method should be called before SetupDtls. 126 // This method should be called before SetupDtls.
128 bool SetSrtpCryptoSuites(const std::vector<int>& ciphers) override; 127 bool SetSrtpCryptoSuites(const std::vector<int>& ciphers) override;
129 128
130 // Find out which DTLS-SRTP cipher was negotiated 129 // Find out which DTLS-SRTP cipher was negotiated
131 bool GetSrtpCryptoSuite(int* cipher) override; 130 bool GetSrtpCryptoSuite(int* cipher) override;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 // transport channel became writable, or before a remote fingerprint was 239 // transport channel became writable, or before a remote fingerprint was
241 // received. 240 // received.
242 rtc::Buffer cached_client_hello_; 241 rtc::Buffer cached_client_hello_;
243 242
244 RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper); 243 RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper);
245 }; 244 };
246 245
247 } // namespace cricket 246 } // namespace cricket
248 247
249 #endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_ 248 #endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/p2p/base/p2ptransportchannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698