Index: webrtc/tools/network_tester/test_controller.cc |
diff --git a/webrtc/tools/network_tester/test_controller.cc b/webrtc/tools/network_tester/test_controller.cc |
index 44a16148b2d3704b70f6b3864c9d920f2ff2f5d1..51deac7bb726968dee0a7d6228c7c5c1949751d3 100644 |
--- a/webrtc/tools/network_tester/test_controller.cc |
+++ b/webrtc/tools/network_tester/test_controller.cc |
@@ -16,7 +16,8 @@ TestController::TestController(int min_port, |
int max_port, |
const std::string& config_file_path, |
const std::string& log_file_path) |
- : config_file_path_(config_file_path), |
+ : socket_factory_(rtc::ThreadManager::Instance()->WrapCurrentThread()), |
+ config_file_path_(config_file_path), |
packet_logger_(log_file_path), |
local_test_done_(false), |
remote_test_done_(false) { |
@@ -101,6 +102,9 @@ void TestController::OnReadPacket(rtc::AsyncPacketSocket* socket, |
case NetworkTesterPacket::TEST_START: { |
packet_sender_.reset(new PacketSender(this, config_file_path_)); |
packet_sender_->StartSending(); |
+ rtc::CritScope scoped_lock(&local_test_done_lock_); |
+ local_test_done_ = false; |
+ remote_test_done_ = false; |
break; |
} |
case NetworkTesterPacket::TEST_DATA: { |