admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the possibility to disable IPv6 in Java and ObjC.

Browse Source 
It's deprecated and has been removed from Chrome. Let's follow suite.

// Passing all but unrelated bots
NOTRY=True

Bug: webrtc:14608
Change-Id: I6f2601af5b1dc08164230ebf15db2d2f1754f9e5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280740
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38488}
This commit is contained in:
Henrik Boström 2022-10-27 13:36:02 +02:00 committed by WebRTC LUCI CQ
parent e6ec81a89c
commit f36d607c4a
7 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/peer_connection_interface.h
View File

@ -427,8 +427,7 @@ class RTC_EXPORT PeerConnectionInterface : public rtc::RefCountInterface {
//////////////////////////////////////////////////////////////////////////
// If set to true, don't gather IPv6 ICE candidates.
// TODO(https://crbug.com/1315576): Remove the ability to set it in Chromium
// and delete this flag.
// TODO(https://crbug.com/webrtc/14608): Delete this flag.
bool disable_ipv6 = false;
// If set to true, don't gather IPv6 ICE candidates on Wi-Fi.

7
sdk/android/api/org/webrtc/PeerConnection.java
View File

@ -524,7 +524,6 @@ public class PeerConnection {
// These values will be overridden by MediaStream constraints if deprecated constraints-based
// create peerconnection interface is used.
public boolean disableIpv6;
public boolean enableDscp;
public boolean enableCpuOveruseDetection;
public boolean suspendBelowMinBitrate;
@ -604,7 +603,6 @@ public class PeerConnection {
stableWritableConnectionPingIntervalMs = null;
disableIPv6OnWifi = false;
maxIPv6Networks = 5;
disableIpv6 = false;
enableDscp = false;
enableCpuOveruseDetection = true;
suspendBelowMinBitrate = false;
@ -769,11 +767,6 @@ public class PeerConnection {
return turnCustomizer;
}
@CalledByNative("RTCConfiguration")
boolean getDisableIpv6() {
return disableIpv6;
}
@CalledByNative("RTCConfiguration")
boolean getEnableDscp() {
return enableDscp;

2
sdk/android/src/jni/pc/peer_connection.cc
View File

@ -252,8 +252,6 @@ void JavaToNativeRTCConfiguration(
rtc_config->turn_customizer = GetNativeTurnCustomizer(jni, j_turn_customizer);
rtc_config->disable_ipv6 =
Java_RTCConfiguration_getDisableIpv6(jni, j_rtc_config);
rtc_config->media_config.enable_dscp =
Java_RTCConfiguration_getEnableDscp(jni, j_rtc_config);
rtc_config->media_config.video.enable_cpu_adaptation =

6
sdk/media_constraints.cc
View File

@ -115,7 +115,6 @@ const char MediaConstraints::kUseRtpMux[] = "googUseRtpMUX";
// Below constraints should be used during PeerConnection construction.
// Google-specific constraint keys.
const char MediaConstraints::kEnableDscp[] = "googDscp";
const char MediaConstraints::kEnableIPv6[] = "googIPv6";
const char MediaConstraints::kEnableVideoSuspendBelowMinBitrate[] =
"googSuspendBelowMinBitrate";
const char MediaConstraints::kCombinedAudioVideoBwe[] =
@ -151,11 +150,6 @@ void CopyConstraintsIntoRtcConfiguration(
return;
}
bool enable_ipv6;
if (FindConstraint(constraints, MediaConstraints::kEnableIPv6, &enable_ipv6,
nullptr)) {
configuration->disable_ipv6 = !enable_ipv6;
}
FindConstraint(constraints, MediaConstraints::kEnableDscp,
&configuration->media_config.enable_dscp, nullptr);
FindConstraint(constraints, MediaConstraints::kCpuOveruseDetection,

15
sdk/media_constraints_unittest.cc
View File

@ -20,8 +20,7 @@ namespace {
// plus audio_jitter_buffer_max_packets.
bool Matches(const PeerConnectionInterface::RTCConfiguration& a,
const PeerConnectionInterface::RTCConfiguration& b) {
return a.disable_ipv6 == b.disable_ipv6 &&
a.audio_jitter_buffer_max_packets ==
return a.audio_jitter_buffer_max_packets ==
b.audio_jitter_buffer_max_packets &&
a.screencast_min_bitrate == b.screencast_min_bitrate &&
a.combined_audio_video_bwe == b.combined_audio_video_bwe &&
@ -36,18 +35,6 @@ TEST(MediaConstraints, CopyConstraintsIntoRtcConfiguration) {
CopyConstraintsIntoRtcConfiguration(&constraints_empty, &configuration);
EXPECT_TRUE(Matches(old_configuration, configuration));
const MediaConstraints constraits_enable_ipv6(
{MediaConstraints::Constraint(MediaConstraints::kEnableIPv6, "true")},
{});
CopyConstraintsIntoRtcConfiguration(&constraits_enable_ipv6, &configuration);
EXPECT_FALSE(configuration.disable_ipv6);
const MediaConstraints constraints_disable_ipv6(
{MediaConstraints::Constraint(MediaConstraints::kEnableIPv6, "false")},
{});
CopyConstraintsIntoRtcConfiguration(&constraints_disable_ipv6,
&configuration);
EXPECT_TRUE(configuration.disable_ipv6);
const MediaConstraints constraints_screencast(
{MediaConstraints::Constraint(MediaConstraints::kScreencastMinBitrate,
"27")},

5
sdk/objc/api/peerconnection/RTCConfiguration.h
View File

@ -97,11 +97,6 @@ RTC_OBJC_EXPORT
@property(nonatomic, assign) RTCCandidateNetworkPolicy candidateNetworkPolicy;
@property(nonatomic, assign) RTCContinualGatheringPolicy continualGatheringPolicy;
/** If set to YES, don't gather IPv6 ICE candidates.
* Default is NO.
*/
@property(nonatomic, assign) BOOL disableIPV6;
/** If set to YES, don't gather IPv6 ICE candidates on Wi-Fi.
* Only intended to be used on specific devices. Certain phones disable IPv6
* when the screen is turned off and it would be better to just disable the

11
sdk/objc/api/peerconnection/RTCConfiguration.mm
View File

@ -32,7 +32,6 @@
@synthesize tcpCandidatePolicy = _tcpCandidatePolicy;
@synthesize candidateNetworkPolicy = _candidateNetworkPolicy;
@synthesize continualGatheringPolicy = _continualGatheringPolicy;
@synthesize disableIPV6 = _disableIPV6;
@synthesize disableIPV6OnWiFi = _disableIPV6OnWiFi;
@synthesize maxIPv6Networks = _maxIPv6Networks;
@synthesize disableLinkLocalNetworks = _disableLinkLocalNetworks;
@ -103,9 +102,7 @@
candidateNetworkPolicyForNativePolicy:config.candidate_network_policy];
webrtc::PeerConnectionInterface::ContinualGatheringPolicy nativePolicy =
config.continual_gathering_policy;
_continualGatheringPolicy =
[[self class] continualGatheringPolicyForNativePolicy:nativePolicy];
_disableIPV6 = config.disable_ipv6;
_continualGatheringPolicy = [[self class] continualGatheringPolicyForNativePolicy:nativePolicy];
_disableIPV6OnWiFi = config.disable_ipv6_on_wifi;
_maxIPv6Networks = config.max_ipv6_networks;
_disableLinkLocalNetworks = config.disable_link_local_networks;
@ -190,7 +187,6 @@
_shouldSurfaceIceCandidatesOnIceTransportTypeChanged,
_iceCheckMinInterval,
_disableLinkLocalNetworks,
_disableIPV6,
_disableIPV6OnWiFi,
_maxIPv6Networks,
_activeResetSrtpParams,
@ -220,9 +216,8 @@
[[self class] nativeTcpCandidatePolicyForPolicy:_tcpCandidatePolicy];
nativeConfig->candidate_network_policy = [[self class]
nativeCandidateNetworkPolicyForPolicy:_candidateNetworkPolicy];
nativeConfig->continual_gathering_policy = [[self class]
nativeContinualGatheringPolicyForPolicy:_continualGatheringPolicy];
nativeConfig->disable_ipv6 = _disableIPV6;
nativeConfig->continual_gathering_policy =
[[self class] nativeContinualGatheringPolicyForPolicy:_continualGatheringPolicy];
nativeConfig->disable_ipv6_on_wifi = _disableIPV6OnWiFi;
nativeConfig->max_ipv6_networks = _maxIPv6Networks;
nativeConfig->disable_link_local_networks = _disableLinkLocalNetworks;