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 | 10 |
(...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1211 return CreateRemoteOfferWithVersion(options, cricket::SEC_ENABLED, | 1211 return CreateRemoteOfferWithVersion(options, cricket::SEC_ENABLED, |
1212 kSessionVersion, current_desc); | 1212 kSessionVersion, current_desc); |
1213 } | 1213 } |
1214 | 1214 |
1215 SessionDescriptionInterface* CreateRemoteOfferWithSctpPort( | 1215 SessionDescriptionInterface* CreateRemoteOfferWithSctpPort( |
1216 const char* sctp_stream_name, | 1216 const char* sctp_stream_name, |
1217 int new_port, | 1217 int new_port, |
1218 cricket::MediaSessionOptions options) { | 1218 cricket::MediaSessionOptions options) { |
1219 options.data_channel_type = cricket::DCT_SCTP; | 1219 options.data_channel_type = cricket::DCT_SCTP; |
1220 GetOptionsForRemoteOffer(&options); | 1220 GetOptionsForRemoteOffer(&options); |
1221 return ChangeSDPSctpPort(new_port, CreateRemoteOffer(options)); | 1221 return ChangeSDPSctpPort(new_port, |
| 1222 CreateRemoteOffer(options, cricket::SEC_DISABLED)); |
1222 } | 1223 } |
1223 | 1224 |
1224 // Takes ownership of offer_basis (and deletes it). | 1225 // Takes ownership of offer_basis (and deletes it). |
1225 SessionDescriptionInterface* ChangeSDPSctpPort( | 1226 SessionDescriptionInterface* ChangeSDPSctpPort( |
1226 int new_port, | 1227 int new_port, |
1227 webrtc::SessionDescriptionInterface* offer_basis) { | 1228 webrtc::SessionDescriptionInterface* offer_basis) { |
1228 // Stringify the input SDP, swap the 5000 for 'new_port' and create a new | 1229 // Stringify the input SDP, swap the 5000 for 'new_port' and create a new |
1229 // SessionDescription from the mutated string. | 1230 // SessionDescription from the mutated string. |
1230 const char* default_port_str = "5000"; | 1231 const char* default_port_str = "5000"; |
1231 char new_port_str[16]; | 1232 char new_port_str[16]; |
(...skipping 3334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4566 } | 4567 } |
4567 | 4568 |
4568 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4569 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
4569 // currently fails because upon disconnection and reconnection OnIceComplete is | 4570 // currently fails because upon disconnection and reconnection OnIceComplete is |
4570 // called more than once without returning to IceGatheringGathering. | 4571 // called more than once without returning to IceGatheringGathering. |
4571 | 4572 |
4572 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4573 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
4573 WebRtcSessionTest, | 4574 WebRtcSessionTest, |
4574 testing::Values(ALREADY_GENERATED, | 4575 testing::Values(ALREADY_GENERATED, |
4575 DTLS_IDENTITY_STORE)); | 4576 DTLS_IDENTITY_STORE)); |
OLD | NEW |