| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 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 | 10 |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 rtype == RELAY_GTURN, false, true, true); | 429 rtype == RELAY_GTURN, false, true, true); |
| 430 } | 430 } |
| 431 // helpers for above functions | 431 // helpers for above functions |
| 432 UDPPort* CreateUdpPort(const SocketAddress& addr) { | 432 UDPPort* CreateUdpPort(const SocketAddress& addr) { |
| 433 return CreateUdpPort(addr, &socket_factory_); | 433 return CreateUdpPort(addr, &socket_factory_); |
| 434 } | 434 } |
| 435 UDPPort* CreateUdpPort(const SocketAddress& addr, | 435 UDPPort* CreateUdpPort(const SocketAddress& addr, |
| 436 PacketSocketFactory* socket_factory) { | 436 PacketSocketFactory* socket_factory) { |
| 437 return UDPPort::Create(main_, socket_factory, &network_, | 437 return UDPPort::Create(main_, socket_factory, &network_, |
| 438 addr.ipaddr(), 0, 0, username_, password_, | 438 addr.ipaddr(), 0, 0, username_, password_, |
| 439 std::string()); | 439 std::string(), false); |
| 440 } | 440 } |
| 441 TCPPort* CreateTcpPort(const SocketAddress& addr) { | 441 TCPPort* CreateTcpPort(const SocketAddress& addr) { |
| 442 return CreateTcpPort(addr, &socket_factory_); | 442 return CreateTcpPort(addr, &socket_factory_); |
| 443 } | 443 } |
| 444 TCPPort* CreateTcpPort(const SocketAddress& addr, | 444 TCPPort* CreateTcpPort(const SocketAddress& addr, |
| 445 PacketSocketFactory* socket_factory) { | 445 PacketSocketFactory* socket_factory) { |
| 446 return TCPPort::Create(main_, socket_factory, &network_, | 446 return TCPPort::Create(main_, socket_factory, &network_, |
| 447 addr.ipaddr(), 0, 0, username_, password_, | 447 addr.ipaddr(), 0, 0, username_, password_, |
| 448 true); | 448 true); |
| 449 } | 449 } |
| (...skipping 1887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2337 // Set up channels and ensure both ports will be deleted. | 2337 // Set up channels and ensure both ports will be deleted. |
| 2338 TestChannel ch1(port1, port2); | 2338 TestChannel ch1(port1, port2); |
| 2339 TestChannel ch2(port2, port1); | 2339 TestChannel ch2(port2, port1); |
| 2340 | 2340 |
| 2341 // Simulate a connection that succeeds, and then is destroyed. | 2341 // Simulate a connection that succeeds, and then is destroyed. |
| 2342 StartConnectAndStopChannels(&ch1, &ch2); | 2342 StartConnectAndStopChannels(&ch1, &ch2); |
| 2343 | 2343 |
| 2344 // The controlled port should be destroyed after 10 milliseconds. | 2344 // The controlled port should be destroyed after 10 milliseconds. |
| 2345 EXPECT_TRUE_WAIT(destroyed(), kTimeout); | 2345 EXPECT_TRUE_WAIT(destroyed(), kTimeout); |
| 2346 } | 2346 } |
| OLD | NEW |