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

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

Powered by Google App Engine
This is Rietveld 408576698