1 files changed, 31 insertions, 7 deletions

diff --git a/src/network/kernel/qnetconmonitor_win.cpp b/src/network/kernel/qnetconmonitor_win.cpp
index 1566e7f914..59b6cd5b66 100644
--- a/src/network/kernel/qnetconmonitor_win.cpp
+++ b/src/network/kernel/qnetconmonitor_win.cpp
@@ -163,11 +163,14 @@ private:
     ComPtr<QNetworkConnectionEvents> connectionEvents;
     // We can assume we have access to internet/subnet when this class is created because
     // connection has already been established to the peer:
-    NLM_CONNECTIVITY connectivity =
-            NLM_CONNECTIVITY(NLM_CONNECTIVITY_IPV4_INTERNET | NLM_CONNECTIVITY_IPV6_INTERNET
-                             | NLM_CONNECTIVITY_IPV4_SUBNET | NLM_CONNECTIVITY_IPV6_SUBNET);
+    NLM_CONNECTIVITY connectivity = NLM_CONNECTIVITY(
+            NLM_CONNECTIVITY_IPV4_INTERNET | NLM_CONNECTIVITY_IPV6_INTERNET
+            | NLM_CONNECTIVITY_IPV4_SUBNET | NLM_CONNECTIVITY_IPV6_SUBNET
+            | NLM_CONNECTIVITY_IPV4_LOCALNETWORK | NLM_CONNECTIVITY_IPV6_LOCALNETWORK
+            | NLM_CONNECTIVITY_IPV4_NOTRAFFIC | NLM_CONNECTIVITY_IPV6_NOTRAFFIC);
 
     bool sameSubnet = false;
+    bool isLinkLocal = false;
     bool monitoring = false;
     bool comInitFailed = false;
     bool remoteIsIPv6 = false;
@@ -370,6 +373,7 @@ bool QNetworkConnectionMonitorPrivate::setTargets(const QHostAddress &local,
         return false;
     }
     sameSubnet = remote.isInSubnet(local, it->prefixLength());
+    isLinkLocal = remote.isLinkLocal() && local.isLinkLocal();
     remoteIsIPv6 = remote.protocol() == QAbstractSocket::IPv6Protocol;
 
     return connectionEvents->setTarget(iface);
@@ -461,9 +465,28 @@ void QNetworkConnectionMonitor::stopMonitoring()
 bool QNetworkConnectionMonitor::isReachable()
 {
     Q_D(QNetworkConnectionMonitor);
-    NLM_CONNECTIVITY required = d->sameSubnet
-            ? (d->remoteIsIPv6 ? NLM_CONNECTIVITY_IPV6_SUBNET : NLM_CONNECTIVITY_IPV4_SUBNET)
-            : (d->remoteIsIPv6 ? NLM_CONNECTIVITY_IPV6_INTERNET : NLM_CONNECTIVITY_IPV4_INTERNET);
+
+    const NLM_CONNECTIVITY RequiredSameSubnetIPv6 =
+            NLM_CONNECTIVITY(NLM_CONNECTIVITY_IPV6_SUBNET | NLM_CONNECTIVITY_IPV6_LOCALNETWORK
+                             | NLM_CONNECTIVITY_IPV6_INTERNET);
+    const NLM_CONNECTIVITY RequiredSameSubnetIPv4 =
+            NLM_CONNECTIVITY(NLM_CONNECTIVITY_IPV4_SUBNET | NLM_CONNECTIVITY_IPV4_LOCALNETWORK
+                             | NLM_CONNECTIVITY_IPV4_INTERNET);
+
+    NLM_CONNECTIVITY required;
+    if (d->isLinkLocal) {
+        required = NLM_CONNECTIVITY(
+                d->remoteIsIPv6 ? NLM_CONNECTIVITY_IPV6_NOTRAFFIC | RequiredSameSubnetIPv6
+                                : NLM_CONNECTIVITY_IPV4_NOTRAFFIC | RequiredSameSubnetIPv4);
+    } else if (d->sameSubnet) {
+        required =
+                NLM_CONNECTIVITY(d->remoteIsIPv6 ? RequiredSameSubnetIPv6 : RequiredSameSubnetIPv4);
+
+    } else {
+        required = NLM_CONNECTIVITY(d->remoteIsIPv6 ? NLM_CONNECTIVITY_IPV6_INTERNET
+                                                    : NLM_CONNECTIVITY_IPV4_INTERNET);
+    }
+
     return d_func()->connectivity & required;
 }
 
@@ -695,7 +718,8 @@ bool QNetworkStatusMonitor::isNetworkAccessible()
 {
     return d_func()->connectivity
             & (NLM_CONNECTIVITY_IPV4_INTERNET | NLM_CONNECTIVITY_IPV6_INTERNET
-               | NLM_CONNECTIVITY_IPV4_SUBNET | NLM_CONNECTIVITY_IPV6_SUBNET);
+               | NLM_CONNECTIVITY_IPV4_SUBNET | NLM_CONNECTIVITY_IPV6_SUBNET
+               | NLM_CONNECTIVITY_IPV4_LOCALNETWORK | NLM_CONNECTIVITY_IPV6_LOCALNETWORK);
 }
 
 bool QNetworkStatusMonitor::isEnabled()