Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: webrtc/p2p/base/portallocator.h

Issue 1303393002: Reland "Remove GICE (gone forever!) and PORTALLOCATOR_ENABLE_SHARED_UFRAG (enabled forever)." becau… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add memcheck suppression Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/p2p/base/port_unittest.cc ('k') | webrtc/p2p/base/portallocator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 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 16 matching lines...) Expand all
27 // Clients can override this class to control port allocation, including 27 // Clients can override this class to control port allocation, including
28 // what kinds of ports are allocated. 28 // what kinds of ports are allocated.
29 29
30 enum { 30 enum {
31 PORTALLOCATOR_DISABLE_UDP = 0x01, 31 PORTALLOCATOR_DISABLE_UDP = 0x01,
32 PORTALLOCATOR_DISABLE_STUN = 0x02, 32 PORTALLOCATOR_DISABLE_STUN = 0x02,
33 PORTALLOCATOR_DISABLE_RELAY = 0x04, 33 PORTALLOCATOR_DISABLE_RELAY = 0x04,
34 PORTALLOCATOR_DISABLE_TCP = 0x08, 34 PORTALLOCATOR_DISABLE_TCP = 0x08,
35 PORTALLOCATOR_ENABLE_SHAKER = 0x10, 35 PORTALLOCATOR_ENABLE_SHAKER = 0x10,
36 PORTALLOCATOR_ENABLE_IPV6 = 0x40, 36 PORTALLOCATOR_ENABLE_IPV6 = 0x40,
37 // TODO(pthatcher): Remove this once it's no longer used in:
38 // remoting/client/plugin/pepper_port_allocator.cc
39 // remoting/protocol/chromium_port_allocator.cc
40 // remoting/test/fake_port_allocator.cc
41 // It's a no-op and is no longer needed.
37 PORTALLOCATOR_ENABLE_SHARED_UFRAG = 0x80, 42 PORTALLOCATOR_ENABLE_SHARED_UFRAG = 0x80,
38 PORTALLOCATOR_ENABLE_SHARED_SOCKET = 0x100, 43 PORTALLOCATOR_ENABLE_SHARED_SOCKET = 0x100,
39 PORTALLOCATOR_ENABLE_STUN_RETRANSMIT_ATTRIBUTE = 0x200, 44 PORTALLOCATOR_ENABLE_STUN_RETRANSMIT_ATTRIBUTE = 0x200,
40 PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION = 0x400, 45 PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION = 0x400,
41 // When specified, a loopback candidate will be generated if 46 // When specified, a loopback candidate will be generated if
42 // PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION is specified. 47 // PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION is specified.
43 PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE = 0x800, 48 PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE = 0x800,
44 }; 49 };
45 50
46 const uint32 kDefaultPortAllocatorFlags = 0; 51 const uint32 kDefaultPortAllocatorFlags = 0;
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 int max_port_; 188 int max_port_;
184 uint32 step_delay_; 189 uint32 step_delay_;
185 bool allow_tcp_listen_; 190 bool allow_tcp_listen_;
186 uint32 candidate_filter_; 191 uint32 candidate_filter_;
187 std::string origin_; 192 std::string origin_;
188 }; 193 };
189 194
190 } // namespace cricket 195 } // namespace cricket
191 196
192 #endif // WEBRTC_P2P_BASE_PORTALLOCATOR_H_ 197 #endif // WEBRTC_P2P_BASE_PORTALLOCATOR_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/port_unittest.cc ('k') | webrtc/p2p/base/portallocator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698