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

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

Issue 1284113003: Move the concept of multiple route into Network (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Merge from master and address Justin's comments. 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
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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 for (Network* network : networks_) { 299 for (Network* network : networks_) {
300 network->set_preference(pref); 300 network->set_preference(pref);
301 if (pref > 0) { 301 if (pref > 0) {
302 --pref; 302 --pref;
303 } else { 303 } else {
304 LOG(LS_ERROR) << "Too many network interfaces to handle!"; 304 LOG(LS_ERROR) << "Too many network interfaces to handle!";
305 break; 305 break;
306 } 306 }
307 } 307 }
308 } 308 }
309
310 network_permission_state_ = STATE_ALLOWED;
309 } 311 }
310 312
311 BasicNetworkManager::BasicNetworkManager() 313 BasicNetworkManager::BasicNetworkManager()
312 : thread_(NULL), sent_first_update_(false), start_count_(0), 314 : thread_(NULL), sent_first_update_(false), start_count_(0),
313 network_ignore_mask_(kDefaultNetworkIgnoreMask), 315 network_ignore_mask_(kDefaultNetworkIgnoreMask),
314 ignore_non_default_routes_(false) { 316 ignore_non_default_routes_(false) {
315 } 317 }
316 318
317 BasicNetworkManager::~BasicNetworkManager() { 319 BasicNetworkManager::~BasicNetworkManager() {
318 } 320 }
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 std::stringstream ss; 802 std::stringstream ss;
801 // Print out the first space-terminated token of the network desc, plus 803 // Print out the first space-terminated token of the network desc, plus
802 // the IP address. 804 // the IP address.
803 ss << "Net[" << description_.substr(0, description_.find(' ')) 805 ss << "Net[" << description_.substr(0, description_.find(' '))
804 << ":" << prefix_.ToSensitiveString() << "/" << prefix_length_ 806 << ":" << prefix_.ToSensitiveString() << "/" << prefix_length_
805 << ":" << AdapterTypeToString(type_) << "]"; 807 << ":" << AdapterTypeToString(type_) << "]";
806 return ss.str(); 808 return ss.str();
807 } 809 }
808 810
809 } // namespace rtc 811 } // namespace rtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698