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

Side by Side Diff: webrtc/base/network.cc

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/base/network.h ('k') | webrtc/base/network_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 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 return ost.str(); 157 return ost.str();
158 } 158 }
159 159
160 NetworkManager::NetworkManager() { 160 NetworkManager::NetworkManager() {
161 } 161 }
162 162
163 NetworkManager::~NetworkManager() { 163 NetworkManager::~NetworkManager() {
164 } 164 }
165 165
166 NetworkManagerBase::NetworkManagerBase() 166 NetworkManagerBase::NetworkManagerBase()
167 : enumeration_permission_(NetworkManager::kEnumerationAllowed), 167 : max_ipv6_networks_(kMaxIPv6Networks), ipv6_enabled_(true) {
168 max_ipv6_networks_(kMaxIPv6Networks),
169 ipv6_enabled_(true) {
170 } 168 }
171 169
172 NetworkManagerBase::~NetworkManagerBase() { 170 NetworkManagerBase::~NetworkManagerBase() {
173 for (const auto& kv : networks_map_) { 171 for (const auto& kv : networks_map_) {
174 delete kv.second; 172 delete kv.second;
175 } 173 }
176 } 174 }
177 175
178 NetworkManager::EnumerationPermission
179 NetworkManagerBase::enumeration_permission() const {
180 return enumeration_permission_;
181 }
182
183 void NetworkManagerBase::GetAnyAddressNetworks(NetworkList* networks) { 176 void NetworkManagerBase::GetAnyAddressNetworks(NetworkList* networks) {
184 if (!ipv4_any_address_network_) { 177 if (!ipv4_any_address_network_) {
185 const rtc::IPAddress ipv4_any_address(INADDR_ANY); 178 const rtc::IPAddress ipv4_any_address(INADDR_ANY);
186 ipv4_any_address_network_.reset( 179 ipv4_any_address_network_.reset(
187 new rtc::Network("any", "any", ipv4_any_address, 0)); 180 new rtc::Network("any", "any", ipv4_any_address, 0));
188 ipv4_any_address_network_->AddIP(ipv4_any_address); 181 ipv4_any_address_network_->AddIP(ipv4_any_address);
189 } 182 }
190 networks->push_back(ipv4_any_address_network_.get()); 183 networks->push_back(ipv4_any_address_network_.get());
191 184
192 if (ipv6_enabled()) { 185 if (ipv6_enabled()) {
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 std::stringstream ss; 800 std::stringstream ss;
808 // Print out the first space-terminated token of the network desc, plus 801 // Print out the first space-terminated token of the network desc, plus
809 // the IP address. 802 // the IP address.
810 ss << "Net[" << description_.substr(0, description_.find(' ')) 803 ss << "Net[" << description_.substr(0, description_.find(' '))
811 << ":" << prefix_.ToSensitiveString() << "/" << prefix_length_ 804 << ":" << prefix_.ToSensitiveString() << "/" << prefix_length_
812 << ":" << AdapterTypeToString(type_) << "]"; 805 << ":" << AdapterTypeToString(type_) << "]";
813 return ss.str(); 806 return ss.str();
814 } 807 }
815 808
816 } // namespace rtc 809 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/network.h ('k') | webrtc/base/network_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698