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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2606123002: Remove the dependency of TransportChannel and TransportChannelImpl. (Closed)
Patch Set: Merge Created 3 years, 11 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
« webrtc/p2p/base/packettransportinterface.h ('K') | « webrtc/p2p/base/transportcontroller.h ('k') | webrtc/p2p/base/transportcontroller_unittest.cc » ('j') | webrtc/pc/channel.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/transportcontroller.cc
diff --git a/webrtc/p2p/base/transportcontroller.cc b/webrtc/p2p/base/transportcontroller.cc
index 4a3a00e10f0e2831e4eefcf6bd53d229086b0d84..0010f043cf93e8ec2d0a3bbe49c5ab98ae9bd118 100644
--- a/webrtc/p2p/base/transportcontroller.cc
+++ b/webrtc/p2p/base/transportcontroller.cc
@@ -47,20 +47,20 @@ class TransportController::ChannelPair {
// TODO(deadbeef): Change the types of |dtls| and |ice| to
// DtlsTransportChannelWrapper and P2PTransportChannelWrapper,
// once TransportChannelImpl is removed.
- ChannelPair(TransportChannelImpl* dtls, TransportChannelImpl* ice)
+ ChannelPair(DtlsTransportInternal* dtls, IceTransportInternal* ice)
: ice_(ice), dtls_(dtls) {}
// Currently, all ICE-related calls still go through this DTLS channel. But
// that will change once we get rid of TransportChannelImpl, and the DTLS
// channel interface no longer includes ICE-specific methods.
- const TransportChannelImpl* dtls() const { return dtls_.get(); }
- TransportChannelImpl* dtls() { return dtls_.get(); }
- const TransportChannelImpl* ice() const { return ice_.get(); }
- TransportChannelImpl* ice() { return ice_.get(); }
+ const DtlsTransportInternal* dtls() const { return dtls_.get(); }
+ DtlsTransportInternal* dtls() { return dtls_.get(); }
+ const IceTransportInternal* ice() const { return ice_.get(); }
+ IceTransportInternal* ice() { return ice_.get(); }
private:
- std::unique_ptr<TransportChannelImpl> ice_;
- std::unique_ptr<TransportChannelImpl> dtls_;
+ std::unique_ptr<IceTransportInternal> ice_;
+ std::unique_ptr<DtlsTransportInternal> dtls_;
RTC_DISALLOW_COPY_AND_ASSIGN(ChannelPair);
};
@@ -227,7 +227,7 @@ void TransportController::SetMetricsObserver(
metrics_observer));
}
-TransportChannel* TransportController::CreateTransportChannel_n(
+DtlsTransportInternal* TransportController::CreateTransportChannel_n(
const std::string& transport_name,
int component) {
RTC_DCHECK(network_thread_->IsCurrent());
@@ -243,17 +243,17 @@ TransportChannel* TransportController::CreateTransportChannel_n(
JsepTransport* transport = GetOrCreateJsepTransport(transport_name);
// Create DTLS channel wrapping ICE channel, and configure it.
- TransportChannelImpl* ice =
+ IceTransportInternal* ice =
CreateIceTransportChannel_n(transport_name, component);
// TODO(deadbeef): To support QUIC, would need to create a
// QuicTransportChannel here. What is "dtls" in this file would then become
// "dtls or quic".
- TransportChannelImpl* dtls =
+ DtlsTransportInternal* dtls =
CreateDtlsTransportChannel_n(transport_name, component, ice);
- dtls->SetMetricsObserver(metrics_observer_);
- dtls->SetIceRole(ice_role_);
- dtls->SetIceTiebreaker(ice_tiebreaker_);
- dtls->SetIceConfig(ice_config_);
+ dtls->ice_transport()->SetMetricsObserver(metrics_observer_);
+ dtls->ice_transport()->SetIceRole(ice_role_);
+ dtls->ice_transport()->SetIceTiebreaker(ice_tiebreaker_);
+ dtls->ice_transport()->SetIceConfig(ice_config_);
if (certificate_) {
bool set_cert_success = dtls->SetLocalCertificate(certificate_);
RTC_DCHECK(set_cert_success);
@@ -266,18 +266,18 @@ TransportChannel* TransportController::CreateTransportChannel_n(
this, &TransportController::OnChannelWritableState_n);
dtls->SignalReceivingState.connect(
this, &TransportController::OnChannelReceivingState_n);
- dtls->SignalGatheringState.connect(
+ dtls->SignalDtlsHandshakeError.connect(
+ this, &TransportController::OnDtlsHandshakeError);
+ dtls->ice_transport()->SignalGatheringState.connect(
this, &TransportController::OnChannelGatheringState_n);
- dtls->SignalCandidateGathered.connect(
+ dtls->ice_transport()->SignalCandidateGathered.connect(
this, &TransportController::OnChannelCandidateGathered_n);
- dtls->SignalCandidatesRemoved.connect(
+ dtls->ice_transport()->SignalCandidatesRemoved.connect(
this, &TransportController::OnChannelCandidatesRemoved_n);
- dtls->SignalRoleConflict.connect(
+ dtls->ice_transport()->SignalRoleConflict.connect(
this, &TransportController::OnChannelRoleConflict_n);
- dtls->SignalStateChanged.connect(
+ dtls->ice_transport()->SignalStateChanged.connect(
this, &TransportController::OnChannelStateChanged_n);
- dtls->SignalDtlsHandshakeError.connect(
- this, &TransportController::OnDtlsHandshakeError);
RefCountedChannel* new_pair = new RefCountedChannel(dtls, ice);
new_pair->AddRef();
channels_.insert(channels_.end(), new_pair);
@@ -326,31 +326,32 @@ std::vector<std::string> TransportController::transport_names_for_testing() {
return ret;
}
-std::vector<TransportChannelImpl*> TransportController::channels_for_testing() {
- std::vector<TransportChannelImpl*> ret;
+std::vector<DtlsTransportInternal*>
+TransportController::channels_for_testing() {
+ std::vector<DtlsTransportInternal*> ret;
for (RefCountedChannel* channel : channels_) {
ret.push_back(channel->dtls());
}
return ret;
}
-TransportChannelImpl* TransportController::get_channel_for_testing(
+DtlsTransportInternal* TransportController::get_channel_for_testing(
const std::string& transport_name,
int component) {
RefCountedChannel* ch = GetChannel_n(transport_name, component);
return ch ? ch->dtls() : nullptr;
}
-TransportChannelImpl* TransportController::CreateIceTransportChannel_n(
+IceTransportInternal* TransportController::CreateIceTransportChannel_n(
const std::string& transport_name,
int component) {
return new P2PTransportChannel(transport_name, component, port_allocator_);
}
-TransportChannelImpl* TransportController::CreateDtlsTransportChannel_n(
+DtlsTransportInternal* TransportController::CreateDtlsTransportChannel_n(
const std::string&,
int,
- TransportChannelImpl* ice) {
+ IceTransportInternal* ice) {
DtlsTransportChannelWrapper* dtls = new DtlsTransportChannelWrapper(ice);
dtls->SetSslMaxProtocolVersion(ssl_max_version_);
return dtls;
@@ -489,7 +490,7 @@ void TransportController::SetIceConfig_n(const IceConfig& config) {
ice_config_ = config;
for (auto& channel : channels_) {
- channel->dtls()->SetIceConfig(ice_config_);
+ channel->dtls()->ice_transport()->SetIceConfig(ice_config_);
}
}
@@ -498,7 +499,7 @@ void TransportController::SetIceRole_n(IceRole ice_role) {
ice_role_ = ice_role;
for (auto& channel : channels_) {
- channel->dtls()->SetIceRole(ice_role_);
+ channel->dtls()->ice_transport()->SetIceRole(ice_role_);
}
}
@@ -630,7 +631,7 @@ bool TransportController::SetRemoteTransportDescription_n(
void TransportController::MaybeStartGathering_n() {
for (auto& channel : channels_) {
- channel->dtls()->MaybeStartGathering();
+ channel->dtls()->ice_transport()->MaybeStartGathering();
}
}
@@ -660,7 +661,7 @@ bool TransportController::AddRemoteCandidates_n(
" for content: " + transport_name;
return false;
}
- channel->dtls()->AddRemoteCandidate(candidate);
+ channel->dtls()->ice_transport()->AddRemoteCandidate(candidate);
}
return true;
}
@@ -694,7 +695,7 @@ bool TransportController::RemoveRemoteCandidates_n(const Candidates& candidates,
RefCountedChannel* channel =
GetChannel_n(transport_name, candidate.component());
if (channel) {
- channel->dtls()->RemoveRemoteCandidate(candidate);
+ channel->dtls()->ice_transport()->RemoveRemoteCandidate(candidate);
}
}
}
@@ -728,7 +729,7 @@ void TransportController::SetMetricsObserver_n(
RTC_DCHECK(network_thread_->IsCurrent());
metrics_observer_ = metrics_observer;
for (auto& channel : channels_) {
- channel->dtls()->SetMetricsObserver(metrics_observer);
+ channel->dtls()->ice_transport()->SetMetricsObserver(metrics_observer);
}
}
@@ -747,13 +748,13 @@ void TransportController::OnChannelReceivingState_n(
}
void TransportController::OnChannelGatheringState_n(
- TransportChannelImpl* channel) {
+ IceTransportInternal* channel) {
RTC_DCHECK(network_thread_->IsCurrent());
UpdateAggregateStates_n();
}
void TransportController::OnChannelCandidateGathered_n(
- TransportChannelImpl* channel,
+ IceTransportInternal* channel,
const Candidate& candidate) {
RTC_DCHECK(network_thread_->IsCurrent());
@@ -770,7 +771,7 @@ void TransportController::OnChannelCandidateGathered_n(
}
void TransportController::OnChannelCandidatesRemoved_n(
- TransportChannelImpl* channel,
+ IceTransportInternal* channel,
const Candidates& candidates) {
invoker_.AsyncInvoke<void>(
RTC_FROM_HERE, signaling_thread_,
@@ -785,7 +786,7 @@ void TransportController::OnChannelCandidatesRemoved(
}
void TransportController::OnChannelRoleConflict_n(
- TransportChannelImpl* channel) {
+ IceTransportInternal* channel) {
RTC_DCHECK(network_thread_->IsCurrent());
// Note: since the role conflict is handled entirely on the network thread,
// we don't need to worry about role conflicts occurring on two ports at once.
@@ -801,7 +802,7 @@ void TransportController::OnChannelRoleConflict_n(
}
void TransportController::OnChannelStateChanged_n(
- TransportChannelImpl* channel) {
+ IceTransportInternal* channel) {
RTC_DCHECK(network_thread_->IsCurrent());
LOG(LS_INFO) << channel->transport_name() << " TransportChannel "
<< channel->component()
@@ -822,22 +823,24 @@ void TransportController::UpdateAggregateStates_n() {
bool all_done_gathering = !channels_.empty();
for (const auto& channel : channels_) {
any_receiving = any_receiving || channel->dtls()->receiving();
- any_failed =
- any_failed ||
- channel->dtls()->GetState() == TransportChannelState::STATE_FAILED;
+ any_failed = any_failed ||
+ channel->dtls()->ice_transport()->GetState() ==
+ IceTransportState::STATE_FAILED;
all_connected = all_connected && channel->dtls()->writable();
all_completed =
all_completed && channel->dtls()->writable() &&
- channel->dtls()->GetState() == TransportChannelState::STATE_COMPLETED &&
- channel->dtls()->GetIceRole() == ICEROLE_CONTROLLING &&
- channel->dtls()->gathering_state() == kIceGatheringComplete;
+ channel->dtls()->ice_transport()->GetState() ==
+ IceTransportState::STATE_COMPLETED &&
+ channel->dtls()->ice_transport()->GetIceRole() == ICEROLE_CONTROLLING &&
+ channel->dtls()->ice_transport()->gathering_state() ==
+ kIceGatheringComplete;
any_gathering =
- any_gathering || channel->dtls()->gathering_state() != kIceGatheringNew;
- all_done_gathering =
- all_done_gathering &&
- channel->dtls()->gathering_state() == kIceGatheringComplete;
+ any_gathering ||
+ channel->dtls()->ice_transport()->gathering_state() != kIceGatheringNew;
+ all_done_gathering = all_done_gathering &&
+ channel->dtls()->ice_transport()->gathering_state() ==
+ kIceGatheringComplete;
}
-
if (any_failed) {
new_connection_state = kIceConnectionFailed;
} else if (all_completed) {
« webrtc/p2p/base/packettransportinterface.h ('K') | « webrtc/p2p/base/transportcontroller.h ('k') | webrtc/p2p/base/transportcontroller_unittest.cc » ('j') | webrtc/pc/channel.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698