generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update libjingle to CL 53398036.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/2323004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4872 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org
2013-09-27 23:04:10 +00:00
parent 34c50c1de1
commit a27be8e4a1
41 changed files with 496 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
talk/base/network.h
View File

@@ -127,6 +127,18 @@ class BasicNetworkManager : public NetworkManagerBase,
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 @@ class BasicNetworkManager : public NetworkManagerBase,
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 @@ class BasicNetworkManager : public NetworkManagerBase,
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.