| Index: webrtc/base/network.h
|
| diff --git a/webrtc/base/network.h b/webrtc/base/network.h
|
| index 8980b5d57d8ecb4fda77c064335a7d3ab881383a..c7d95646fb5ac3b8a6cadaaada067e39f9068e14 100644
|
| --- a/webrtc/base/network.h
|
| +++ b/webrtc/base/network.h
|
| @@ -116,6 +116,12 @@ class NetworkManager : public DefaultLocalAddressProvider {
|
| // Dumps a list of networks available to LS_INFO.
|
| virtual void DumpNetworks(bool include_ignored) {}
|
|
|
| + // Sets the network types to ignore. For instance, calling this with
|
| + // ADAPTER_TYPE_ETHERNET | ADAPTER_TYPE_LOOPBACK will ignore Ethernet and
|
| + // loopback interfaces.
|
| + // TODO(deadbeef): Make pure virtual once Chromium implements it.
|
| + virtual void SetNetworkIgnoreMask(int network_ignore_mask) {}
|
| +
|
| struct Stats {
|
| int ipv4_network_count;
|
| int ipv6_network_count;
|
| @@ -198,6 +204,14 @@ class BasicNetworkManager : public NetworkManagerBase,
|
| // Logs the available networks.
|
| void DumpNetworks(bool include_ignored) override;
|
|
|
| + // Set to kDefaultNetworkIgnoreMask by default.
|
| + void SetNetworkIgnoreMask(int network_ignore_mask) override {
|
| + // TODO(phoglund): implement support for other types than loopback.
|
| + // See https://code.google.com/p/webrtc/issues/detail?id=4288.
|
| + // Then remove set_network_ignore_list.
|
| + network_ignore_mask_ = network_ignore_mask;
|
| + }
|
| +
|
| // MessageHandler interface.
|
| void OnMessage(Message* msg) override;
|
| bool started() { return start_count_ > 0; }
|
| @@ -208,16 +222,6 @@ class BasicNetworkManager : public NetworkManagerBase,
|
| network_ignore_list_ = list;
|
| }
|
|
|
| - // Sets the network types to ignore. For instance, calling this with
|
| - // ADAPTER_TYPE_ETHERNET | ADAPTER_TYPE_LOOPBACK will ignore Ethernet and
|
| - // loopback interfaces. Set to kDefaultNetworkIgnoreMask by default.
|
| - void set_network_ignore_mask(int network_ignore_mask) {
|
| - // TODO(phoglund): implement support for other types than loopback.
|
| - // See https://code.google.com/p/webrtc/issues/detail?id=4288.
|
| - // Then remove set_network_ignore_list.
|
| - network_ignore_mask_ = network_ignore_mask;
|
| - }
|
| -
|
| int network_ignore_mask() const { return network_ignore_mask_; }
|
|
|
| #if defined(WEBRTC_LINUX)
|
|
|