zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove most of api/ortc/.

Browse Source 
It's not currently used or maintained, so it shouldn't be a part of out API.

Bug: webrtc:9824
Change-Id: Ic44c5ea3a9eab8fb75e87a5005cbf6cdd4b1d4ad
Reviewed-on: https://webrtc-review.googlesource.com/c/107645
Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Minyue Li <minyue@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25593}
This commit is contained in:
Jonas Olsson
2018-11-12 10:12:47 +01:00
committed by Commit Bot
parent 8584667583
commit cfe3b6afd9
16 changed files with 13 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtc_tools/network_tester/BUILD.gn
View File

@ -44,6 +44,7 @@ if (rtc_enable_protobuf) {
"../../p2p",
"../../rtc_base:checks",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:sequenced_task_checker",

17
rtc_tools/network_tester/test_controller.cc
View File

@ -10,6 +10,9 @@
#include "rtc_tools/network_tester/test_controller.h"
#include "absl/types/optional.h"
#include "rtc_base/thread.h"
namespace webrtc {
TestController::TestController(int min_port,
@ -24,17 +27,15 @@ TestController::TestController(int min_port,
RTC_DCHECK_RUN_ON(&test_controller_thread_checker_);
packet_sender_checker_.Detach();
send_data_.fill(42);
auto socket =
udp_socket_ =
std::unique_ptr<rtc::AsyncPacketSocket>(socket_factory_.CreateUdpSocket(
rtc::SocketAddress(rtc::GetAnyIP(AF_INET), 0), min_port, max_port));
socket->SignalReadPacket.connect(this, &TestController::OnReadPacket);
udp_transport_.reset(
new cricket::UdpTransport("network tester transport", std::move(socket)));
udp_socket_->SignalReadPacket.connect(this, &TestController::OnReadPacket);
}
void TestController::SendConnectTo(const std::string& hostname, int port) {
RTC_DCHECK_RUN_ON(&test_controller_thread_checker_);
udp_transport_->SetRemoteAddress(rtc::SocketAddress(hostname, port));
remote_address_ = rtc::SocketAddress(hostname, port);
NetworkTesterPacket packet;
packet.set_type(NetworkTesterPacket::HAND_SHAKING);
SendData(packet, absl::nullopt);
@ -57,8 +58,8 @@ void TestController::SendData(const NetworkTesterPacket& packet,
packet.SerializeToArray(&send_data_[1], std::numeric_limits<char>::max());
if (data_size && *data_size > packet_size)
packet_size = *data_size;
udp_transport_->SendPacket(send_data_.data(), packet_size,
rtc::PacketOptions(), 0);
udp_socket_->SendTo((const void*)send_data_.data(), packet_size,
remote_address_, rtc::PacketOptions());
}
void TestController::OnTestDone() {
@ -91,7 +92,7 @@ void TestController::OnReadPacket(rtc::AsyncPacketSocket* socket,
case NetworkTesterPacket::HAND_SHAKING: {
NetworkTesterPacket packet;
packet.set_type(NetworkTesterPacket::TEST_START);
udp_transport_->SetRemoteAddress(remote_addr);
remote_address_ = remote_addr;
SendData(packet, absl::nullopt);
packet_sender_.reset(new PacketSender(this, config_file_path_));
packet_sender_->StartSending();

5
rtc_tools/network_tester/test_controller.h
View File

@ -18,7 +18,7 @@
#include <utility>
#include "p2p/base/basicpacketsocketfactory.h"
#include "p2p/base/udptransport.h"
#include "rtc_base/asyncpacketsocket.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_tools/network_tester/packet_logger.h"
@ -70,7 +70,8 @@ class TestController : public sigslot::has_slots<> {
bool local_test_done_ RTC_GUARDED_BY(local_test_done_lock_);
bool remote_test_done_;
std::array<char, kEthernetMtu> send_data_;
std::unique_ptr<cricket::UdpTransport> udp_transport_;
std::unique_ptr<rtc::AsyncPacketSocket> udp_socket_;
rtc::SocketAddress remote_address_;
std::unique_ptr<PacketSender> packet_sender_;
RTC_DISALLOW_COPY_AND_ASSIGN(TestController);