Changeset 56205 in vbox

Timestamp:

Jun 2, 2015 2:34:47 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100744

Message:

NetLwf: Notify all address changes via all filters, add all addresses at filter instance creation, moved hNotifier from module to filter instance to avoid crashes when NDIS initiates unload (#7661).

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp (modified) (11 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp

@@ -18 +18 @@
 //#define VBOXNETLWF_SYNC_SEND
 #define VBOXNETLWF_NO_BYPASS
-#define VBOXNETLWF_SUPRESS_REDUNDANT_NOTIFICATIONS
 
 #include <VBox/version.h>
@@ -81 +80 @@
     /** filter module context handle */
     NDIS_HANDLE hModuleCtx;
+    /** IP address change notifier handle */
+    HANDLE hNotifier; /* Must be here as hModuleCtx may already be NULL when vboxNetFltOsDeleteInstance is called */
 } VBOXNETFLTWIN, *PVBOXNETFLTWIN;
 #define VBOXNETFLT_NO_PACKET_QUEUE
@@ -191 +192 @@
     /** MAC address of underlying adapter */
     RTMAC MacAddr;
-    /** Index of underlying adapter */
-    NET_IFINDEX uIfIndex;
-    /** IP address change notifier handle */
-    HANDLE hNotifier;
     /** Saved offload configuration */
     NDIS_OFFLOAD SavedOffloadConfig;
@@ -803 +800 @@
     pModuleCtx->pGlobals  = pGlobals;
     pModuleCtx->hFilter   = hFilter;
-    pModuleCtx->uIfIndex  = pParameters->BaseMiniportIfIndex;
-    pModuleCtx->hNotifier = NULL;
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Attaching);
     /* Insert into module chain */
@@ -2194 +2189 @@
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)pThis->u.s.WinIf.hModuleCtx;
 
-#ifdef VBOXNETLWF_SUPRESS_REDUNDANT_NOTIFICATIONS
-    /* Ignore notifications on the interfaces we are not attached to. */
-    if (pRow && pModule->uIfIndex != pRow->InterfaceIndex)
-    {
-        Log((__FUNCTION__ ": ignoring notification for luid %d-%d, index %d\n",
-             pRow->InterfaceLuid.Info.IfType, pRow->InterfaceLuid.Info.NetLuidIndex,
-             pRow->InterfaceIndex));
-        return;
-    }
-#endif /* VBOXNETLWF_SUPRESS_REDUNDANT_NOTIFICATIONS */
-
     /* We are only interested in add or remove notifications. */
     bool fAdded;
@@ -2219 +2203 @@
         {
             case AF_INET:
-                Log(("vboxNetLwfWinIpAddrChangeCallback: %s IPv4 addr=%RTnaipv4 on luid=(%u,%u)\n",
+                Log((__FUNCTION__": %s IPv4 addr=%RTnaipv4 on luid=(%u,%u)\n",
                      fAdded ? "add" : "remove", pRow->Address.Ipv4.sin_addr,
                      pRow->InterfaceLuid.Info.IfType, pRow->InterfaceLuid.Info.NetLuidIndex));
@@ -2226 +2210 @@
                 break;
             case AF_INET6:
-                Log(("vboxNetLwfWinIpAddrChangeCallback: %s IPv6 addr=%RTnaipv6 luid=(%u,%u)\n",
+                Log((__FUNCTION__": %s IPv6 addr=%RTnaipv6 luid=(%u,%u)\n",
                      fAdded ? "add" : "remove", &pRow->Address.Ipv6.sin6_addr,
                      pRow->InterfaceLuid.Info.IfType, pRow->InterfaceLuid.Info.NetLuidIndex));
@@ -2235 +2219 @@
     }
     else
-        Log(("vboxNetLwfWinIpAddrChangeCallback: pRow=%p pfnNotifyHostAddress=%p\n",
+        Log((__FUNCTION__": pRow=%p pfnNotifyHostAddress=%p\n",
              pRow, pThis->pSwitchPort->pfnNotifyHostAddress));
 }
 
-void vboxNetLwfWinRegisterIpAddrNotifier(PVBOXNETFLTINS pThis, PVBOXNETLWF_MODULE pModuleCtx)
+void vboxNetLwfWinRegisterIpAddrNotifier(PVBOXNETFLTINS pThis)
 {
     if (pThis->pSwitchPort && pThis->pSwitchPort->pfnNotifyHostAddress)
     {
         NETIO_STATUS Status;
+        /* First we need to go over all host IP addresses and add them via pfnNotifyHostAddress. */
+        PMIB_UNICASTIPADDRESS_TABLE HostIpAddresses = NULL;
+        Status = GetUnicastIpAddressTable(AF_UNSPEC, &HostIpAddresses);
+        if (NETIO_SUCCESS(Status))
+        {
+            for (int i = 0; i < HostIpAddresses->NumEntries; i++)
+                vboxNetLwfWinIpAddrChangeCallback(pThis, &HostIpAddresses->Table[i], MibAddInstance);
+        }
+        else
+            Log((__FUNCTION__": GetUnicastIpAddressTable failed with %x\n", Status));
+        /* Now we can register a callback function to keep track of address changes. */
         Status = NotifyUnicastIpAddressChange(AF_UNSPEC, vboxNetLwfWinIpAddrChangeCallback,
-                                              pThis, false, &pModuleCtx->hNotifier);
-        if (!NETIO_SUCCESS(Status))
-            Log(("vboxNetLwfWinRegisterIpAddrNotifier: NotifyUnicastIpAddressChange failed with %x\n", Status));
+                                              pThis, false, &pThis->u.s.WinIf.hNotifier);
+        if (NETIO_SUCCESS(Status))
+            Log((__FUNCTION__": notifier=%p\n", pThis->u.s.WinIf.hNotifier));
         else
-            Log(("vboxNetLwfWinRegisterIpAddrNotifier: notifier=%p\n", pModuleCtx->hNotifier));
+            Log((__FUNCTION__": NotifyUnicastIpAddressChange failed with %x\n", Status));
     }
     else
-        pModuleCtx->hNotifier = NULL;
-}
-
-void vboxNetLwfWinUnregisterIpAddrNotifier(PVBOXNETLWF_MODULE pModuleCtx)
-{
-    Log(("vboxNetLwfWinUnregisterIpAddrNotifier: notifier=%p\n", pModuleCtx->hNotifier));
-    if (pModuleCtx->hNotifier)
-        CancelMibChangeNotify2(pModuleCtx->hNotifier);
+        pThis->u.s.WinIf.hNotifier = NULL;
+}
+
+void vboxNetLwfWinUnregisterIpAddrNotifier(PVBOXNETFLTINS pThis)
+{
+    Log((__FUNCTION__": notifier=%p\n", pThis->u.s.WinIf.hNotifier));
+    if (pThis->u.s.WinIf.hNotifier)
+        CancelMibChangeNotify2(pThis->u.s.WinIf.hNotifier);
 }
 
@@ -2267 +2262 @@
     LogFlow(("==>"__FUNCTION__": instance=%p module=%p\n", pThis, pModuleCtx));
     /* Cancel IP address change notifications */
-    vboxNetLwfWinUnregisterIpAddrNotifier(pModuleCtx);
+    vboxNetLwfWinUnregisterIpAddrNotifier(pThis);
     /* Technically it is possible that the module has already been gone by now. */
     if (pModuleCtx)
@@ -2310 +2305 @@
             pModuleCtx->pNetFlt = pThis;
             vboxNetLwfWinReportCapabilities(pThis, pModuleCtx);
-            vboxNetLwfWinRegisterIpAddrNotifier(pThis, pModuleCtx);
+            vboxNetLwfWinRegisterIpAddrNotifier(pThis);
             LogFlow(("<=="__FUNCTION__": return 0\n"));
             return VINF_SUCCESS;
@@ -2323 +2318 @@
     LogFlow(("==>"__FUNCTION__": instance=%p\n", pThis));
     pThis->u.s.WinIf.hModuleCtx = 0;
+    pThis->u.s.WinIf.hNotifier  = NULL;
     LogFlow(("<=="__FUNCTION__": return 0\n"));
     return VINF_SUCCESS;