Update libjingle to CL 53398036.
Review URL: https://webrtc-codereview.appspot.com/2323004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4872 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/base/network.h b/talk/base/network.h
index f87063d..63f3e73 100644
--- a/talk/base/network.h
+++ b/talk/base/network.h
@@ -127,6 +127,18 @@
virtual void OnMessage(Message* msg);
bool started() { return start_count_ > 0; }
+ // Sets the network ignore list, which is empty by default. Any network on
+ // the ignore list will be filtered from network enumeration results.
+ void set_network_ignore_list(const std::vector<std::string>& list) {
+ network_ignore_list_ = list;
+ }
+#if defined(ANDROID) || defined(LINUX)
+ // Sets the flag for ignoring non-default routes.
+ void set_ignore_non_default_routes(bool value) {
+ ignore_non_default_routes_ = true;
+ }
+#endif
+
protected:
#if defined(POSIX)
// Separated from CreateNetworks for tests.
@@ -139,7 +151,7 @@
bool CreateNetworks(bool include_ignored, NetworkList* networks) const;
// Determines if a network should be ignored.
- static bool IsIgnoredNetwork(const Network& network);
+ bool IsIgnoredNetwork(const Network& network) const;
private:
friend class NetworkTest;
@@ -149,6 +161,8 @@
Thread* thread_;
bool sent_first_update_;
int start_count_;
+ std::vector<std::string> network_ignore_list_;
+ bool ignore_non_default_routes_;
};
// Represents a Unix-type network interface, with a name and single address.