diff --git a/api/BUILD.gn b/api/BUILD.gn index dce687e76b..1f03468d65 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -335,6 +335,7 @@ rtc_library("libjingle_peerconnection_api") { ":turn_customizer", "../call:rtp_interfaces", "../p2p:connection", + "../p2p:port_allocator", "../p2p:rtc_p2p", "../pc:media_factory", "../rtc_base:copy_on_write_buffer", @@ -940,6 +941,7 @@ rtc_library("ice_transport_factory") { "../p2p:ice_transport_internal", "../p2p:p2p_constants", "../p2p:p2p_transport_channel", + "../p2p:port_allocator", "../p2p:rtc_p2p", "../rtc_base:threading", "../rtc_base/system:rtc_export", diff --git a/api/test/pclf/BUILD.gn b/api/test/pclf/BUILD.gn index 20d7077449..68f1688556 100644 --- a/api/test/pclf/BUILD.gn +++ b/api/test/pclf/BUILD.gn @@ -75,6 +75,7 @@ rtc_library("media_quality_test_params") { "../../../api/video_codecs:video_codecs_api", "../../../modules/audio_processing:api", "../../../p2p:connection", + "../../../p2p:port_allocator", "../../../p2p:rtc_p2p", "../../../rtc_base:network", "../../../rtc_base:rtc_certificate_generator", diff --git a/examples/BUILD.gn b/examples/BUILD.gn index d6940e2cba..941d62c962 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -703,6 +703,7 @@ if (is_linux || is_chromeos || is_win) { "../media:media_channel", "../media:rtc_media_base", "../p2p:connection", + "../p2p:port_allocator", "../p2p:rtc_p2p", "../pc:video_track_source", "../rtc_base:async_dns_resolver", diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index 5b7f07e361..05db81ad96 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -19,7 +19,6 @@ rtc_library("rtc_p2p") { visibility = [ "*" ] sources = [ # TODO(bugs.webrtc.org/15769): Finish cleanup and remove. - "base/active_ice_controller_factory_interface.h", # To be removed (Chrome) "base/active_ice_controller_interface.h", # To be removed (Internal) "base/basic_ice_controller.h", # To be removed (Chrome) @@ -258,13 +257,53 @@ rtc_library("basic_packet_socket_factory") { absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] } +rtc_library("basic_port_allocator") { + sources = [ + "client/basic_port_allocator.cc", + "client/basic_port_allocator.h", + ] + deps = [ + ":basic_packet_socket_factory", + ":port", + ":port_allocator", + ":relay_port_factory_interface", + ":rtc_p2p", + ":stun_port", + ":tcp_port", + ":turn_port", + ":turn_port_factory", + ":udp_port", + "../api:field_trials_view", + "../api:turn_customizer", + "../api/task_queue:pending_task_safety_flag", + "../api/transport:field_trial_based_config", + "../api/units:time_delta", + "../rtc_base:checks", + "../rtc_base:event_tracer", + "../rtc_base:logging", + "../rtc_base:macromagic", + "../rtc_base:network", + "../rtc_base:network_constants", + "../rtc_base:ssl", + "../rtc_base:stringutils", + "../rtc_base:threading", + "../rtc_base/experiments:field_trial_parser", + "../rtc_base/memory:always_valid_pointer", + "../rtc_base/network:received_packet", + "../rtc_base/system:rtc_export", + "../system_wrappers:metrics", + ] + absl_deps = [ + "//third_party/abseil-cpp/absl/algorithm:container", + "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/strings:string_view", + ] +} + rtc_source_set("candidate_pair_interface") { sources = [ "base/candidate_pair_interface.h" ] } -# This set of files is too intertwined to break into separate -# targets at this point. -# TODO(bugs.webrtc.org/15796): Finish breakup rtc_library("connection") { sources = [ "base/connection.cc", @@ -857,7 +896,7 @@ rtc_library("transport_description_factory") { ] deps = [ ":ice_credentials_iterator", - ":rtc_p2p", + ":transport_description", "../api:field_trials_view", "../rtc_base:logging", "../rtc_base:ssl", @@ -869,6 +908,7 @@ rtc_source_set("transport_info") { deps = [ ":p2p_constants", ":rtc_p2p", + ":transport_description", "../api:candidate", "../rtc_base:ssl", ] @@ -879,51 +919,32 @@ rtc_source_set("udp_port") { deps = [ ":stun_port" ] } -rtc_library("basic_port_allocator_and_turn_port") { +rtc_library("turn_port") { sources = [ "base/turn_port.cc", "base/turn_port.h", - "client/basic_port_allocator.cc", - "client/basic_port_allocator.h", - "client/turn_port_factory.cc", - "client/turn_port_factory.h", ] deps = [ - ":basic_packet_socket_factory", ":connection", ":p2p_constants", ":port", ":port_allocator", ":relay_port_factory_interface", - ":stun_port", - ":tcp_port", - ":udp_port", "../api:async_dns_resolver", - "../api:field_trials_view", "../api:turn_customizer", "../api/task_queue", "../api/task_queue:pending_task_safety_flag", - "../api/transport:field_trial_based_config", "../api/transport:stun_types", - "../api/units:time_delta", "../rtc_base:async_packet_socket", "../rtc_base:byte_order", "../rtc_base:checks", - "../rtc_base:event_tracer", "../rtc_base:logging", - "../rtc_base:macromagic", "../rtc_base:net_helpers", - "../rtc_base:network", - "../rtc_base:network_constants", "../rtc_base:socket_address", "../rtc_base:ssl", "../rtc_base:stringutils", - "../rtc_base:threading", "../rtc_base/experiments:field_trial_parser", - "../rtc_base/memory:always_valid_pointer", "../rtc_base/network:received_packet", - "../rtc_base/system:rtc_export", - "../system_wrappers:metrics", ] absl_deps = [ "//third_party/abseil-cpp/absl/algorithm:container", @@ -934,6 +955,21 @@ rtc_library("basic_port_allocator_and_turn_port") { ] } +rtc_library("turn_port_factory") { + sources = [ + "client/turn_port_factory.cc", + "client/turn_port_factory.h", + ] + deps = [ + ":port", + ":port_allocator", + ":relay_port_factory_interface", + ":rtc_p2p", + ":turn_port", + "../rtc_base:async_packet_socket", + ] +} + rtc_source_set("relay_port_factory_interface") { sources = [ "client/relay_port_factory_interface.h" ] deps = [ @@ -996,7 +1032,7 @@ if (rtc_include_tests) { deps = [ ":basic_packet_socket_factory", ":connection", - ":rtc_p2p", + ":port_allocator", ":udp_port", "../rtc_base:net_helpers", "../rtc_base:net_test_helpers", @@ -1037,7 +1073,6 @@ if (rtc_include_tests) { ":ice_transport_internal", ":p2p_server_utils", ":packet_transport_internal", - ":rtc_p2p", ":transport_description", "../api:dtls_transport_interface", "../api:libjingle_peerconnection_api", @@ -1096,7 +1131,7 @@ if (rtc_include_tests) { ":async_stun_tcp_socket", ":basic_ice_controller", ":basic_packet_socket_factory", - ":basic_port_allocator_and_turn_port", + ":basic_port_allocator", ":connection", ":dtls_transport", ":fake_ice_transport", @@ -1108,6 +1143,8 @@ if (rtc_include_tests) { ":p2p_test_utils", ":p2p_transport_channel", ":packet_transport_internal", + ":port", + ":port_allocator", ":port_interface", ":pseudo_tcp", ":regathering_controller", @@ -1119,6 +1156,7 @@ if (rtc_include_tests) { ":tcp_port", ":transport_description", ":transport_description_factory", + ":turn_port", ":wrapping_active_ice_controller", "../api:array_view", "../api:candidate", @@ -1254,7 +1292,6 @@ if (rtc_include_tests) { ":basic_packet_socket_factory", ":libstunprober", ":p2p_test_utils", - ":rtc_p2p", "../rtc_base:checks", "../rtc_base:gunit_helpers", "../rtc_base:ip_address", diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc index 1fb3b38bfd..bc35a2250a 100644 --- a/p2p/base/turn_port.cc +++ b/p2p/base/turn_port.cc @@ -22,6 +22,7 @@ #include "absl/types/optional.h" #include "api/task_queue/pending_task_safety_flag.h" #include "api/transport/stun.h" +#include "api/turn_customizer.h" #include "p2p/base/connection.h" #include "p2p/base/p2p_constants.h" #include "rtc_base/async_packet_socket.h" diff --git a/p2p/base/turn_port.h b/p2p/base/turn_port.h index b56f862e61..099d8b258a 100644 --- a/p2p/base/turn_port.h +++ b/p2p/base/turn_port.h @@ -25,7 +25,8 @@ #include "api/task_queue/pending_task_safety_flag.h" #include "api/task_queue/task_queue_base.h" #include "p2p/base/port.h" -#include "p2p/client/basic_port_allocator.h" +#include "p2p/base/port_allocator.h" +#include "p2p/client/relay_port_factory_interface.h" #include "rtc_base/async_packet_socket.h" #include "rtc_base/network/received_packet.h" #include "rtc_base/ssl_certificate.h" diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 92eae42a46..1734ab551c 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -316,6 +316,8 @@ rtc_source_set("jsep_transport_controller") { "../p2p:p2p_constants", "../p2p:p2p_transport_channel", "../p2p:packet_transport_internal", + "../p2p:port", + "../p2p:port_allocator", "../p2p:rtc_p2p", "../p2p:transport_description", "../p2p:transport_info", @@ -671,6 +673,7 @@ rtc_source_set("transport_stats") { "../p2p:connection", "../p2p:dtls_transport_internal", "../p2p:ice_transport_internal", + "../p2p:port", "../p2p:rtc_p2p", "../rtc_base:ssl", ] @@ -953,6 +956,7 @@ rtc_source_set("rtc_stats_collector") { "../p2p:connection_info", "../p2p:ice_transport_internal", "../p2p:p2p_constants", + "../p2p:port", "../p2p:rtc_p2p", "../rtc_base:checks", "../rtc_base:event_tracer", @@ -1050,6 +1054,8 @@ rtc_source_set("sdp_offer_answer") { "../p2p:ice_transport_internal", "../p2p:p2p_constants", "../p2p:p2p_transport_channel", + "../p2p:port", + "../p2p:port_allocator", "../p2p:rtc_p2p", "../p2p:transport_description", "../p2p:transport_description_factory", @@ -1165,6 +1171,8 @@ rtc_source_set("peer_connection") { "../p2p:ice_transport_internal", "../p2p:p2p_constants", "../p2p:p2p_transport_channel", + "../p2p:port", + "../p2p:port_allocator", "../p2p:rtc_p2p", "../p2p:transport_description", "../p2p:transport_info", @@ -1263,6 +1271,7 @@ rtc_source_set("legacy_stats_collector") { "../p2p:connection_info", "../p2p:ice_transport_internal", "../p2p:p2p_constants", + "../p2p:port", "../p2p:rtc_p2p", "../rtc_base:checks", "../rtc_base:event_tracer", @@ -1340,6 +1349,7 @@ rtc_source_set("webrtc_sdp") { "../p2p:connection", "../p2p:ice_transport_internal", "../p2p:p2p_constants", + "../p2p:port", "../p2p:port_interface", "../p2p:rtc_p2p", "../p2p:transport_description", @@ -1407,6 +1417,8 @@ rtc_library("ice_server_parsing") { "../api:libjingle_peerconnection_api", "../api:rtc_error", "../p2p:connection", + "../p2p:port", + "../p2p:port_allocator", "../p2p:port_interface", "../p2p:rtc_p2p", "../rtc_base:checks", @@ -1471,9 +1483,10 @@ rtc_source_set("peer_connection_factory") { "../call:rtp_sender", "../media:rtc_media_base", "../p2p:basic_packet_socket_factory", - "../p2p:basic_port_allocator_and_turn_port", + "../p2p:basic_port_allocator", "../p2p:connection", "../p2p:default_ice_transport_factory", + "../p2p:port_allocator", "../p2p:rtc_p2p", "../pc:audio_track", "../pc:connection_context", @@ -2197,9 +2210,10 @@ if (rtc_include_tests && !build_with_chromium) { "../media:rtc_media_tests_utils", "../modules/audio_device:audio_device_api", "../modules/audio_processing:api", - "../p2p:basic_port_allocator_and_turn_port", + "../p2p:basic_port_allocator", "../p2p:connection", "../p2p:p2p_test_utils", + "../p2p:port_allocator", "../p2p:port_interface", "../p2p:rtc_p2p", "../rtc_base:checks", @@ -2254,6 +2268,7 @@ if (rtc_include_tests && !build_with_chromium) { "../p2p:connection", "../p2p:p2p_server_utils", "../p2p:p2p_test_utils", + "../p2p:port_allocator", "../p2p:port_interface", "../p2p:rtc_p2p", "../rtc_base:gunit_helpers", @@ -2434,7 +2449,7 @@ if (rtc_include_tests && !build_with_chromium) { "../modules/audio_device:audio_device_api", "../modules/audio_processing:audio_processing_statistics", "../modules/rtp_rtcp:rtp_rtcp_format", - "../p2p:basic_port_allocator_and_turn_port", + "../p2p:basic_port_allocator", "../p2p:connection", "../p2p:connection_info", "../p2p:dtls_transport_internal", @@ -2442,6 +2457,8 @@ if (rtc_include_tests && !build_with_chromium) { "../p2p:ice_transport_internal", "../p2p:p2p_constants", "../p2p:p2p_server_utils", + "../p2p:port", + "../p2p:port_allocator", "../p2p:port_interface", "../p2p:transport_description", "../p2p:transport_info", @@ -2653,7 +2670,7 @@ if (rtc_include_tests && !build_with_chromium) { "../modules/audio_processing:audio_processing_statistics", "../modules/audio_processing:audioproc_test_utils", "../modules/rtp_rtcp:rtp_rtcp_format", - "../p2p:basic_port_allocator_and_turn_port", + "../p2p:basic_port_allocator", "../p2p:connection", "../p2p:fake_ice_transport", "../p2p:fake_port_allocator", @@ -2661,6 +2678,8 @@ if (rtc_include_tests && !build_with_chromium) { "../p2p:p2p_constants", "../p2p:p2p_server_utils", "../p2p:p2p_test_utils", + "../p2p:port", + "../p2p:port_allocator", "../p2p:port_interface", "../p2p:rtc_p2p", "../rtc_base:checks", @@ -2811,6 +2830,7 @@ if (rtc_include_tests && !build_with_chromium) { "../p2p:connection", "../p2p:fake_port_allocator", "../p2p:p2p_test_utils", + "../p2p:port_allocator", "../p2p:rtc_p2p", "../rtc_base:checks", "../rtc_base:gunit_helpers", diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn index 8f1e0d6f80..e9bd263ed9 100644 --- a/test/network/BUILD.gn +++ b/test/network/BUILD.gn @@ -130,7 +130,7 @@ if (rtc_include_tests && !build_with_chromium) { "../../media:rtc_audio_video", "../../modules/audio_device:test_audio_device_module", "../../p2p:basic_packet_socket_factory", - "../../p2p:basic_port_allocator_and_turn_port", + "../../p2p:basic_port_allocator", "../../p2p:rtc_p2p", "../../pc:pc_test_utils", "../../pc:peerconnection_wrapper", diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn index eca7b1b353..22c9ee48d2 100644 --- a/test/pc/e2e/BUILD.gn +++ b/test/pc/e2e/BUILD.gn @@ -109,7 +109,7 @@ if (!build_with_chromium) { "../../../api/video_codecs:builtin_video_encoder_factory", "../../../modules/audio_device:test_audio_device_module", "../../../modules/audio_processing/aec_dump", - "../../../p2p:basic_port_allocator_and_turn_port", + "../../../p2p:basic_port_allocator", "../../../p2p:rtc_p2p", "../../../rtc_base:threading", "analyzer/video:quality_analyzing_video_encoder", diff --git a/test/peer_scenario/BUILD.gn b/test/peer_scenario/BUILD.gn index bfd9f4617b..e1d164a47d 100644 --- a/test/peer_scenario/BUILD.gn +++ b/test/peer_scenario/BUILD.gn @@ -53,7 +53,7 @@ if (rtc_include_tests) { "../../media:rtp_utils", "../../modules/audio_device:test_audio_device_module", "../../modules/rtp_rtcp:rtp_rtcp_format", - "../../p2p:basic_port_allocator_and_turn_port", + "../../p2p:basic_port_allocator", "../../p2p:rtc_p2p", "../../p2p:transport_description", "../../pc:channel",