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

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

Issue 1648813004: Remove candidates when doing continual gathering (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Address Alex's comments 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/dtlstransportchannel.h ('k') | webrtc/p2p/base/faketransportcontroller.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 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 channel_->SignalReadPacket.connect(this, 106 channel_->SignalReadPacket.connect(this,
107 &DtlsTransportChannelWrapper::OnReadPacket); 107 &DtlsTransportChannelWrapper::OnReadPacket);
108 channel_->SignalSentPacket.connect( 108 channel_->SignalSentPacket.connect(
109 this, &DtlsTransportChannelWrapper::OnSentPacket); 109 this, &DtlsTransportChannelWrapper::OnSentPacket);
110 channel_->SignalReadyToSend.connect(this, 110 channel_->SignalReadyToSend.connect(this,
111 &DtlsTransportChannelWrapper::OnReadyToSend); 111 &DtlsTransportChannelWrapper::OnReadyToSend);
112 channel_->SignalGatheringState.connect( 112 channel_->SignalGatheringState.connect(
113 this, &DtlsTransportChannelWrapper::OnGatheringState); 113 this, &DtlsTransportChannelWrapper::OnGatheringState);
114 channel_->SignalCandidateGathered.connect( 114 channel_->SignalCandidateGathered.connect(
115 this, &DtlsTransportChannelWrapper::OnCandidateGathered); 115 this, &DtlsTransportChannelWrapper::OnCandidateGathered);
116 channel_->SignalCandidatesRemoved.connect(
117 this, &DtlsTransportChannelWrapper::OnCandidatesRemoved);
116 channel_->SignalRoleConflict.connect(this, 118 channel_->SignalRoleConflict.connect(this,
117 &DtlsTransportChannelWrapper::OnRoleConflict); 119 &DtlsTransportChannelWrapper::OnRoleConflict);
118 channel_->SignalRouteChange.connect(this, 120 channel_->SignalRouteChange.connect(this,
119 &DtlsTransportChannelWrapper::OnRouteChange); 121 &DtlsTransportChannelWrapper::OnRouteChange);
120 channel_->SignalConnectionRemoved.connect(this, 122 channel_->SignalConnectionRemoved.connect(this,
121 &DtlsTransportChannelWrapper::OnConnectionRemoved); 123 &DtlsTransportChannelWrapper::OnConnectionRemoved);
122 channel_->SignalReceivingState.connect(this, 124 channel_->SignalReceivingState.connect(this,
123 &DtlsTransportChannelWrapper::OnReceivingState); 125 &DtlsTransportChannelWrapper::OnReceivingState);
124 } 126 }
125 127
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 SignalGatheringState(this); 608 SignalGatheringState(this);
607 } 609 }
608 610
609 void DtlsTransportChannelWrapper::OnCandidateGathered( 611 void DtlsTransportChannelWrapper::OnCandidateGathered(
610 TransportChannelImpl* channel, 612 TransportChannelImpl* channel,
611 const Candidate& c) { 613 const Candidate& c) {
612 ASSERT(channel == channel_); 614 ASSERT(channel == channel_);
613 SignalCandidateGathered(this, c); 615 SignalCandidateGathered(this, c);
614 } 616 }
615 617
618 void DtlsTransportChannelWrapper::OnCandidatesRemoved(
619 TransportChannelImpl* channel,
620 const Candidates& candidates) {
621 ASSERT(channel == channel_);
622 SignalCandidatesRemoved(this, candidates);
623 }
624
616 void DtlsTransportChannelWrapper::OnRoleConflict( 625 void DtlsTransportChannelWrapper::OnRoleConflict(
617 TransportChannelImpl* channel) { 626 TransportChannelImpl* channel) {
618 ASSERT(channel == channel_); 627 ASSERT(channel == channel_);
619 SignalRoleConflict(this); 628 SignalRoleConflict(this);
620 } 629 }
621 630
622 void DtlsTransportChannelWrapper::OnRouteChange( 631 void DtlsTransportChannelWrapper::OnRouteChange(
623 TransportChannel* channel, const Candidate& candidate) { 632 TransportChannel* channel, const Candidate& candidate) {
624 ASSERT(channel == channel_); 633 ASSERT(channel == channel_);
625 SignalRouteChange(this, candidate); 634 SignalRouteChange(this, candidate);
626 } 635 }
627 636
628 void DtlsTransportChannelWrapper::OnConnectionRemoved( 637 void DtlsTransportChannelWrapper::OnConnectionRemoved(
629 TransportChannelImpl* channel) { 638 TransportChannelImpl* channel) {
630 ASSERT(channel == channel_); 639 ASSERT(channel == channel_);
631 SignalConnectionRemoved(this); 640 SignalConnectionRemoved(this);
632 } 641 }
633 642
634 void DtlsTransportChannelWrapper::Reconnect() { 643 void DtlsTransportChannelWrapper::Reconnect() {
635 set_dtls_state(DTLS_TRANSPORT_NEW); 644 set_dtls_state(DTLS_TRANSPORT_NEW);
636 set_writable(false); 645 set_writable(false);
637 if (channel_->writable()) { 646 if (channel_->writable()) {
638 OnWritableState(channel_); 647 OnWritableState(channel_);
639 } 648 }
640 } 649 }
641 650
642 } // namespace cricket 651 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/dtlstransportchannel.h ('k') | webrtc/p2p/base/faketransportcontroller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698