admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: rename endpoint_controller_ into endpoint_container_.

Browse Source 
Rename endpoint_controller_ into endpoint_container_ in network
emulation layer EmulatedNetworkManager.

Bug: webrtc:10138
Change-Id: If54030f1d2197e2e01b9b9c701e7bbe0dc55b7d1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130465
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27395}
This commit is contained in:
Artem Titov 2019-03-29 15:20:23 +01:00 committed by Commit Bot
parent 5c4d2ee615
commit bdecb3cdbe
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/scenario/network/emulated_network_manager.cc
View File

@ -20,9 +20,9 @@ namespace test {
EmulatedNetworkManager::EmulatedNetworkManager(
Clock* clock,
EndpointsContainer* endpoints_controller)
: endpoints_controller_(endpoints_controller),
socket_server_(clock, endpoints_controller),
EndpointsContainer* endpoints_container)
: endpoints_container_(endpoints_container),
socket_server_(clock, endpoints_container),
network_thread_(&socket_server_),
sent_first_update_(false),
start_count_(0) {
@ -31,7 +31,7 @@ EmulatedNetworkManager::EmulatedNetworkManager(
}
void EmulatedNetworkManager::EnableEndpoint(EmulatedEndpoint* endpoint) {
RTC_CHECK(endpoints_controller_->HasEndpoint(endpoint))
RTC_CHECK(endpoints_container_->HasEndpoint(endpoint))
<< "No such interface: " << endpoint->GetPeerLocalAddress().ToString();
network_thread_.PostTask(RTC_FROM_HERE, [this, endpoint]() {
endpoint->Enable();
@ -40,7 +40,7 @@ void EmulatedNetworkManager::EnableEndpoint(EmulatedEndpoint* endpoint) {
}
void EmulatedNetworkManager::DisableEndpoint(EmulatedEndpoint* endpoint) {
RTC_CHECK(endpoints_controller_->HasEndpoint(endpoint))
RTC_CHECK(endpoints_container_->HasEndpoint(endpoint))
<< "No such interface: " << endpoint->GetPeerLocalAddress().ToString();
network_thread_.PostTask(RTC_FROM_HERE, [this, endpoint]() {
endpoint->Disable();
@ -82,7 +82,7 @@ void EmulatedNetworkManager::UpdateNetworksOnce() {
std::vector<rtc::Network*> networks;
for (std::unique_ptr<rtc::Network>& net :
endpoints_controller_->GetEnabledNetworks()) {
endpoints_container_->GetEnabledNetworks()) {
net->set_default_local_address_provider(this);
networks.push_back(net.release());
}

5
test/scenario/network/emulated_network_manager.h
View File

@ -32,8 +32,7 @@ class EmulatedNetworkManager : public rtc::NetworkManagerBase,
public sigslot::has_slots<>,
public EmulatedNetworkManagerInterface {
public:
EmulatedNetworkManager(Clock* clock,
EndpointsContainer* endpoints_controller);
EmulatedNetworkManager(Clock* clock, EndpointsContainer* endpoints_container);
void EnableEndpoint(EmulatedEndpoint* endpoint);
void DisableEndpoint(EmulatedEndpoint* endpoint);
@ -51,7 +50,7 @@ class EmulatedNetworkManager : public rtc::NetworkManagerBase,
void UpdateNetworksOnce();
void MaybeSignalNetworksChanged();
EndpointsContainer* const endpoints_controller_;
EndpointsContainer* const endpoints_container_;
FakeNetworkSocketServer socket_server_;
rtc::Thread network_thread_;