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

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

Issue 1288843003: Revert "Generate localhost candidate when no STUN/TURN and portallocator has the right flag spefied… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: 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/client/basicportallocator.cc ('k') | webrtc/p2p/client/portallocator_unittest.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 2010 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2010 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 virtual void StartGettingPorts() { 46 virtual void StartGettingPorts() {
47 if (!port_) { 47 if (!port_) {
48 port_.reset(cricket::UDPPort::Create(worker_thread_, 48 port_.reset(cricket::UDPPort::Create(worker_thread_,
49 factory_, 49 factory_,
50 &network_, 50 &network_,
51 network_.GetBestIP(), 51 network_.GetBestIP(),
52 0, 52 0,
53 0, 53 0,
54 username(), 54 username(),
55 password(), 55 password(),
56 std::string(), 56 std::string()));
57 false));
58 AddPort(port_.get()); 57 AddPort(port_.get());
59 } 58 }
60 ++port_config_count_; 59 ++port_config_count_;
61 running_ = true; 60 running_ = true;
62 } 61 }
63 62
64 virtual void StopGettingPorts() { running_ = false; } 63 virtual void StopGettingPorts() { running_ = false; }
65 virtual bool IsGettingPorts() { return running_; } 64 virtual bool IsGettingPorts() { return running_; }
66 int port_config_count() { return port_config_count_; } 65 int port_config_count() { return port_config_count_; }
67 66
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 109
111 private: 110 private:
112 rtc::Thread* worker_thread_; 111 rtc::Thread* worker_thread_;
113 rtc::PacketSocketFactory* factory_; 112 rtc::PacketSocketFactory* factory_;
114 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> owned_factory_; 113 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> owned_factory_;
115 }; 114 };
116 115
117 } // namespace cricket 116 } // namespace cricket
118 117
119 #endif // WEBRTC_P2P_CLIENT_FAKEPORTALLOCATOR_H_ 118 #endif // WEBRTC_P2P_CLIENT_FAKEPORTALLOCATOR_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/client/basicportallocator.cc ('k') | webrtc/p2p/client/portallocator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698