Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Side by Side Diff: webrtc/p2p/base/turnport_unittest.cc

Issue 1275703006: Bug 4517: Enable connectivity for demo page when no STUN/TURN specifiefd. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/p2p/base/stunport_unittest.cc ('k') | webrtc/p2p/client/basicportallocator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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));
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 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 turn_port_->PrepareAddress(); 817 turn_port_->PrepareAddress();
818 ASSERT_TRUE_WAIT(turn_error_, kTimeout); 818 ASSERT_TRUE_WAIT(turn_error_, kTimeout);
819 EXPECT_TRUE(turn_port_->Candidates().empty()); 819 EXPECT_TRUE(turn_port_->Candidates().empty());
820 turn_port_.reset(); 820 turn_port_.reset();
821 rtc::Thread::Current()->Post(this, MSG_TESTFINISH); 821 rtc::Thread::Current()->Post(this, MSG_TESTFINISH);
822 // Waiting for above message to be processed. 822 // Waiting for above message to be processed.
823 ASSERT_TRUE_WAIT(test_finish_, kTimeout); 823 ASSERT_TRUE_WAIT(test_finish_, kTimeout);
824 EXPECT_EQ(last_fd_count, GetFDCount()); 824 EXPECT_EQ(last_fd_count, GetFDCount());
825 } 825 }
826 #endif 826 #endif
OLDNEW
« no previous file with comments | « webrtc/p2p/base/stunport_unittest.cc ('k') | webrtc/p2p/client/basicportallocator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698