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

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

Issue 1785613011: Revert of Remove candidates when doing continual gathering (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 4 years, 9 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/candidate.h ('k') | webrtc/p2p/base/dtlstransportchannel.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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 179
180 void MaybeStartGathering() override { channel_->MaybeStartGathering(); } 180 void MaybeStartGathering() override { channel_->MaybeStartGathering(); }
181 181
182 IceGatheringState gathering_state() const override { 182 IceGatheringState gathering_state() const override {
183 return channel_->gathering_state(); 183 return channel_->gathering_state();
184 } 184 }
185 185
186 void AddRemoteCandidate(const Candidate& candidate) override { 186 void AddRemoteCandidate(const Candidate& candidate) override {
187 channel_->AddRemoteCandidate(candidate); 187 channel_->AddRemoteCandidate(candidate);
188 } 188 }
189 void RemoveRemoteCandidate(const Candidate& candidate) override {
190 channel_->RemoveRemoteCandidate(candidate);
191 }
192 189
193 void SetIceConfig(const IceConfig& config) override { 190 void SetIceConfig(const IceConfig& config) override {
194 channel_->SetIceConfig(config); 191 channel_->SetIceConfig(config);
195 } 192 }
196 193
197 // Needed by DtlsTransport. 194 // Needed by DtlsTransport.
198 TransportChannelImpl* channel() { return channel_; } 195 TransportChannelImpl* channel() { return channel_; }
199 196
200 private: 197 private:
201 void OnReadableState(TransportChannel* channel); 198 void OnReadableState(TransportChannel* channel);
202 void OnWritableState(TransportChannel* channel); 199 void OnWritableState(TransportChannel* channel);
203 void OnReadPacket(TransportChannel* channel, const char* data, size_t size, 200 void OnReadPacket(TransportChannel* channel, const char* data, size_t size,
204 const rtc::PacketTime& packet_time, int flags); 201 const rtc::PacketTime& packet_time, int flags);
205 void OnSentPacket(TransportChannel* channel, 202 void OnSentPacket(TransportChannel* channel,
206 const rtc::SentPacket& sent_packet); 203 const rtc::SentPacket& sent_packet);
207 void OnReadyToSend(TransportChannel* channel); 204 void OnReadyToSend(TransportChannel* channel);
208 void OnReceivingState(TransportChannel* channel); 205 void OnReceivingState(TransportChannel* channel);
209 void OnDtlsEvent(rtc::StreamInterface* stream_, int sig, int err); 206 void OnDtlsEvent(rtc::StreamInterface* stream_, int sig, int err);
210 bool SetupDtls(); 207 bool SetupDtls();
211 bool MaybeStartDtls(); 208 bool MaybeStartDtls();
212 bool HandleDtlsPacket(const char* data, size_t size); 209 bool HandleDtlsPacket(const char* data, size_t size);
213 void OnGatheringState(TransportChannelImpl* channel); 210 void OnGatheringState(TransportChannelImpl* channel);
214 void OnCandidateGathered(TransportChannelImpl* channel, const Candidate& c); 211 void OnCandidateGathered(TransportChannelImpl* channel, const Candidate& c);
215 void OnCandidatesRemoved(TransportChannelImpl* channel,
216 const Candidates& candidates);
217 void OnRoleConflict(TransportChannelImpl* channel); 212 void OnRoleConflict(TransportChannelImpl* channel);
218 void OnRouteChange(TransportChannel* channel, const Candidate& candidate); 213 void OnRouteChange(TransportChannel* channel, const Candidate& candidate);
219 void OnConnectionRemoved(TransportChannelImpl* channel); 214 void OnConnectionRemoved(TransportChannelImpl* channel);
220 void Reconnect(); 215 void Reconnect();
221 216
222 rtc::Thread* worker_thread_; // Everything should occur on this thread. 217 rtc::Thread* worker_thread_; // Everything should occur on this thread.
223 // Underlying channel, not owned by this class. 218 // Underlying channel, not owned by this class.
224 TransportChannelImpl* const channel_; 219 TransportChannelImpl* const channel_;
225 rtc::scoped_ptr<rtc::SSLStreamAdapter> dtls_; // The DTLS stream 220 rtc::scoped_ptr<rtc::SSLStreamAdapter> dtls_; // The DTLS stream
226 StreamInterfaceChannel* downward_; // Wrapper for channel_, owned by dtls_. 221 StreamInterfaceChannel* downward_; // Wrapper for channel_, owned by dtls_.
227 std::vector<int> srtp_ciphers_; // SRTP ciphers to use with DTLS. 222 std::vector<int> srtp_ciphers_; // SRTP ciphers to use with DTLS.
228 bool dtls_active_ = false; 223 bool dtls_active_ = false;
229 rtc::scoped_refptr<rtc::RTCCertificate> local_certificate_; 224 rtc::scoped_refptr<rtc::RTCCertificate> local_certificate_;
230 rtc::SSLRole ssl_role_; 225 rtc::SSLRole ssl_role_;
231 rtc::SSLProtocolVersion ssl_max_version_; 226 rtc::SSLProtocolVersion ssl_max_version_;
232 rtc::Buffer remote_fingerprint_value_; 227 rtc::Buffer remote_fingerprint_value_;
233 std::string remote_fingerprint_algorithm_; 228 std::string remote_fingerprint_algorithm_;
234 229
235 RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper); 230 RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper);
236 }; 231 };
237 232
238 } // namespace cricket 233 } // namespace cricket
239 234
240 #endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_ 235 #endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/candidate.h ('k') | webrtc/p2p/base/dtlstransportchannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698