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

Side by Side Diff: webrtc/p2p/base/p2ptransportchannel.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/faketransportcontroller.h ('k') | 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 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 const std::string& ice_pwd) override; 85 const std::string& ice_pwd) override;
86 void SetRemoteIceCredentials(const std::string& ice_ufrag, 86 void SetRemoteIceCredentials(const std::string& ice_ufrag,
87 const std::string& ice_pwd) override; 87 const std::string& ice_pwd) override;
88 void SetRemoteIceMode(IceMode mode) override; 88 void SetRemoteIceMode(IceMode mode) override;
89 void Connect() override; 89 void Connect() override;
90 void MaybeStartGathering() override; 90 void MaybeStartGathering() override;
91 IceGatheringState gathering_state() const override { 91 IceGatheringState gathering_state() const override {
92 return gathering_state_; 92 return gathering_state_;
93 } 93 }
94 void AddRemoteCandidate(const Candidate& candidate) override; 94 void AddRemoteCandidate(const Candidate& candidate) override;
95 void RemoveRemoteCandidate(const Candidate& candidate) override;
96 // Sets the parameters in IceConfig. We do not set them blindly. Instead, we 95 // Sets the parameters in IceConfig. We do not set them blindly. Instead, we
97 // only update the parameter if it is considered set in |config|. For example, 96 // only update the parameter if it is considered set in |config|. For example,
98 // a negative value of receiving_timeout will be considered "not set" and we 97 // a negative value of receiving_timeout will be considered "not set" and we
99 // will not use it to update the respective parameter in |config_|. 98 // will not use it to update the respective parameter in |config_|.
100 void SetIceConfig(const IceConfig& config) override; 99 void SetIceConfig(const IceConfig& config) override;
101 const IceConfig& config() const; 100 const IceConfig& config() const;
102 101
103 // From TransportChannel: 102 // From TransportChannel:
104 int SendPacket(const char* data, 103 int SendPacket(const char* data,
105 size_t len, 104 size_t len,
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 int weak_ping_interval_ = WEAK_PING_INTERVAL; 324 int weak_ping_interval_ = WEAK_PING_INTERVAL;
326 TransportChannelState state_ = TransportChannelState::STATE_INIT; 325 TransportChannelState state_ = TransportChannelState::STATE_INIT;
327 IceConfig config_; 326 IceConfig config_;
328 327
329 RTC_DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel); 328 RTC_DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel);
330 }; 329 };
331 330
332 } // namespace cricket 331 } // namespace cricket
333 332
334 #endif // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_ 333 #endif // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/faketransportcontroller.h ('k') | webrtc/p2p/base/p2ptransportchannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698