diff options
| author | Odd Stranne <odd@mullvad.net> | 2019-10-07 23:06:42 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-10-07 23:06:42 +0200 |
| commit | b52816cb1337a99fa1031f521eb83e679ff00c33 (patch) | |
| tree | 7dacf5f21ccf11e9f271886cd2da52de5bcfc425 | |
| parent | d22e73b1462f038a4483eb01b9980a1261501f8e (diff) | |
| parent | 0503dfb965770d0cc734c83400b30737d3a12fb0 (diff) | |
| download | mullvadvpn-b52816cb1337a99fa1031f521eb83e679ff00c33.tar.xz mullvadvpn-b52816cb1337a99fa1031f521eb83e679ff00c33.zip | |
Merge branch 'win-detect-offline-quicker'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | windows/winnet/src/winnet/netmonitor.cpp | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index aea18e32c3..6cb4d3dbbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ Line wrap the file at 100 chars. Th #### Windows - More adjustments in online/offline detection logic. +- Be quicker to notice network disconnects. ## [2019.8] - 2019-09-23 diff --git a/windows/winnet/src/winnet/netmonitor.cpp b/windows/winnet/src/winnet/netmonitor.cpp index 777925cce3..bf6636fcd1 100644 --- a/windows/winnet/src/winnet/netmonitor.cpp +++ b/windows/winnet/src/winnet/netmonitor.cpp @@ -19,7 +19,14 @@ bool ValidInterfaceType(const MIB_IF_ROW2 &iface) } } - if (FALSE != iface.InterfaceAndOperStatusFlags.FilterInterface + // + // (Windows 10, and possibly others.) + // The BT adapter is erronously not marked as representing hardware. + // By filtering on this we currently do not support BT tethering. + // + + if (FALSE == iface.InterfaceAndOperStatusFlags.HardwareInterface + || FALSE != iface.InterfaceAndOperStatusFlags.FilterInterface || 0 == iface.PhysicalAddressLength || FALSE != iface.InterfaceAndOperStatusFlags.EndPointInterface) { |