From efbcb31cb67e3090b82c09ed5aabc4bbc53f37be Mon Sep 17 00:00:00 2001 From: Qingsi Wang Date: Tue, 21 Aug 2018 23:23:26 +0000 Subject: [PATCH] Revert "Remove the flag PORTALLOCATOR_ENABLE_ANY_ADDRESS_PORTS." This reverts commit b3f5aed4332b25c3fa7e725126efd3d4262c385e. Reason for revert: speculative revert, possibly breaking downstream projects Original change's description: > Remove the flag PORTALLOCATOR_ENABLE_ANY_ADDRESS_PORTS. > > We now always enable any address ports, only using them if they end up > using interfaces that weren't otherwise accessible. This flag is no > longer used by downstream projects. > > TBR=deadbeef@webrtc.org > > Bug: None > Change-Id: I6e4e93958cbc4300811bafb103f1a2e8732274ed > Reviewed-on: https://webrtc-review.googlesource.com/85860 > Commit-Queue: Qingsi Wang > Reviewed-by: Qingsi Wang > Cr-Commit-Position: refs/heads/master@{#23751} TBR=qingsi@google.com,qingsi@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: None Change-Id: I2c3850533cd72c021a42dcb160f73ca54a036a84 Reviewed-on: https://webrtc-review.googlesource.com/95341 Commit-Queue: Qingsi Wang Reviewed-by: Qingsi Wang Cr-Commit-Position: refs/heads/master@{#24373} --- p2p/base/portallocator.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/p2p/base/portallocator.h b/p2p/base/portallocator.h index 355b3212f0..4c27ba8a72 100644 --- a/p2p/base/portallocator.h +++ b/p2p/base/portallocator.h @@ -74,9 +74,16 @@ enum { // When specified, do not collect IPv6 ICE candidates on Wi-Fi. PORTALLOCATOR_ENABLE_IPV6_ON_WIFI = 0x4000, + // This flag is deprecated; we now always enable any address ports, only + // using them if they end up using interfaces that weren't otherwise + // accessible. + // + // TODO(qingsi): Remove this flag when downstream projects no longer use it. + PORTALLOCATOR_ENABLE_ANY_ADDRESS_PORTS = 0x8000, + // Exclude link-local network interfaces // from considertaion after adapter enumeration. - PORTALLOCATOR_DISABLE_LINK_LOCAL_NETWORKS = 0x8000, + PORTALLOCATOR_DISABLE_LINK_LOCAL_NETWORKS = 0x10000, }; // Defines various reasons that have caused ICE regathering.