diff --git a/media/mtransport/test/ice_unittest.cpp b/media/mtransport/test/ice_unittest.cpp index 3c88cd55f96..3a4df3106ab 100644 --- a/media/mtransport/test/ice_unittest.cpp +++ b/media/mtransport/test/ice_unittest.cpp @@ -3042,7 +3042,9 @@ TEST_F(WebRtcIceConnectTest, TestPollCandPairsAfterConnect) { ASSERT_TRUE(ContainsSucceededPair(pairs)); } -TEST_F(WebRtcIceConnectTest, TestHostCandPairingFilter) { +// TODO Bug 1259842 - disabled until we find a better way to handle two +// candidates from different RFC1918 ranges +TEST_F(WebRtcIceConnectTest, DISABLED_TestHostCandPairingFilter) { AddStream("first", 1); ASSERT_TRUE(Gather(kDefaultTimeout, false)); SetCandidateFilter(IsIpv4Candidate); diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_component.c b/media/mtransport/third_party/nICEr/src/ice/ice_component.c index 4222a726d9e..35e9b6abe47 100644 --- a/media/mtransport/third_party/nICEr/src/ice/ice_component.c +++ b/media/mtransport/third_party/nICEr/src/ice/ice_component.c @@ -987,8 +987,7 @@ int nr_ice_component_can_candidate_tcptype_pair(nr_socket_tcp_type left, nr_sock return(1); } -/* local vs. remote matters here because we allow private -> public pairing, - * but discourage public -> private pairing. */ +/* filter out pairings which won't work. */ int nr_ice_component_can_candidate_addr_pair(nr_transport_addr *local, nr_transport_addr *remote) { int remote_range; @@ -1003,10 +1002,6 @@ int nr_ice_component_can_candidate_addr_pair(nr_transport_addr *local, nr_transp if(nr_transport_addr_is_loopback(local) != nr_transport_addr_is_loopback(remote)) return(0); - remote_range = nr_transport_addr_get_private_addr_range(remote); - if(remote_range && (nr_transport_addr_get_private_addr_range(local) != - remote_range)) - return(0); return(1); }