Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1562388 - Remove XP legacy NotifyAddrChange call from nsNotifyAddrListener r=mayhemer

Browse Source 
Old code needed to dynamically load a DLL - which was not available
for windows versions prior to Vista, and if that failed it would
fall back to using an older API.

This patch now calls the methods directly, since we don't have to
worry about the library not being there; we also remove the
fallback, meaning we always call NotifyIpInterfaceChange instead
of falling back to NotifyAddrChange.

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Valentin Gosu 2019-11-12 18:18:21 +00:00
parent a84a8b7944
commit b4f254a384
1 changed files with 21 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
netwerk/system/win32/nsNotifyAddrListener.cpp
View File

@ -54,35 +54,10 @@ static LazyLogModule gNotifyAddrLog("nsNotifyAddr");
static HMODULE sNetshell;
static decltype(NcFreeNetconProperties)* sNcFreeNetconProperties;
static HMODULE sIphlpapi;
static decltype(NotifyIpInterfaceChange)* sNotifyIpInterfaceChange;
static decltype(CancelMibChangeNotify2)* sCancelMibChangeNotify2;
#define NETWORK_NOTIFY_CHANGED_PREF "network.notify.changed"
#define NETWORK_NOTIFY_IPV6_PREF "network.notify.IPv6"
// period during which to absorb subsequent network change events, in
// milliseconds
static const unsigned int kNetworkChangeCoalescingPeriod = 1000;
static void InitIphlpapi(void) {
if (!sIphlpapi) {
sIphlpapi = LoadLibraryW(L"Iphlpapi.dll");
if (sIphlpapi) {
sNotifyIpInterfaceChange =
(decltype(NotifyIpInterfaceChange)*)GetProcAddress(
sIphlpapi, "NotifyIpInterfaceChange");
sCancelMibChangeNotify2 =
(decltype(CancelMibChangeNotify2)*)GetProcAddress(
sIphlpapi, "CancelMibChangeNotify2");
} else {
NS_WARNING(
"Failed to load Iphlpapi.dll - cannot detect network"
" changes!");
}
}
}
static void InitNetshellLibrary(void) {
if (!sNetshell) {
sNetshell = LoadLibraryW(L"Netshell.dll");
@ -100,12 +75,6 @@ static void FreeDynamicLibraries(void) {
FreeLibrary(sNetshell);
sNetshell = nullptr;
}
if (sIphlpapi) {
sNotifyIpInterfaceChange = nullptr;
sCancelMibChangeNotify2 = nullptr;
FreeLibrary(sIphlpapi);
sIphlpapi = nullptr;
}
}
NS_IMPL_ISUPPORTS(nsNotifyAddrListener, nsINetworkLinkService, nsIRunnable,
@ -119,9 +88,7 @@ nsNotifyAddrListener::nsNotifyAddrListener()
mCheckEvent(nullptr),
mShutdown(false),
mIPInterfaceChecksum(0),
mCoalescingActive(false) {
InitIphlpapi();
}
mCoalescingActive(false) {}
nsNotifyAddrListener::~nsNotifyAddrListener() {
NS_ASSERTION(!mThread, "nsNotifyAddrListener thread shutdown failed");
@ -324,61 +291,31 @@ nsNotifyAddrListener::Run() {
DWORD waitTime = INFINITE;
if (!sNotifyIpInterfaceChange || !sCancelMibChangeNotify2 ||
!StaticPrefs::network_notify_IPv6()) {
// For Windows versions which are older than Vista which lack
// NotifyIpInterfaceChange. Note this means no IPv6 support.
HANDLE ev = CreateEvent(nullptr, FALSE, FALSE, nullptr);
NS_ENSURE_TRUE(ev, NS_ERROR_OUT_OF_MEMORY);
// Windows Vista and newer versions.
HANDLE interfacechange;
// The callback will simply invoke CheckLinkStatus()
DWORD ret = NotifyIpInterfaceChange(
StaticPrefs::network_notify_IPv6() ? AF_UNSPEC
: AF_INET, // IPv4 and IPv6
(PIPINTERFACE_CHANGE_CALLBACK)OnInterfaceChange,
this, // pass to callback
false, // no initial notification
&interfacechange);
HANDLE handles[2] = {ev, mCheckEvent};
OVERLAPPED overlapped = {0};
bool shuttingDown = false;
overlapped.hEvent = ev;
while (!shuttingDown) {
HANDLE h;
DWORD ret = NotifyAddrChange(&h, &overlapped);
if (ret == ERROR_IO_PENDING) {
ret = WaitForMultipleObjects(2, handles, FALSE, waitTime);
if (ret == WAIT_OBJECT_0) {
CheckLinkStatus();
} else if (!mShutdown) {
waitTime = nextCoalesceWaitTime();
} else {
shuttingDown = true;
}
if (ret == NO_ERROR) {
do {
ret = WaitForSingleObject(mCheckEvent, waitTime);
if (!mShutdown) {
waitTime = nextCoalesceWaitTime();
} else {
shuttingDown = true;
break;
}
}
CloseHandle(ev);
} while (ret != WAIT_FAILED);
CancelMibChangeNotify2(interfacechange);
} else {
// Windows Vista and newer versions.
HANDLE interfacechange;
// The callback will simply invoke CheckLinkStatus()
DWORD ret = sNotifyIpInterfaceChange(
AF_UNSPEC, // IPv4 and IPv6
(PIPINTERFACE_CHANGE_CALLBACK)OnInterfaceChange,
this, // pass to callback
false, // no initial notification
&interfacechange);
if (ret == NO_ERROR) {
do {
ret = WaitForSingleObject(mCheckEvent, waitTime);
if (!mShutdown) {
waitTime = nextCoalesceWaitTime();
} else {
break;
}
} while (ret != WAIT_FAILED);
sCancelMibChangeNotify2(interfacechange);
} else {
LOG(("Link Monitor: sNotifyIpInterfaceChange returned %d\n", (int)ret));
}
LOG(("Link Monitor: NotifyIpInterfaceChange returned %d\n", (int)ret));
}
return NS_OK;
}
@ -504,7 +441,6 @@ bool nsNotifyAddrListener::CheckICSGateway(PIP_ADAPTER_ADDRESSES aAdapter) {
bool nsNotifyAddrListener::CheckICSStatus(PWCHAR aAdapterName) {
InitNetshellLibrary();
// This method enumerates all privately shared connections and checks if some
// of them has the same name as the one provided in aAdapterName. If such
// connection is found in the collection the adapter is used as ICS gateway