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

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: Created 4 years, 10 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 channel_->SignalReadPacket.connect(this, 103 channel_->SignalReadPacket.connect(this,
104 &DtlsTransportChannelWrapper::OnReadPacket); 104 &DtlsTransportChannelWrapper::OnReadPacket);
105 channel_->SignalSentPacket.connect( 105 channel_->SignalSentPacket.connect(
106 this, &DtlsTransportChannelWrapper::OnSentPacket); 106 this, &DtlsTransportChannelWrapper::OnSentPacket);
107 channel_->SignalReadyToSend.connect(this, 107 channel_->SignalReadyToSend.connect(this,
108 &DtlsTransportChannelWrapper::OnReadyToSend); 108 &DtlsTransportChannelWrapper::OnReadyToSend);
109 channel_->SignalGatheringState.connect( 109 channel_->SignalGatheringState.connect(
110 this, &DtlsTransportChannelWrapper::OnGatheringState); 110 this, &DtlsTransportChannelWrapper::OnGatheringState);
111 channel_->SignalCandidateGathered.connect( 111 channel_->SignalCandidateGathered.connect(
112 this, &DtlsTransportChannelWrapper::OnCandidateGathered); 112 this, &DtlsTransportChannelWrapper::OnCandidateGathered);
113 channel_->SignalCandidatesRemoved.connect(
114 this, &DtlsTransportChannelWrapper::OnCandidatesRemoved);
113 channel_->SignalRoleConflict.connect(this, 115 channel_->SignalRoleConflict.connect(this,
114 &DtlsTransportChannelWrapper::OnRoleConflict); 116 &DtlsTransportChannelWrapper::OnRoleConflict);
115 channel_->SignalRouteChange.connect(this, 117 channel_->SignalRouteChange.connect(this,
116 &DtlsTransportChannelWrapper::OnRouteChange); 118 &DtlsTransportChannelWrapper::OnRouteChange);
117 channel_->SignalConnectionRemoved.connect(this, 119 channel_->SignalConnectionRemoved.connect(this,
118 &DtlsTransportChannelWrapper::OnConnectionRemoved); 120 &DtlsTransportChannelWrapper::OnConnectionRemoved);
119 channel_->SignalReceivingState.connect(this, 121 channel_->SignalReceivingState.connect(this,
120 &DtlsTransportChannelWrapper::OnReceivingState); 122 &DtlsTransportChannelWrapper::OnReceivingState);
121 } 123 }
122 124
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 SignalGatheringState(this); 605 SignalGatheringState(this);
604 } 606 }
605 607
606 void DtlsTransportChannelWrapper::OnCandidateGathered( 608 void DtlsTransportChannelWrapper::OnCandidateGathered(
607 TransportChannelImpl* channel, 609 TransportChannelImpl* channel,
608 const Candidate& c) { 610 const Candidate& c) {
609 ASSERT(channel == channel_); 611 ASSERT(channel == channel_);
610 SignalCandidateGathered(this, c); 612 SignalCandidateGathered(this, c);
611 } 613 }
612 614
615 void DtlsTransportChannelWrapper::OnCandidatesRemoved(
616 TransportChannelImpl* channel,
617 const Candidates& cc) {
618 ASSERT(channel == channel_);
619 SignalCandidatesRemoved(this, cc);
620 }
621
613 void DtlsTransportChannelWrapper::OnRoleConflict( 622 void DtlsTransportChannelWrapper::OnRoleConflict(
614 TransportChannelImpl* channel) { 623 TransportChannelImpl* channel) {
615 ASSERT(channel == channel_); 624 ASSERT(channel == channel_);
616 SignalRoleConflict(this); 625 SignalRoleConflict(this);
617 } 626 }
618 627
619 void DtlsTransportChannelWrapper::OnRouteChange( 628 void DtlsTransportChannelWrapper::OnRouteChange(
620 TransportChannel* channel, const Candidate& candidate) { 629 TransportChannel* channel, const Candidate& candidate) {
621 ASSERT(channel == channel_); 630 ASSERT(channel == channel_);
622 SignalRouteChange(this, candidate); 631 SignalRouteChange(this, candidate);
623 } 632 }
624 633
625 void DtlsTransportChannelWrapper::OnConnectionRemoved( 634 void DtlsTransportChannelWrapper::OnConnectionRemoved(
626 TransportChannelImpl* channel) { 635 TransportChannelImpl* channel) {
627 ASSERT(channel == channel_); 636 ASSERT(channel == channel_);
628 SignalConnectionRemoved(this); 637 SignalConnectionRemoved(this);
629 } 638 }
630 639
631 void DtlsTransportChannelWrapper::Reconnect() { 640 void DtlsTransportChannelWrapper::Reconnect() {
632 set_dtls_state(DTLS_TRANSPORT_NEW); 641 set_dtls_state(DTLS_TRANSPORT_NEW);
633 set_writable(false); 642 set_writable(false);
634 if (channel_->writable()) { 643 if (channel_->writable()) {
635 OnWritableState(channel_); 644 OnWritableState(channel_);
636 } 645 }
637 } 646 }
638 647
639 } // namespace cricket 648 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698