Changeset 39106 in vbox

Timestamp:

Oct 25, 2011 9:45:40 AM (13 years ago)

Author:

vboxsync

Message:

VBoxService/VMInfo: Hook CTRL_LOGOFF_EVENT to re-trigger user enumeration on Windows guests to get immediate disconnects from VRDP when a user has been logged out.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceVMInfo-win.cpp (modified) (7 diffs)
• VBoxServiceVMInfo.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -72 +72 @@
 *   Prototypes
 *******************************************************************************/
-bool VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession, VBOXSERVICEVMINFOPROC const *paProcs, DWORD cProcs);
+uint32_t VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession, VBOXSERVICEVMINFOPROC const *paProcs, DWORD cProcs);
 bool VBoxServiceVMInfoWinIsLoggedIn(PVBOXSERVICEVMINFOUSER a_pUserInfo, PLUID a_pSession);
 int  VBoxServiceVMInfoWinProcessesEnumerate(PVBOXSERVICEVMINFOPROC *ppProc, DWORD *pdwCount);
@@ -251 +251 @@
  * Determines whether the specified session has processes on the system.
  *
- * @returns true if it has, false if it doesn't.
+ * @returns Number of processes found for a specified session.
  * @param   pSession        The session.
  * @param   paProcs         The process snapshot.
  * @param   cProcs          The number of processes in the snaphot.
  */
-bool VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession, VBOXSERVICEVMINFOPROC const *paProcs, DWORD cProcs)
+uint32_t VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession, VBOXSERVICEVMINFOPROC const *paProcs, DWORD cProcs)
 {
     if (!pSession)
     {
         VBoxServiceVerbose(1, "VMInfo/Users: Session became invalid while enumerating!\n");
-        return false;
+        return 0;
     }
 
@@ -269 +269 @@
     {
         VBoxServiceError("VMInfo/Users: Could not get logon session data! rcNt=%#x", rcNt);
-        return false;
+        return 0;
     }
 
@@ -292 +292 @@
     }
 
-    VBoxServiceVerbose(3, "VMInfo/Users: Session %u has %u processes\n",
-                       pSessionData->Session, cNumProcs);
+    if (g_cVerbosity >= 4)
+        VBoxServiceVerbose(3, "VMInfo/Users: Session %u has %u processes\n",
+                           pSessionData->Session, cNumProcs);
+    else
+        VBoxServiceVerbose(3, "VMInfo/Users: Session %u has at least one process\n",
+                           pSessionData->Session);
 
     LsaFreeReturnBuffer(pSessionData);
-    return cNumProcs ? true : false;
+    return cNumProcs;
 }
 
@@ -560 +564 @@
                 if (VBoxServiceVMInfoWinIsLoggedIn(&UserInfo, &paSessions[i]))
                 {
-                    VBoxServiceVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs);
+                    uint32_t cSessionProcs = VBoxServiceVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs);
+                    if (!cSessionProcs)
+                        continue;
 
                     bool fFoundUser = false;
@@ -573 +579 @@
                              * we detected a stale session. */
                             if (   pUserInfo[i].ulNumProcs > 0
-                                && !cProcs)
+                                && !cSessionProcs)
                             {
                                 VBoxServiceVerbose(3, "VMInfo/Users: Stale session for user=%ls detected! Old processes: %u, new: %u\n",
-                                                   pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, cProcs);
+                                                   pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, cSessionProcs);
                             }
 
                             VBoxServiceVerbose(4, "VMInfo/Users: Updating user=%ls to %u processes\n",
-                                               UserInfo.wszUser, cProcs);
-
-                            pUserInfo[i].ulNumProcs = cProcs;
+                                               UserInfo.wszUser, cSessionProcs);
+
+                            pUserInfo[i].ulNumProcs = cSessionProcs;
                             fFoundUser = true;
                             break;
@@ -591 +597 @@
                     {
                         VBoxServiceVerbose(4, "VMInfo/Users: Adding new user=%ls with %u processes\n",
-                                           UserInfo.wszUser, cProcs);
-
-                        memcpy(&pUserInfo[cUniqueUsers++], &UserInfo, sizeof(VBOXSERVICEVMINFOUSER));
+                                           UserInfo.wszUser, cSessionProcs);
+
+                        memcpy(&pUserInfo[cUniqueUsers], &UserInfo, sizeof(VBOXSERVICEVMINFOUSER));
+                        pUserInfo[cUniqueUsers++].ulNumProcs = cSessionProcs;
                         Assert(cUniqueUsers <= cSessions);
                     }

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -83 +83 @@
 
 
+#ifdef RT_OS_WINDOWS
+static BOOL WINAPI VBoxServiceVMInfoConsoleControlHandler(DWORD dwCtrlType)
+{
+    int rc = VINF_SUCCESS;
+    bool fEventHandled = FALSE;
+    switch (dwCtrlType)
+    {
+        case CTRL_LOGOFF_EVENT:
+            VBoxServiceVerbose(2, "VMInfo: Received logged-off event\n");
+            /* Trigger a re-enumeration of all logged-in users by unblocking
+             * the multi event semaphore of the VMInfo thread. */
+            if (g_hVMInfoEvent)
+                rc = RTSemEventMultiSignal(g_hVMInfoEvent);
+            fEventHandled = TRUE;
+            break;
+        default:
+            break;
+        /** @todo Add other events here. */
+    }
+
+    if (RT_FAILURE(rc))
+        VBoxServiceError("VMInfo: Event %ld handled with error rc=%Rrc\n",
+                         dwCtrlType, rc);
+    return fEventHandled;
+}
+#endif /* RT_OS_WINDOWS */
+
+
 /** @copydoc VBOXSERVICE::pfnPreInit */
 static DECLCALLBACK(int) VBoxServiceVMInfoPreInit(void)
@@ -154 +182 @@
         VBoxServicePropCacheUpdateEntry(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/Net/Count",
                                         VBOXSERVICEPROPCACHEFLAG_TEMPORARY | VBOXSERVICEPROPCACHEFLAG_ALWAYS_UPDATE, NULL /* Delete on exit */);
+
+#ifdef RT_OS_WINDOWS
+# ifndef RT_OS_NT4
+    /* Install console control handler. */
+    if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)VBoxServiceVMInfoConsoleControlHandler, TRUE /* Add handler */))
+    {
+        VBoxServiceError("VMInfo: Unable to add console control handler, error=%ld\n", GetLastError());
+        /* Just skip this error, not critical. */
+    }
+# endif /* !RT_OS_NT4 */
+#endif /* RT_OS_WINDOWS */
     }
     return rc;
@@ -812 +851 @@
             break;
         }
+        else if (RT_LIKELY(RT_SUCCESS(rc2)))
+        {
+            /* Reset event semaphore if it got triggered. */
+            rc2 = RTSemEventMultiReset(g_hVMInfoEvent);
+            if (RT_FAILURE(rc2))
+                rc2 = VBoxServiceError("VMInfo: RTSemEventMultiReset failed; rc2=%Rrc\n", rc2);
+        }
     }
 
@@ -833 +879 @@
 {
     int rc;
+
+#ifdef RT_OS_WINDOWS
+# ifndef RT_OS_NT4
+    /* Install console control handler. */
+    if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)NULL, FALSE /* Remove handler */))
+    {
+        VBoxServiceError("VMInfo: Unable to remove console control handler, error=%ld\n", GetLastError());
+        /* Just skip this error, not critical. */
+    }
+# endif /* !RT_OS_NT4 */
+#endif
 
     if (g_hVMInfoEvent != NIL_RTSEMEVENTMULTI)