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

Unified Diff: webrtc/p2p/base/dtlstransportchannel.cc

Issue 1350523003: TransportController refactoring. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing Mac test. Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/base/dtlstransportchannel.h ('k') | webrtc/p2p/base/dtlstransportchannel_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/dtlstransportchannel.cc
diff --git a/webrtc/p2p/base/dtlstransportchannel.cc b/webrtc/p2p/base/dtlstransportchannel.cc
index dcebdee53e48828842b0d8929a2a780e77c69311..b434d0860e1e73763a89d1fddbc2439d39fd5c4f 100644
--- a/webrtc/p2p/base/dtlstransportchannel.cc
+++ b/webrtc/p2p/base/dtlstransportchannel.cc
@@ -87,9 +87,9 @@ bool StreamInterfaceChannel::OnPacketReceived(const char* data, size_t size) {
}
DtlsTransportChannelWrapper::DtlsTransportChannelWrapper(
- Transport* transport,
- TransportChannelImpl* channel)
- : TransportChannelImpl(channel->content_name(), channel->component()),
+ Transport* transport,
+ TransportChannelImpl* channel)
+ : TransportChannelImpl(channel->transport_name(), channel->component()),
transport_(transport),
worker_thread_(rtc::Thread::Current()),
channel_(channel),
@@ -103,12 +103,10 @@ DtlsTransportChannelWrapper::DtlsTransportChannelWrapper(
&DtlsTransportChannelWrapper::OnReadPacket);
channel_->SignalReadyToSend.connect(this,
&DtlsTransportChannelWrapper::OnReadyToSend);
- channel_->SignalRequestSignaling.connect(this,
- &DtlsTransportChannelWrapper::OnRequestSignaling);
- channel_->SignalCandidateReady.connect(this,
- &DtlsTransportChannelWrapper::OnCandidateReady);
- channel_->SignalCandidatesAllocationDone.connect(this,
- &DtlsTransportChannelWrapper::OnCandidatesAllocationDone);
+ channel_->SignalGatheringState.connect(
+ this, &DtlsTransportChannelWrapper::OnGatheringState);
+ channel_->SignalCandidateGathered.connect(
+ this, &DtlsTransportChannelWrapper::OnCandidateGathered);
channel_->SignalRoleConflict.connect(this,
&DtlsTransportChannelWrapper::OnRoleConflict);
channel_->SignalRouteChange.connect(this,
@@ -211,7 +209,7 @@ bool DtlsTransportChannelWrapper::SetRemoteFingerprint(
return true;
}
- // Allow SetRemoteFingerprint with a NULL digest even if SetLocalIdentity
+ // Allow SetRemoteFingerprint with a NULL digest even if SetLocalCertificate
// hasn't been called.
if (dtls_state_ > STATE_OFFERED ||
(dtls_state_ == STATE_NONE && !digest_alg.empty())) {
@@ -591,22 +589,17 @@ bool DtlsTransportChannelWrapper::HandleDtlsPacket(const char* data,
return downward_->OnPacketReceived(data, size);
}
-void DtlsTransportChannelWrapper::OnRequestSignaling(
+void DtlsTransportChannelWrapper::OnGatheringState(
TransportChannelImpl* channel) {
ASSERT(channel == channel_);
- SignalRequestSignaling(this);
+ SignalGatheringState(this);
}
-void DtlsTransportChannelWrapper::OnCandidateReady(
- TransportChannelImpl* channel, const Candidate& c) {
+void DtlsTransportChannelWrapper::OnCandidateGathered(
+ TransportChannelImpl* channel,
+ const Candidate& c) {
ASSERT(channel == channel_);
- SignalCandidateReady(this, c);
-}
-
-void DtlsTransportChannelWrapper::OnCandidatesAllocationDone(
- TransportChannelImpl* channel) {
- ASSERT(channel == channel_);
- SignalCandidatesAllocationDone(this);
+ SignalCandidateGathered(this, c);
}
void DtlsTransportChannelWrapper::OnRoleConflict(
« no previous file with comments | « webrtc/p2p/base/dtlstransportchannel.h ('k') | webrtc/p2p/base/dtlstransportchannel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698