OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 1214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1225 rtc::scoped_ptr<PeerConnectionTestClient> original_peer( | 1225 rtc::scoped_ptr<PeerConnectionTestClient> original_peer( |
1226 set_initializing_client(CreateDtlsClientWithAlternateKey())); | 1226 set_initializing_client(CreateDtlsClientWithAlternateKey())); |
1227 original_peer->pc()->Close(); | 1227 original_peer->pc()->Close(); |
1228 | 1228 |
1229 SetSignalingReceivers(); | 1229 SetSignalingReceivers(); |
1230 receiving_client()->SetExpectIceRestart(true); | 1230 receiving_client()->SetExpectIceRestart(true); |
1231 LocalP2PTest(); | 1231 LocalP2PTest(); |
1232 VerifyRenderedSize(640, 480); | 1232 VerifyRenderedSize(640, 480); |
1233 } | 1233 } |
1234 | 1234 |
| 1235 // This test sets up a non-bundle call and apply bundle during ICE restart. When |
| 1236 // bundle is in effect in the restart, the channel can successfully reset its |
| 1237 // DTLS-SRTP context. |
| 1238 TEST_F(P2PTestConductor, LocalP2PTestDtlsBundleInIceRestart) { |
| 1239 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); |
| 1240 FakeConstraints setup_constraints; |
| 1241 setup_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp, |
| 1242 true); |
| 1243 ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints)); |
| 1244 receiving_client()->RemoveBundleFromReceivedSdp(true); |
| 1245 LocalP2PTest(); |
| 1246 VerifyRenderedSize(640, 480); |
| 1247 |
| 1248 initializing_client()->IceRestart(); |
| 1249 receiving_client()->SetExpectIceRestart(true); |
| 1250 receiving_client()->RemoveBundleFromReceivedSdp(false); |
| 1251 LocalP2PTest(); |
| 1252 VerifyRenderedSize(640, 480); |
| 1253 } |
| 1254 |
1235 // This test sets up a call transfer to a new callee with a different DTLS | 1255 // This test sets up a call transfer to a new callee with a different DTLS |
1236 // fingerprint. | 1256 // fingerprint. |
1237 TEST_F(P2PTestConductor, LocalP2PTestDtlsTransferCaller) { | 1257 TEST_F(P2PTestConductor, LocalP2PTestDtlsTransferCaller) { |
1238 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); | 1258 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); |
1239 SetupAndVerifyDtlsCall(); | 1259 SetupAndVerifyDtlsCall(); |
1240 | 1260 |
1241 // Keeping the original peer around which will still send packets to the | 1261 // Keeping the original peer around which will still send packets to the |
1242 // receiving client. These SRTP packets will be dropped. | 1262 // receiving client. These SRTP packets will be dropped. |
1243 rtc::scoped_ptr<PeerConnectionTestClient> original_peer( | 1263 rtc::scoped_ptr<PeerConnectionTestClient> original_peer( |
1244 set_receiving_client(CreateDtlsClientWithAlternateKey())); | 1264 set_receiving_client(CreateDtlsClientWithAlternateKey())); |
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1958 server.urls.push_back("stun:hostname"); | 1978 server.urls.push_back("stun:hostname"); |
1959 server.urls.push_back("turn:hostname"); | 1979 server.urls.push_back("turn:hostname"); |
1960 servers.push_back(server); | 1980 servers.push_back(server); |
1961 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_configurations_, | 1981 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_configurations_, |
1962 &turn_configurations_)); | 1982 &turn_configurations_)); |
1963 EXPECT_EQ(1U, stun_configurations_.size()); | 1983 EXPECT_EQ(1U, stun_configurations_.size()); |
1964 EXPECT_EQ(1U, turn_configurations_.size()); | 1984 EXPECT_EQ(1U, turn_configurations_.size()); |
1965 } | 1985 } |
1966 | 1986 |
1967 #endif // if !defined(THREAD_SANITIZER) | 1987 #endif // if !defined(THREAD_SANITIZER) |
OLD | NEW |