Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 18:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1561005 - Implement nsINetworkLinkService.networkID on Linux r=michal

Browse Source 
* calculateNetworkId is now called before sending each ChangeEvent
* mNetworkId is truncated when no IPv4/IPv6 IDs could be computed

Differential Revision: https://phabricator.services.mozilla.com/D35780

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Valentin Gosu 2019-06-28 11:42:09 +00:00
parent 7aa44d1987
commit c657dcfafe
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
netwerk/system/linux/nsNotifyAddrListener_Linux.cpp
View File

@ -45,8 +45,8 @@ NS_IMPL_ISUPPORTS(nsNotifyAddrListener, nsINetworkLinkService, nsIRunnable,
nsIObserver)
nsNotifyAddrListener::nsNotifyAddrListener()
: mLinkUp(true) // assume true by default
,
: mMutex("nsNotifyAddrListener::mMutex"),
mLinkUp(true), // assume true by default
mStatusKnown(false),
mAllowChangedEvent(true),
mCoalescingActive(false) {
@ -88,6 +88,13 @@ nsNotifyAddrListener::GetLinkType(uint32_t* aLinkType) {
return NS_OK;
}
NS_IMETHODIMP
nsNotifyAddrListener::GetNetworkID(nsACString& aNetworkID) {
MutexAutoLock lock(mMutex);
aNetworkID = mNetworkId;
return NS_OK;
}
//
// Figure out the current IPv4 "network identification" string.
//
@ -246,6 +253,7 @@ static bool ipv6NetworkId(SHA1Sum* sha1) {
// Figure out the "network identification".
//
void nsNotifyAddrListener::calculateNetworkId(void) {
MOZ_ASSERT(!NS_IsMainThread(), "Must not be called on the main thread");
SHA1Sum sha1;
bool found4 = ipv4NetworkId(&sha1);
bool found6 = ipv6NetworkId(&sha1);
@ -263,6 +271,7 @@ void nsNotifyAddrListener::calculateNetworkId(void) {
nsresult rv = Base64Encode(newString, output);
MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv));
LOG(("networkid: id %s\n", output.get()));
MutexAutoLock lock(mMutex);
if (mNetworkId != output) {
// new id
if (found4 && !found6) {
@ -275,10 +284,14 @@ void nsNotifyAddrListener::calculateNetworkId(void) {
mNetworkId = output;
} else {
// same id
LOG(("Same network id"));
Telemetry::Accumulate(Telemetry::NETWORK_ID2, 2);
}
} else {
// no id
LOG(("No network id"));
MutexAutoLock lock(mMutex);
mNetworkId.Truncate();
Telemetry::Accumulate(Telemetry::NETWORK_ID2, 0);
}
}
@ -491,7 +504,6 @@ nsNotifyAddrListener::Run() {
double period = (TimeStamp::Now() - mChangeTime).ToMilliseconds();
if (period >= kNetworkChangeCoalescingPeriod) {
SendEvent(NS_NETWORK_LINK_DATA_CHANGED);
calculateNetworkId();
mCoalescingActive = false;
pollWait = -1; // restore to default
} else {
@ -587,6 +599,7 @@ nsresult nsNotifyAddrListener::SendEvent(const char* aEventID) {
LOG(("SendEvent: %s\n", aEventID));
nsresult rv = NS_OK;
calculateNetworkId();
nsCOMPtr<nsIRunnable> event = new ChangeEvent(this, aEventID);
if (NS_FAILED(rv = NS_DispatchToMainThread(event)))
NS_WARNING("Failed to dispatch ChangeEvent");

3
netwerk/system/linux/nsNotifyAddrListener_Linux.h
View File

@ -21,6 +21,7 @@
#include "nsThreadUtils.h"
#include "nsCOMPtr.h"
#include "mozilla/Atomics.h"
#include "mozilla/Mutex.h"
#include "mozilla/TimeStamp.h"
#include "nsITimer.h"
#include "nsClassHashtable.h"
@ -64,6 +65,8 @@ class nsNotifyAddrListener : public nsINetworkLinkService,
// Figure out the current "network identification"
void calculateNetworkId(void);
mozilla::Mutex mMutex;
nsCString mNetworkId;
// Checks if there's a network "link"