OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2009 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2009 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 1632 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1643 rtc::ScopedFakeClock clock; | 1643 rtc::ScopedFakeClock clock; |
1644 AddAddress(0, kIPv6PublicAddrs[0]); | 1644 AddAddress(0, kIPv6PublicAddrs[0]); |
1645 AddAddress(0, kPublicAddrs[0]); | 1645 AddAddress(0, kPublicAddrs[0]); |
1646 AddAddress(1, kIPv6PublicAddrs[1]); | 1646 AddAddress(1, kIPv6PublicAddrs[1]); |
1647 AddAddress(1, kPublicAddrs[1]); | 1647 AddAddress(1, kPublicAddrs[1]); |
1648 | 1648 |
1649 SetAllocationStepDelay(0, kMinimumStepDelay); | 1649 SetAllocationStepDelay(0, kMinimumStepDelay); |
1650 SetAllocationStepDelay(1, kMinimumStepDelay); | 1650 SetAllocationStepDelay(1, kMinimumStepDelay); |
1651 | 1651 |
1652 // Enable IPv6 | 1652 // Enable IPv6 |
1653 SetAllocatorFlags(0, PORTALLOCATOR_ENABLE_IPV6); | 1653 SetAllocatorFlags( |
1654 SetAllocatorFlags(1, PORTALLOCATOR_ENABLE_IPV6); | 1654 0, PORTALLOCATOR_ENABLE_IPV6 | PORTALLOCATOR_ENABLE_IPV6_ON_WIFI); |
| 1655 SetAllocatorFlags( |
| 1656 1, PORTALLOCATOR_ENABLE_IPV6 | PORTALLOCATOR_ENABLE_IPV6_ON_WIFI); |
1655 | 1657 |
1656 CreateChannels(); | 1658 CreateChannels(); |
1657 | 1659 |
1658 EXPECT_TRUE_SIMULATED_WAIT(ep1_ch1()->receiving() && ep1_ch1()->writable() && | 1660 EXPECT_TRUE_SIMULATED_WAIT(ep1_ch1()->receiving() && ep1_ch1()->writable() && |
1659 ep2_ch1()->receiving() && | 1661 ep2_ch1()->receiving() && |
1660 ep2_ch1()->writable(), | 1662 ep2_ch1()->writable(), |
1661 kShortTimeout, clock); | 1663 kShortTimeout, clock); |
1662 EXPECT_TRUE( | 1664 EXPECT_TRUE( |
1663 ep1_ch1()->selected_connection() && ep2_ch1()->selected_connection() && | 1665 ep1_ch1()->selected_connection() && ep2_ch1()->selected_connection() && |
1664 LocalCandidate(ep1_ch1())->address().EqualIPs(kIPv6PublicAddrs[0]) && | 1666 LocalCandidate(ep1_ch1())->address().EqualIPs(kIPv6PublicAddrs[0]) && |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2189 // there are many connections. | 2191 // there are many connections. |
2190 TEST_F(P2PTransportChannelMultihomedTest, TestFailoverWithManyConnections) { | 2192 TEST_F(P2PTransportChannelMultihomedTest, TestFailoverWithManyConnections) { |
2191 rtc::ScopedFakeClock clock; | 2193 rtc::ScopedFakeClock clock; |
2192 test_turn_server()->AddInternalSocket(kTurnTcpIntAddr, PROTO_TCP); | 2194 test_turn_server()->AddInternalSocket(kTurnTcpIntAddr, PROTO_TCP); |
2193 RelayServerConfig turn_server(RELAY_TURN); | 2195 RelayServerConfig turn_server(RELAY_TURN); |
2194 turn_server.credentials = kRelayCredentials; | 2196 turn_server.credentials = kRelayCredentials; |
2195 turn_server.ports.push_back(ProtocolAddress(kTurnTcpIntAddr, PROTO_TCP)); | 2197 turn_server.ports.push_back(ProtocolAddress(kTurnTcpIntAddr, PROTO_TCP)); |
2196 GetAllocator(0)->AddTurnServer(turn_server); | 2198 GetAllocator(0)->AddTurnServer(turn_server); |
2197 GetAllocator(1)->AddTurnServer(turn_server); | 2199 GetAllocator(1)->AddTurnServer(turn_server); |
2198 // Enable IPv6 | 2200 // Enable IPv6 |
2199 SetAllocatorFlags(0, PORTALLOCATOR_ENABLE_IPV6); | 2201 SetAllocatorFlags( |
2200 SetAllocatorFlags(1, PORTALLOCATOR_ENABLE_IPV6); | 2202 0, PORTALLOCATOR_ENABLE_IPV6 | PORTALLOCATOR_ENABLE_IPV6_ON_WIFI); |
| 2203 SetAllocatorFlags( |
| 2204 1, PORTALLOCATOR_ENABLE_IPV6 | PORTALLOCATOR_ENABLE_IPV6_ON_WIFI); |
2201 SetAllocationStepDelay(0, kMinimumStepDelay); | 2205 SetAllocationStepDelay(0, kMinimumStepDelay); |
2202 SetAllocationStepDelay(1, kMinimumStepDelay); | 2206 SetAllocationStepDelay(1, kMinimumStepDelay); |
2203 | 2207 |
2204 auto& wifi = kPublicAddrs; | 2208 auto& wifi = kPublicAddrs; |
2205 auto& cellular = kAlternateAddrs; | 2209 auto& cellular = kAlternateAddrs; |
2206 auto& wifiIpv6 = kIPv6PublicAddrs; | 2210 auto& wifiIpv6 = kIPv6PublicAddrs; |
2207 auto& cellularIpv6 = kIPv6AlternateAddrs; | 2211 auto& cellularIpv6 = kIPv6AlternateAddrs; |
2208 AddAddress(0, wifi[0], "wifi0", rtc::ADAPTER_TYPE_WIFI); | 2212 AddAddress(0, wifi[0], "wifi0", rtc::ADAPTER_TYPE_WIFI); |
2209 AddAddress(0, wifiIpv6[0], "wifi0", rtc::ADAPTER_TYPE_WIFI); | 2213 AddAddress(0, wifiIpv6[0], "wifi0", rtc::ADAPTER_TYPE_WIFI); |
2210 AddAddress(0, cellular[0], "cellular0", rtc::ADAPTER_TYPE_CELLULAR); | 2214 AddAddress(0, cellular[0], "cellular0", rtc::ADAPTER_TYPE_CELLULAR); |
(...skipping 2114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4325 | 4329 |
4326 // TCP Relay/Relay is the next. | 4330 // TCP Relay/Relay is the next. |
4327 VerifyNextPingableConnection(RELAY_PORT_TYPE, RELAY_PORT_TYPE, | 4331 VerifyNextPingableConnection(RELAY_PORT_TYPE, RELAY_PORT_TYPE, |
4328 TCP_PROTOCOL_NAME); | 4332 TCP_PROTOCOL_NAME); |
4329 | 4333 |
4330 // Finally, Local/Relay will be pinged. | 4334 // Finally, Local/Relay will be pinged. |
4331 VerifyNextPingableConnection(LOCAL_PORT_TYPE, RELAY_PORT_TYPE); | 4335 VerifyNextPingableConnection(LOCAL_PORT_TYPE, RELAY_PORT_TYPE); |
4332 } | 4336 } |
4333 | 4337 |
4334 } // namespace cricket { | 4338 } // namespace cricket { |
OLD | NEW |