Changeset 21523 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jul 13, 2009 8:54:34 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: add protocol version check(4108), add max connected clients check

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (6 diffs)
• crserverlib/server_main.c (modified) (7 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -131 +131 @@
     g_pFrameBuffer->COMGETTER(WinId)(&g_winId);
     renderspuSetWindowId((uint32_t)g_winId);
-    crVBoxServerAddClient(u32ClientID);
+    rc = crVBoxServerAddClient(u32ClientID);
 #endif
 
@@ -222 +222 @@
 }
 
+static void svcClientVersionUnsupported(uint32_t minor, uint32_t major)
+{
+    LogRel(("SHARED_CROPENGL: unsupported client version %d.%d\n", minor, major));
+    /*todo add warning window*/
+}
+
 static DECLCALLBACK(void) svcCall (void *, VBOXHGCMCALLHANDLE callHandle, uint32_t u32ClientID, void *pvClient, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
@@ -264 +270 @@
 
                 /* Execute the function. */
-                crVBoxServerClientWrite(u32ClientID, pBuffer, cbBuffer);
+                rc = crVBoxServerClientWrite(u32ClientID, pBuffer, cbBuffer);
+                if (!RT_SUCCESS(rc))
+                {
+                    Assert(VERR_NOT_SUPPORTED==rc);
+                    svcClientVersionUnsupported(0, 0);
+                }
+
             }
             break;
@@ -297 +309 @@
                 /* Update parameters.*/
                 paParms[0].u.pointer.size = cbBuffer; //@todo guest doesn't see this change somehow?
+            } else if (VERR_NOT_SUPPORTED==rc)
+            {
+                svcClientVersionUnsupported(0, 0);
             }
 
@@ -332 +347 @@
 
                 /* Execute the function. */
-                crVBoxServerClientWrite(u32ClientID, pBuffer, cbBuffer);
+                rc = crVBoxServerClientWrite(u32ClientID, pBuffer, cbBuffer);
+                if (!RT_SUCCESS(rc))
+                {
+                    Assert(VERR_NOT_SUPPORTED==rc);
+                    svcClientVersionUnsupported(0, 0);
+                }
+
                 rc = crVBoxServerClientRead(u32ClientID, pWriteback, &cbWriteback);
 
@@ -343 +364 @@
                 paParms[2].u.uint32 = cbWriteback;
             }
+            break;
+        }
+
+        case SHCRGL_GUEST_FN_SET_VERSION:
+        {
+            Log(("svcCall: SHCRGL_GUEST_FN_SET_VERSION\n"));
+
+            /* Verify parameter count and types. */
+            if (cParms != SHCRGL_CPARMS_SET_VERSION)
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            if (    paParms[0].type != VBOX_HGCM_SVC_PARM_32BIT     /* vMajor */
+                 || paParms[1].type != VBOX_HGCM_SVC_PARM_32BIT     /* vMinor */
+               )
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                /* Fetch parameters. */
+                uint32_t vMajor    = paParms[0].u.uint32;
+                uint32_t vMinor    = paParms[1].u.uint32;
+
+                /* Execute the function. */
+                rc = crVBoxServerClientSetVersion(u32ClientID, vMajor, vMinor);
+
+                if (!RT_SUCCESS(rc))
+                {
+                    /*@todo, add warning window*/
+                    svcClientVersionUnsupported(vMajor, vMinor);
+                }
+            }
+
             break;
         }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -319 +319 @@
 }
 
-void crVBoxServerAddClient(uint32_t u32ClientID)
-{
-    CRClient *newClient = (CRClient *) crCalloc(sizeof(CRClient));
-    
+int32_t crVBoxServerAddClient(uint32_t u32ClientID)
+{
+    CRClient *newClient;
+
+    if (cr_server.numClients>=CR_MAX_CLIENTS)
+    {
+        return VERR_MAX_THRDS_REACHED;
+    }
+
+    newClient = (CRClient *) crCalloc(sizeof(CRClient));    
     crDebug("crServer: AddClient u32ClientID=%d", u32ClientID);
 
@@ -336 +342 @@
 
     crServerAddToRunQueue(newClient);
+
+    return VINF_SUCCESS;
 }
 
@@ -363 +371 @@
 }
 
-void crVBoxServerClientWrite(uint32_t u32ClientID, uint8_t *pBuffer, uint32_t cbBuffer)
+int32_t crVBoxServerClientWrite(uint32_t u32ClientID, uint8_t *pBuffer, uint32_t cbBuffer)
 {
     CRClient *pClient;
@@ -380 +388 @@
     pClient = cr_server.clients[i];
     CRASSERT(pClient);
+
+    if (!pClient->conn->vMajor) return VERR_NOT_SUPPORTED;
 
     CRASSERT(pBuffer);
@@ -436 +446 @@
 
     CRASSERT(!pClient->conn->allow_redir_ptr || crNetNumMessages(pClient->conn)==0);
+
+    return VINF_SUCCESS;
 }
 
@@ -456 +468 @@
     CRASSERT(pClient);
 
+    if (!pClient->conn->vMajor) return VERR_NOT_SUPPORTED;
+
     if (pClient->conn->cbHostBuffer > *pcbBuffer)
     {
@@ -478 +492 @@
     
     return VINF_SUCCESS;
+}
+
+int32_t crVBoxServerClientSetVersion(uint32_t u32ClientID, uint32_t vMajor, uint32_t vMinor)
+{
+    CRClient *pClient;
+    int32_t i;
+
+    for (i = 0; i < cr_server.numClients; i++)
+    {
+        if (cr_server.clients[i] && cr_server.clients[i]->conn 
+            && cr_server.clients[i]->conn->u32ClientID==u32ClientID) 
+        {
+            break;
+        }
+    }
+    pClient = cr_server.clients[i];
+    CRASSERT(pClient);
+
+    pClient->conn->vMajor = vMajor;
+    pClient->conn->vMinor = vMinor;
+
+    if (vMajor != CR_PROTOCOL_VERSION_MAJOR
+        || vMinor != CR_PROTOCOL_VERSION_MINOR)
+    {
+        return VERR_NOT_SUPPORTED;
+    }
+    else return VINF_SUCCESS;
 }