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

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

Issue 2224563004: Add signaling to support ICE renomination. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Update comments and merge 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
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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 : false; 156 : false;
157 } 157 }
158 158
159 // TransportChannelImpl calls. 159 // TransportChannelImpl calls.
160 TransportChannelState GetState() const override { 160 TransportChannelState GetState() const override {
161 return channel_->GetState(); 161 return channel_->GetState();
162 } 162 }
163 void SetIceTiebreaker(uint64_t tiebreaker) override { 163 void SetIceTiebreaker(uint64_t tiebreaker) override {
164 channel_->SetIceTiebreaker(tiebreaker); 164 channel_->SetIceTiebreaker(tiebreaker);
165 } 165 }
166 void SetIceCredentials(const std::string& ice_ufrag, 166 void SetIceParameters(const IceParameters& ice_params) override {
167 const std::string& ice_pwd) override { 167 channel_->SetIceParameters(ice_params);
168 channel_->SetIceCredentials(ice_ufrag, ice_pwd);
169 } 168 }
170 void SetRemoteIceCredentials(const std::string& ice_ufrag, 169 void SetRemoteIceParameters(const IceParameters& ice_params) override {
171 const std::string& ice_pwd) override { 170 channel_->SetRemoteIceParameters(ice_params);
172 channel_->SetRemoteIceCredentials(ice_ufrag, ice_pwd);
173 } 171 }
174 void SetRemoteIceMode(IceMode mode) override { 172 void SetRemoteIceMode(IceMode mode) override {
175 channel_->SetRemoteIceMode(mode); 173 channel_->SetRemoteIceMode(mode);
176 } 174 }
177 175
178 void MaybeStartGathering() override { channel_->MaybeStartGathering(); } 176 void MaybeStartGathering() override { channel_->MaybeStartGathering(); }
179 177
180 IceGatheringState gathering_state() const override { 178 IceGatheringState gathering_state() const override {
181 return channel_->gathering_state(); 179 return channel_->gathering_state();
182 } 180 }
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 // transport channel became writable, or before a remote fingerprint was 237 // transport channel became writable, or before a remote fingerprint was
240 // received. 238 // received.
241 rtc::Buffer cached_client_hello_; 239 rtc::Buffer cached_client_hello_;
242 240
243 RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper); 241 RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper);
244 }; 242 };
245 243
246 } // namespace cricket 244 } // namespace cricket
247 245
248 #endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_ 246 #endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698