wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1259842: allow RFC1918 pairing again r=mjf a=lizzard

Browse Source
This commit is contained in:
Nils Ohlmeier [:drno] 2016-04-19 17:03:49 -07:00
parent 81e28e132d
commit c055ec0810
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
media/mtransport/test/ice_unittest.cpp
View File

@ -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);

7
media/mtransport/third_party/nICEr/src/ice/ice_component.c vendored
View File

@ -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);
}