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

Side by Side Diff: webrtc/p2p/client/basicportallocator.h

Issue 2378793003: Change the default relay port from GTURN to TURN. (Closed)
Patch Set: Add TODO to deprecate the constructor. Created 4 years, 2 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 | « no previous file | webrtc/p2p/client/basicportallocator.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 12 matching lines...) Expand all
23 namespace cricket { 23 namespace cricket {
24 24
25 class BasicPortAllocator : public PortAllocator { 25 class BasicPortAllocator : public PortAllocator {
26 public: 26 public:
27 BasicPortAllocator(rtc::NetworkManager* network_manager, 27 BasicPortAllocator(rtc::NetworkManager* network_manager,
28 rtc::PacketSocketFactory* socket_factory); 28 rtc::PacketSocketFactory* socket_factory);
29 explicit BasicPortAllocator(rtc::NetworkManager* network_manager); 29 explicit BasicPortAllocator(rtc::NetworkManager* network_manager);
30 BasicPortAllocator(rtc::NetworkManager* network_manager, 30 BasicPortAllocator(rtc::NetworkManager* network_manager,
31 rtc::PacketSocketFactory* socket_factory, 31 rtc::PacketSocketFactory* socket_factory,
32 const ServerAddresses& stun_servers); 32 const ServerAddresses& stun_servers);
33 // TODO(honghaiz): Deprecate this constructor as it is only used by tests
34 // and downstream code that passes in empty arguments.
33 BasicPortAllocator(rtc::NetworkManager* network_manager, 35 BasicPortAllocator(rtc::NetworkManager* network_manager,
34 const ServerAddresses& stun_servers, 36 const ServerAddresses& stun_servers,
35 const rtc::SocketAddress& relay_server_udp, 37 const rtc::SocketAddress& relay_server_udp,
36 const rtc::SocketAddress& relay_server_tcp, 38 const rtc::SocketAddress& relay_server_tcp,
37 const rtc::SocketAddress& relay_server_ssl); 39 const rtc::SocketAddress& relay_server_ssl);
38 virtual ~BasicPortAllocator(); 40 virtual ~BasicPortAllocator();
39 41
40 // Set to kDefaultNetworkIgnoreMask by default. 42 // Set to kDefaultNetworkIgnoreMask by default.
41 void SetNetworkIgnoreMask(int network_ignore_mask) override { 43 void SetNetworkIgnoreMask(int network_ignore_mask) override {
42 // TODO(phoglund): implement support for other types than loopback. 44 // TODO(phoglund): implement support for other types than loopback.
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 std::unique_ptr<rtc::AsyncPacketSocket> udp_socket_; 367 std::unique_ptr<rtc::AsyncPacketSocket> udp_socket_;
366 // There will be only one udp port per AllocationSequence. 368 // There will be only one udp port per AllocationSequence.
367 UDPPort* udp_port_; 369 UDPPort* udp_port_;
368 std::vector<TurnPort*> turn_ports_; 370 std::vector<TurnPort*> turn_ports_;
369 int phase_; 371 int phase_;
370 }; 372 };
371 373
372 } // namespace cricket 374 } // namespace cricket
373 375
374 #endif // WEBRTC_P2P_CLIENT_BASICPORTALLOCATOR_H_ 376 #endif // WEBRTC_P2P_CLIENT_BASICPORTALLOCATOR_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/p2p/client/basicportallocator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698