Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 #if defined(WEBRTC_POSIX) | 10 #if defined(WEBRTC_POSIX) |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 265 &TurnPortTest::OnTurnPortError); | 265 &TurnPortTest::OnTurnPortError); |
| 266 turn_port_->SignalUnknownAddress.connect(this, | 266 turn_port_->SignalUnknownAddress.connect(this, |
| 267 &TurnPortTest::OnTurnUnknownAddress); | 267 &TurnPortTest::OnTurnUnknownAddress); |
| 268 turn_port_->SignalCreatePermissionResult.connect(this, | 268 turn_port_->SignalCreatePermissionResult.connect(this, |
| 269 &TurnPortTest::OnTurnCreatePermissionResult); | 269 &TurnPortTest::OnTurnCreatePermissionResult); |
| 270 } | 270 } |
| 271 void CreateUdpPort() { | 271 void CreateUdpPort() { |
| 272 udp_port_.reset(UDPPort::Create(main_, &socket_factory_, &network_, | 272 udp_port_.reset(UDPPort::Create(main_, &socket_factory_, &network_, |
| 273 kLocalAddr2.ipaddr(), 0, 0, | 273 kLocalAddr2.ipaddr(), 0, 0, |
| 274 kIceUfrag2, kIcePwd2, | 274 kIceUfrag2, kIcePwd2, |
| 275 std::string())); | 275 std::string(), false)); |
|
pthatcher1
2015/08/07 21:59:49
I'm still not a big fan of the parameter list grow
guoweis_webrtc
2015/08/13 15:08:52
struct?
min_port, max_port could be combined to p
| |
| 276 // Set protocol type to RFC5245, as turn port is also in same mode. | 276 // Set protocol type to RFC5245, as turn port is also in same mode. |
| 277 // UDP port will be controlled. | 277 // UDP port will be controlled. |
| 278 udp_port_->SetIceProtocolType(cricket::ICEPROTO_RFC5245); | 278 udp_port_->SetIceProtocolType(cricket::ICEPROTO_RFC5245); |
| 279 udp_port_->SetIceRole(cricket::ICEROLE_CONTROLLED); | 279 udp_port_->SetIceRole(cricket::ICEROLE_CONTROLLED); |
| 280 udp_port_->SignalPortComplete.connect( | 280 udp_port_->SignalPortComplete.connect( |
| 281 this, &TurnPortTest::OnUdpPortComplete); | 281 this, &TurnPortTest::OnUdpPortComplete); |
| 282 } | 282 } |
| 283 | 283 |
| 284 void TestTurnAlternateServer(cricket::ProtocolType protocol_type) { | 284 void TestTurnAlternateServer(cricket::ProtocolType protocol_type) { |
| 285 std::vector<rtc::SocketAddress> redirect_addresses; | 285 std::vector<rtc::SocketAddress> redirect_addresses; |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 795 turn_port_->PrepareAddress(); | 795 turn_port_->PrepareAddress(); |
| 796 ASSERT_TRUE_WAIT(turn_error_, kTimeout); | 796 ASSERT_TRUE_WAIT(turn_error_, kTimeout); |
| 797 EXPECT_TRUE(turn_port_->Candidates().empty()); | 797 EXPECT_TRUE(turn_port_->Candidates().empty()); |
| 798 turn_port_.reset(); | 798 turn_port_.reset(); |
| 799 rtc::Thread::Current()->Post(this, MSG_TESTFINISH); | 799 rtc::Thread::Current()->Post(this, MSG_TESTFINISH); |
| 800 // Waiting for above message to be processed. | 800 // Waiting for above message to be processed. |
| 801 ASSERT_TRUE_WAIT(test_finish_, kTimeout); | 801 ASSERT_TRUE_WAIT(test_finish_, kTimeout); |
| 802 EXPECT_EQ(last_fd_count, GetFDCount()); | 802 EXPECT_EQ(last_fd_count, GetFDCount()); |
| 803 } | 803 } |
| 804 #endif | 804 #endif |
| OLD | NEW |