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

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

Issue 1336553003: Revert change which removes GICE (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 3 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 20 matching lines...) Expand all
31 // Disable local UDP ports. This doesn't impact how we connect to relay 31 // Disable local UDP ports. This doesn't impact how we connect to relay
32 // servers. 32 // servers.
33 PORTALLOCATOR_DISABLE_UDP = 0x01, 33 PORTALLOCATOR_DISABLE_UDP = 0x01,
34 PORTALLOCATOR_DISABLE_STUN = 0x02, 34 PORTALLOCATOR_DISABLE_STUN = 0x02,
35 PORTALLOCATOR_DISABLE_RELAY = 0x04, 35 PORTALLOCATOR_DISABLE_RELAY = 0x04,
36 // Disable local TCP ports. This doesn't impact how we connect to relay 36 // Disable local TCP ports. This doesn't impact how we connect to relay
37 // servers. 37 // servers.
38 PORTALLOCATOR_DISABLE_TCP = 0x08, 38 PORTALLOCATOR_DISABLE_TCP = 0x08,
39 PORTALLOCATOR_ENABLE_SHAKER = 0x10, 39 PORTALLOCATOR_ENABLE_SHAKER = 0x10,
40 PORTALLOCATOR_ENABLE_IPV6 = 0x40, 40 PORTALLOCATOR_ENABLE_IPV6 = 0x40,
41 // TODO(pthatcher): Remove this once it's no longer used in:
42 // remoting/client/plugin/pepper_port_allocator.cc
43 // remoting/protocol/chromium_port_allocator.cc
44 // remoting/test/fake_port_allocator.cc
45 // It's a no-op and is no longer needed.
46 PORTALLOCATOR_ENABLE_SHARED_UFRAG = 0x80, 41 PORTALLOCATOR_ENABLE_SHARED_UFRAG = 0x80,
47 PORTALLOCATOR_ENABLE_SHARED_SOCKET = 0x100, 42 PORTALLOCATOR_ENABLE_SHARED_SOCKET = 0x100,
48 PORTALLOCATOR_ENABLE_STUN_RETRANSMIT_ATTRIBUTE = 0x200, 43 PORTALLOCATOR_ENABLE_STUN_RETRANSMIT_ATTRIBUTE = 0x200,
49 PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION = 0x400, 44 PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION = 0x400,
50 // When specified, a loopback candidate will be generated if 45 // When specified, a loopback candidate will be generated if
51 // PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION is specified. 46 // PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION is specified.
52 PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE = 0x800, 47 PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE = 0x800,
53 // Disallow use of UDP when connecting to a relay server. Since proxy servers 48 // Disallow use of UDP when connecting to a relay server. Since proxy servers
54 // usually don't handle UDP, using UDP will leak the IP address. 49 // usually don't handle UDP, using UDP will leak the IP address.
55 PORTALLOCATOR_DISABLE_UDP_RELAY = 0x1000, 50 PORTALLOCATOR_DISABLE_UDP_RELAY = 0x1000,
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 int max_port_; 190 int max_port_;
196 uint32 step_delay_; 191 uint32 step_delay_;
197 bool allow_tcp_listen_; 192 bool allow_tcp_listen_;
198 uint32 candidate_filter_; 193 uint32 candidate_filter_;
199 std::string origin_; 194 std::string origin_;
200 }; 195 };
201 196
202 } // namespace cricket 197 } // namespace cricket
203 198
204 #endif // WEBRTC_P2P_BASE_PORTALLOCATOR_H_ 199 #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