diff --git a/test/pc/e2e/peer_connection_e2e_smoke_test.cc b/test/pc/e2e/peer_connection_e2e_smoke_test.cc index 6dc5539bda..b8259f63e2 100644 --- a/test/pc/e2e/peer_connection_e2e_smoke_test.cc +++ b/test/pc/e2e/peer_connection_e2e_smoke_test.cc @@ -29,7 +29,7 @@ namespace test { namespace { std::unique_ptr CreateFakeNetworkManager( - std::vector endpoints) { + std::vector endpoints) { auto network_manager = absl::make_unique(); for (auto* endpoint : endpoints) { network_manager->AddInterface( @@ -80,9 +80,9 @@ TEST(PeerConnectionE2EQualityTestSmokeTest, RunWithEmulatedNetwork) { absl::make_unique(BuiltInNetworkBehaviorConfig())); EmulatedNetworkNode* bob_node = network_emulation_manager.CreateEmulatedNode( absl::make_unique(BuiltInNetworkBehaviorConfig())); - EndpointNode* alice_endpoint = + EmulatedEndpoint* alice_endpoint = network_emulation_manager.CreateEndpoint(EndpointConfig()); - EndpointNode* bob_endpoint = + EmulatedEndpoint* bob_endpoint = network_emulation_manager.CreateEndpoint(EndpointConfig()); network_emulation_manager.CreateRoute(alice_endpoint, {alice_node}, bob_endpoint); diff --git a/test/scenario/network/fake_network_socket.h b/test/scenario/network/fake_network_socket.h index fcd9d27d66..26013d95dd 100644 --- a/test/scenario/network/fake_network_socket.h +++ b/test/scenario/network/fake_network_socket.h @@ -39,7 +39,7 @@ class SocketManager { virtual void WakeUp() = 0; virtual void Unregister(SocketIoProcessor* io_processor) = 0; // Provides endpoints by IP address. - virtual EndpointNode* GetEndpointNode(const rtc::IPAddress& ip) = 0; + virtual EmulatedEndpoint* GetEndpointNode(const rtc::IPAddress& ip) = 0; }; // Represents a socket, which will operate with emulated network. @@ -50,7 +50,7 @@ class FakeNetworkSocket : public rtc::AsyncSocket, explicit FakeNetworkSocket(SocketManager* scoket_manager); ~FakeNetworkSocket() override; - // Will be invoked by EndpointNode to deliver packets into this socket. + // Will be invoked by EmulatedEndpoint to deliver packets into this socket. void OnPacketReceived(EmulatedIpPacket packet) override; // Will fire read event for incoming packets. bool ProcessIo() override; @@ -82,7 +82,7 @@ class FakeNetworkSocket : public rtc::AsyncSocket, absl::optional PopFrontPacket(); SocketManager* const socket_manager_; - EndpointNode* endpoint_; + EmulatedEndpoint* endpoint_; rtc::SocketAddress local_addr_; rtc::SocketAddress remote_addr_; diff --git a/test/scenario/network/fake_network_socket_server.cc b/test/scenario/network/fake_network_socket_server.cc index b7d1fc4984..6447e650d5 100644 --- a/test/scenario/network/fake_network_socket_server.cc +++ b/test/scenario/network/fake_network_socket_server.cc @@ -17,7 +17,7 @@ namespace test { FakeNetworkSocketServer::FakeNetworkSocketServer( Clock* clock, - std::vector endpoints) + std::vector endpoints) : clock_(clock), endpoints_(std::move(endpoints)), wakeup_(/*manual_reset=*/false, /*initially_signaled=*/false) {} @@ -27,7 +27,7 @@ void FakeNetworkSocketServer::OnMessageQueueDestroyed() { msg_queue_ = nullptr; } -EndpointNode* FakeNetworkSocketServer::GetEndpointNode( +EmulatedEndpoint* FakeNetworkSocketServer::GetEndpointNode( const rtc::IPAddress& ip) { for (auto* endpoint : endpoints_) { rtc::IPAddress peerLocalAddress = endpoint->GetPeerLocalAddress(); diff --git a/test/scenario/network/fake_network_socket_server.h b/test/scenario/network/fake_network_socket_server.h index f0f94969c8..76b13690ca 100644 --- a/test/scenario/network/fake_network_socket_server.h +++ b/test/scenario/network/fake_network_socket_server.h @@ -34,10 +34,11 @@ class FakeNetworkSocketServer : public rtc::SocketServer, public sigslot::has_slots<>, public SocketManager { public: - FakeNetworkSocketServer(Clock* clock, std::vector endpoints); + FakeNetworkSocketServer(Clock* clock, + std::vector endpoints); ~FakeNetworkSocketServer() override; - EndpointNode* GetEndpointNode(const rtc::IPAddress& ip) override; + EmulatedEndpoint* GetEndpointNode(const rtc::IPAddress& ip) override; void Unregister(SocketIoProcessor* io_processor) override; void OnMessageQueueDestroyed(); @@ -56,7 +57,7 @@ class FakeNetworkSocketServer : public rtc::SocketServer, Timestamp Now() const; Clock* const clock_; - const std::vector endpoints_; + const std::vector endpoints_; rtc::Event wakeup_; rtc::MessageQueue* msg_queue_; diff --git a/test/scenario/network/network_emulation.cc b/test/scenario/network/network_emulation.cc index 9fd49254f8..7fb4fd595f 100644 --- a/test/scenario/network/network_emulation.cc +++ b/test/scenario/network/network_emulation.cc @@ -129,26 +129,26 @@ void EmulatedNetworkNode::RemoveReceiver(uint64_t dest_endpoint_id) { routing_.erase(dest_endpoint_id); } -EndpointNode::EndpointNode(uint64_t id, rtc::IPAddress ip, Clock* clock) +EmulatedEndpoint::EmulatedEndpoint(uint64_t id, rtc::IPAddress ip, Clock* clock) : id_(id), peer_local_addr_(ip), send_node_(nullptr), clock_(clock), next_port_(kFirstEphemeralPort), connected_endpoint_id_(absl::nullopt) {} -EndpointNode::~EndpointNode() = default; +EmulatedEndpoint::~EmulatedEndpoint() = default; -uint64_t EndpointNode::GetId() const { +uint64_t EmulatedEndpoint::GetId() const { return id_; } -void EndpointNode::SetSendNode(EmulatedNetworkNode* send_node) { +void EmulatedEndpoint::SetSendNode(EmulatedNetworkNode* send_node) { send_node_ = send_node; } -void EndpointNode::SendPacket(const rtc::SocketAddress& from, - const rtc::SocketAddress& to, - rtc::CopyOnWriteBuffer packet) { +void EmulatedEndpoint::SendPacket(const rtc::SocketAddress& from, + const rtc::SocketAddress& to, + rtc::CopyOnWriteBuffer packet) { RTC_CHECK(from.ipaddr() == peer_local_addr_); RTC_CHECK(connected_endpoint_id_); RTC_CHECK(send_node_); @@ -157,7 +157,7 @@ void EndpointNode::SendPacket(const rtc::SocketAddress& from, Timestamp::us(clock_->TimeInMicroseconds()))); } -absl::optional EndpointNode::BindReceiver( +absl::optional EmulatedEndpoint::BindReceiver( uint16_t desired_port, EmulatedNetworkReceiverInterface* receiver) { rtc::CritScope crit(&receiver_lock_); @@ -188,7 +188,7 @@ absl::optional EndpointNode::BindReceiver( return port; } -uint16_t EndpointNode::NextPort() { +uint16_t EmulatedEndpoint::NextPort() { uint16_t out = next_port_; if (next_port_ == std::numeric_limits::max()) { next_port_ = kFirstEphemeralPort; @@ -198,16 +198,16 @@ uint16_t EndpointNode::NextPort() { return out; } -void EndpointNode::UnbindReceiver(uint16_t port) { +void EmulatedEndpoint::UnbindReceiver(uint16_t port) { rtc::CritScope crit(&receiver_lock_); port_to_receiver_.erase(port); } -rtc::IPAddress EndpointNode::GetPeerLocalAddress() const { +rtc::IPAddress EmulatedEndpoint::GetPeerLocalAddress() const { return peer_local_addr_; } -void EndpointNode::OnPacketReceived(EmulatedIpPacket packet) { +void EmulatedEndpoint::OnPacketReceived(EmulatedIpPacket packet) { RTC_CHECK(packet.dest_endpoint_id == id_) << "Routing error: wrong destination endpoint. Destination id: " << packet.dest_endpoint_id << "; Receiver id: " << id_; @@ -227,11 +227,11 @@ void EndpointNode::OnPacketReceived(EmulatedIpPacket packet) { it->second->OnPacketReceived(std::move(packet)); } -EmulatedNetworkNode* EndpointNode::GetSendNode() const { +EmulatedNetworkNode* EmulatedEndpoint::GetSendNode() const { return send_node_; } -void EndpointNode::SetConnectedEndpointId(uint64_t endpoint_id) { +void EmulatedEndpoint::SetConnectedEndpointId(uint64_t endpoint_id) { connected_endpoint_id_ = endpoint_id; } diff --git a/test/scenario/network/network_emulation.h b/test/scenario/network/network_emulation.h index d133337f0f..9486a806ea 100644 --- a/test/scenario/network/network_emulation.h +++ b/test/scenario/network/network_emulation.h @@ -112,10 +112,10 @@ class EmulatedNetworkNode : public EmulatedNetworkReceiverInterface { // It will be used as sender from socket side to send data to the network and // will act as packet receiver from emulated network side to receive packets // from other EmulatedNetworkNodes. -class EndpointNode : public EmulatedNetworkReceiverInterface { +class EmulatedEndpoint : public EmulatedNetworkReceiverInterface { public: - EndpointNode(uint64_t id, rtc::IPAddress, Clock* clock); - ~EndpointNode() override; + EmulatedEndpoint(uint64_t id, rtc::IPAddress, Clock* clock); + ~EmulatedEndpoint() override; uint64_t GetId() const; diff --git a/test/scenario/network/network_emulation_manager.cc b/test/scenario/network/network_emulation_manager.cc index 7558cb4921..141ad0c572 100644 --- a/test/scenario/network/network_emulation_manager.cc +++ b/test/scenario/network/network_emulation_manager.cc @@ -67,7 +67,8 @@ EmulatedNetworkNode* NetworkEmulationManager::CreateEmulatedNode( return out; } -EndpointNode* NetworkEmulationManager::CreateEndpoint(EndpointConfig config) { +EmulatedEndpoint* NetworkEmulationManager::CreateEndpoint( + EndpointConfig config) { absl::optional ip = config.ip; if (!ip) { switch (config.generated_ip_family) { @@ -85,16 +86,16 @@ EndpointNode* NetworkEmulationManager::CreateEndpoint(EndpointConfig config) { bool res = used_ip_addresses_.insert(*ip).second; RTC_CHECK(res) << "IP=" << ip->ToString() << " already in use"; - auto node = absl::make_unique(next_node_id_++, *ip, clock_); - EndpointNode* out = node.get(); + auto node = absl::make_unique(next_node_id_++, *ip, clock_); + EmulatedEndpoint* out = node.get(); endpoints_.push_back(std::move(node)); return out; } void NetworkEmulationManager::CreateRoute( - EndpointNode* from, + EmulatedEndpoint* from, std::vector via_nodes, - EndpointNode* to) { + EmulatedEndpoint* to) { // Because endpoint has no send node by default at least one should be // provided here. RTC_CHECK(!via_nodes.empty()); @@ -110,9 +111,9 @@ void NetworkEmulationManager::CreateRoute( } void NetworkEmulationManager::ClearRoute( - EndpointNode* from, + EmulatedEndpoint* from, std::vector via_nodes, - EndpointNode* to) { + EmulatedEndpoint* to) { // Remove receiver from intermediate nodes. for (auto* node : via_nodes) { node->RemoveReceiver(to->GetId()); @@ -127,7 +128,7 @@ void NetworkEmulationManager::ClearRoute( TrafficRoute* NetworkEmulationManager::CreateTrafficRoute( std::vector via_nodes) { RTC_CHECK(!via_nodes.empty()); - EndpointNode* endpoint = CreateEndpoint(EndpointConfig()); + EmulatedEndpoint* endpoint = CreateEndpoint(EndpointConfig()); // Setup a route via specified nodes. EmulatedNetworkNode* cur_node = via_nodes[0]; @@ -179,7 +180,7 @@ PulsedPeaksCrossTraffic* NetworkEmulationManager::CreatePulsedPeaksCrossTraffic( } rtc::Thread* NetworkEmulationManager::CreateNetworkThread( - std::vector endpoints) { + std::vector endpoints) { FakeNetworkSocketServer* socket_server = CreateSocketServer(endpoints); std::unique_ptr network_thread = absl::make_unique(socket_server); @@ -192,7 +193,7 @@ rtc::Thread* NetworkEmulationManager::CreateNetworkThread( } FakeNetworkSocketServer* NetworkEmulationManager::CreateSocketServer( - std::vector endpoints) { + std::vector endpoints) { auto socket_server = absl::make_unique(clock_, endpoints); FakeNetworkSocketServer* out = socket_server.get(); diff --git a/test/scenario/network/network_emulation_manager.h b/test/scenario/network/network_emulation_manager.h index 3f204434f3..7fb8a6e0e9 100644 --- a/test/scenario/network/network_emulation_manager.h +++ b/test/scenario/network/network_emulation_manager.h @@ -55,14 +55,14 @@ class NetworkEmulationManager { EmulatedNetworkNode* CreateEmulatedNode( std::unique_ptr network_behavior); - EndpointNode* CreateEndpoint(EndpointConfig config); + EmulatedEndpoint* CreateEndpoint(EndpointConfig config); - void CreateRoute(EndpointNode* from, + void CreateRoute(EmulatedEndpoint* from, std::vector via_nodes, - EndpointNode* to); - void ClearRoute(EndpointNode* from, + EmulatedEndpoint* to); + void ClearRoute(EmulatedEndpoint* from, std::vector via_nodes, - EndpointNode* to); + EmulatedEndpoint* to); TrafficRoute* CreateTrafficRoute(std::vector via_nodes); RandomWalkCrossTraffic* CreateRandomWalkCrossTraffic( @@ -72,11 +72,11 @@ class NetworkEmulationManager { TrafficRoute* traffic_route, PulsedPeaksConfig config); - rtc::Thread* CreateNetworkThread(std::vector endpoints); + rtc::Thread* CreateNetworkThread(std::vector endpoints); private: FakeNetworkSocketServer* CreateSocketServer( - std::vector endpoints); + std::vector endpoints); absl::optional GetNextIPv4Address(); void ProcessNetworkPackets(); Timestamp Now() const; @@ -90,7 +90,7 @@ class NetworkEmulationManager { std::set used_ip_addresses_; // All objects can be added to the manager only when it is idle. - std::vector> endpoints_; + std::vector> endpoints_; std::vector> network_nodes_; std::vector> traffic_routes_; std::vector> random_cross_traffics_; diff --git a/test/scenario/network/network_emulation_pc_unittest.cc b/test/scenario/network/network_emulation_pc_unittest.cc index 0f61e2ca5e..36e1e2b19a 100644 --- a/test/scenario/network/network_emulation_pc_unittest.cc +++ b/test/scenario/network/network_emulation_pc_unittest.cc @@ -108,9 +108,10 @@ TEST(NetworkEmulationManagerPCTest, Run) { absl::make_unique(BuiltInNetworkBehaviorConfig())); EmulatedNetworkNode* bob_node = network_manager.CreateEmulatedNode( absl::make_unique(BuiltInNetworkBehaviorConfig())); - EndpointNode* alice_endpoint = + EmulatedEndpoint* alice_endpoint = + network_manager.CreateEndpoint(EndpointConfig()); + EmulatedEndpoint* bob_endpoint = network_manager.CreateEndpoint(EndpointConfig()); - EndpointNode* bob_endpoint = network_manager.CreateEndpoint(EndpointConfig()); network_manager.CreateRoute(alice_endpoint, {alice_node}, bob_endpoint); network_manager.CreateRoute(bob_endpoint, {bob_node}, alice_endpoint); diff --git a/test/scenario/network/network_emulation_unittest.cc b/test/scenario/network/network_emulation_unittest.cc index 09932f0456..351d6026fb 100644 --- a/test/scenario/network/network_emulation_unittest.cc +++ b/test/scenario/network/network_emulation_unittest.cc @@ -63,7 +63,7 @@ TEST(NetworkEmulationManagerTest, GeneratedIpv4AddressDoesNotCollide) { EndpointConfig config; config.generated_ip_family = EndpointConfig::IpAddressFamily::kIpv4; for (int i = 0; i < 1000; i++) { - EndpointNode* endpoint = network_manager.CreateEndpoint(config); + EmulatedEndpoint* endpoint = network_manager.CreateEndpoint(config); ASSERT_EQ(endpoint->GetPeerLocalAddress().family(), AF_INET); bool result = ips.insert(endpoint->GetPeerLocalAddress()).second; ASSERT_TRUE(result); @@ -76,7 +76,7 @@ TEST(NetworkEmulationManagerTest, GeneratedIpv6AddressDoesNotCollide) { EndpointConfig config; config.generated_ip_family = EndpointConfig::IpAddressFamily::kIpv6; for (int i = 0; i < 1000; i++) { - EndpointNode* endpoint = network_manager.CreateEndpoint(config); + EmulatedEndpoint* endpoint = network_manager.CreateEndpoint(config); ASSERT_EQ(endpoint->GetPeerLocalAddress().family(), AF_INET6); bool result = ips.insert(endpoint->GetPeerLocalAddress()).second; ASSERT_TRUE(result); @@ -90,9 +90,10 @@ TEST(NetworkEmulationManagerTest, Run) { absl::make_unique(BuiltInNetworkBehaviorConfig())); EmulatedNetworkNode* bob_node = network_manager.CreateEmulatedNode( absl::make_unique(BuiltInNetworkBehaviorConfig())); - EndpointNode* alice_endpoint = + EmulatedEndpoint* alice_endpoint = + network_manager.CreateEndpoint(EndpointConfig()); + EmulatedEndpoint* bob_endpoint = network_manager.CreateEndpoint(EndpointConfig()); - EndpointNode* bob_endpoint = network_manager.CreateEndpoint(EndpointConfig()); network_manager.CreateRoute(alice_endpoint, {alice_node}, bob_endpoint); network_manager.CreateRoute(bob_endpoint, {bob_node}, alice_endpoint); diff --git a/test/scenario/network/traffic_route.cc b/test/scenario/network/traffic_route.cc index d82e2926eb..8af767310b 100644 --- a/test/scenario/network/traffic_route.cc +++ b/test/scenario/network/traffic_route.cc @@ -28,7 +28,7 @@ class NullReceiver : public EmulatedNetworkReceiverInterface { class ActionReceiver : public EmulatedNetworkReceiverInterface { public: - ActionReceiver(std::function action, EndpointNode* endpoint) + ActionReceiver(std::function action, EmulatedEndpoint* endpoint) : action_(action), endpoint_(endpoint) {} ~ActionReceiver() override = default; @@ -46,7 +46,7 @@ class ActionReceiver : public EmulatedNetworkReceiverInterface { std::function action_; // Endpoint and port will be used to free port in the endpoint after action // will be done. - EndpointNode* endpoint_; + EmulatedEndpoint* endpoint_; absl::optional port_ = absl::nullopt; }; @@ -54,7 +54,7 @@ class ActionReceiver : public EmulatedNetworkReceiverInterface { TrafficRoute::TrafficRoute(Clock* clock, EmulatedNetworkReceiverInterface* receiver, - EndpointNode* endpoint) + EmulatedEndpoint* endpoint) : clock_(clock), receiver_(receiver), endpoint_(endpoint) { null_receiver_ = absl::make_unique(); absl::optional port = diff --git a/test/scenario/network/traffic_route.h b/test/scenario/network/traffic_route.h index 42210b9679..1f138f4773 100644 --- a/test/scenario/network/traffic_route.h +++ b/test/scenario/network/traffic_route.h @@ -27,7 +27,7 @@ class TrafficRoute { public: TrafficRoute(Clock* clock, EmulatedNetworkReceiverInterface* receiver, - EndpointNode* endpoint); + EmulatedEndpoint* endpoint); ~TrafficRoute(); // Triggers sending of dummy packets with size |packet_size| bytes. @@ -42,7 +42,7 @@ class TrafficRoute { Clock* const clock_; EmulatedNetworkReceiverInterface* const receiver_; - EndpointNode* const endpoint_; + EmulatedEndpoint* const endpoint_; uint16_t null_receiver_port_; std::unique_ptr null_receiver_;