Changeset 39493 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 1, 2011 3:42:02 PM (13 years ago)

Author:

vboxsync

Message:

VRDP, Main: forward UTCINFO events as guest properties.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• ConsoleVRDPServer.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -809 +809 @@
 }
 
+void Console::guestPropertiesVRDPUpdateClientAttach(uint32_t u32ClientId, bool fAttached)
+{
+    if (!guestPropertiesVRDPEnabled())
+        return;
+
+    Bstr bstrReadOnlyGuest(L"RDONLYGUEST");
+
+    char szPropNm[256];
+    RTStrPrintf(szPropNm, sizeof(szPropNm), "/VirtualBox/HostInfo/VRDP/Client/%u/Attach", u32ClientId);
+
+    Bstr bstrValue = fAttached? "1": "0";
+
+    mMachine->SetGuestProperty(Bstr(szPropNm).raw(),
+                               bstrValue.raw(),
+                               bstrReadOnlyGuest.raw());
+}
+
 void Console::guestPropertiesVRDPUpdateDisconnect(uint32_t u32ClientId)
 {
@@ -826 +843 @@
 
     RTStrPrintf(szPropNm, sizeof(szPropNm), "/VirtualBox/HostInfo/VRDP/Client/%u/Domain", u32ClientId);
+    mMachine->SetGuestProperty(Bstr(szPropNm).raw(), NULL,
+                               bstrReadOnlyGuest.raw());
+
+    RTStrPrintf(szPropNm, sizeof(szPropNm), "/VirtualBox/HostInfo/VRDP/Client/%u/Attach", u32ClientId);
     mMachine->SetGuestProperty(Bstr(szPropNm).raw(), NULL,
                                bstrReadOnlyGuest.raw());
@@ -1088 +1109 @@
 }
 
-void Console::VRDPClientNameChange(uint32_t u32ClientId, const char *pszName)
+void Console::VRDPClientStatusChange(uint32_t u32ClientId, const char *pszStatus)
 {
     LogFlowFuncEnter();
@@ -1095 +1116 @@
     AssertComRCReturnVoid(autoCaller.rc());
 
-    guestPropertiesVRDPUpdateNameChange(u32ClientId, pszName);
+    /* Parse the status string. */
+    if (RTStrICmp(pszStatus, "ATTACH") == 0)
+    {
+        guestPropertiesVRDPUpdateClientAttach(u32ClientId, true);
+    }
+    else if (RTStrICmp(pszStatus, "DETACH") == 0)
+    {
+        guestPropertiesVRDPUpdateClientAttach(u32ClientId, false);
+    }
+    else if (RTStrNICmp(pszStatus, "NAME=", strlen("NAME=")) == 0)
+    {
+        guestPropertiesVRDPUpdateNameChange(u32ClientId, pszStatus + strlen("NAME="));
+    }
+
+    LogFlowFuncLeave();
 }
 

trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

@@ -856 +856 @@
         } break;
 
-        case VRDE_SP_CLIENT_NAME:
-        {
-            if (cbBuffer < sizeof(VRDECLIENTNAME))
+        case VRDE_SP_CLIENT_STATUS:
+        {
+            if (cbBuffer < sizeof(VRDECLIENTSTATUS))
             {
                 rc = VERR_INVALID_PARAMETER;
@@ -864 +864 @@
             }
 
-            size_t cbName = cbBuffer - RT_OFFSETOF(VRDECLIENTNAME, achName);
-
-            VRDECLIENTNAME *pClientName = (VRDECLIENTNAME *)pvBuffer;
-
-            size_t cchName = 0;
-            rc = RTStrNLenEx(pClientName->achName, cbName, &cchName);
-
-            if (RT_FAILURE(rc))
+            size_t cbStatus = cbBuffer - RT_UOFFSETOF(VRDECLIENTSTATUS, achStatus);
+
+            VRDECLIENTSTATUS *pStatus = (VRDECLIENTSTATUS *)pvBuffer;
+
+            if (cbBuffer < RT_UOFFSETOF(VRDECLIENTSTATUS, achStatus) + pStatus->cbStatus)
             {
                 rc = VERR_INVALID_PARAMETER;
@@ -877 +874 @@
             }
 
-            Log(("VRDE_SP_CLIENT_NAME [%s]\n", pClientName->achName));
-
-            server->mConsole->VRDPClientNameChange(pClientName->u32ClientId, pClientName->achName);
+            size_t cchStatus = 0;
+            rc = RTStrNLenEx(pStatus->achStatus, cbStatus, &cchStatus);
+
+            if (RT_FAILURE(rc))
+            {
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            Log(("VRDE_SP_CLIENT_STATUS [%s]\n", pStatus->achStatus));
+
+            server->mConsole->VRDPClientStatusChange(pStatus->u32ClientId, pStatus->achStatus);
 
             rc = VINF_SUCCESS;