Changeset 21523 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

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

49976

Message:

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

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_net.h (modified) (1 diff)
• GuestHost/OpenGL/include/cr_protocol.h (modified) (1 diff)
• GuestHost/OpenGL/include/cr_server.h (modified) (1 diff)
• GuestHost/OpenGL/util/net.c (modified) (1 diff)
• GuestHost/OpenGL/util/vboxhgcm.c (modified) (2 diffs)
• HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (6 diffs)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (7 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_net.h

@@ -227 +227 @@
      */
     uint8_t  allow_redir_ptr;
+
+    uint32_t vMajor, vMinor; /*Protocol version*/
 };
 

trunk/src/VBox/GuestHost/OpenGL/include/cr_protocol.h

@@ -13 +13 @@
 extern "C" {
 #endif
+
+/*For now guest is allowed to connect host opengl service if protocol version matches exactly*/
+/*Note: that after any change to this file, or glapi_parser\apispec.txt version should be changed*/
+#define CR_PROTOCOL_VERSION_MAJOR 1
+#define CR_PROTOCOL_VERSION_MINOR 1
 
 typedef enum {

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -213 +213 @@
 extern DECLEXPORT(GLboolean) crVBoxServerInit(void);
 extern DECLEXPORT(void) crVBoxServerTearDown(void);
-extern DECLEXPORT(void) crVBoxServerAddClient(uint32_t u32ClientID);
+extern DECLEXPORT(int32_t) crVBoxServerAddClient(uint32_t u32ClientID);
 extern DECLEXPORT(void) crVBoxServerRemoveClient(uint32_t u32ClientID);
-extern DECLEXPORT(void) crVBoxServerClientWrite(uint32_t u32ClientID, uint8_t *pBuffer, uint32_t cbBuffer);
+extern DECLEXPORT(int32_t) crVBoxServerClientWrite(uint32_t u32ClientID, uint8_t *pBuffer, uint32_t cbBuffer);
 extern DECLEXPORT(int32_t) crVBoxServerClientRead(uint32_t u32ClientID, uint8_t *pBuffer, uint32_t *pcbBuffer);
+extern DECLEXPORT(int32_t) crVBoxServerClientSetVersion(uint32_t u32ClientID, uint32_t vMajor, uint32_t vMinor);
 
 extern DECLEXPORT(int32_t) crVBoxServerSaveState(PSSMHANDLE pSSM);

trunk/src/VBox/GuestHost/OpenGL/util/net.c

@@ -278 +278 @@
             crFreeMutex( &conn->messageList.lock );
         #endif
+        conn->Disconnect(conn);
         crFree( conn );
         return NULL;

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -669 +669 @@
     CRASSERT(FALSE);
 #endif
+}
+
+static int crVBoxHGCMSetVersion(CRConnection *conn, unsigned int vMajor, unsigned int vMinor)
+{
+    CRVBOXHGCMSETVERSION parms;
+    int rc;
+
+    parms.hdr.result      = VINF_SUCCESS;
+    parms.hdr.u32ClientID = conn->u32ClientID;
+    parms.hdr.u32Function = SHCRGL_GUEST_FN_SET_VERSION;
+    parms.hdr.cParms      = SHCRGL_CPARMS_SET_VERSION;
+
+    parms.vMajor.type      = VMMDevHGCMParmType_32bit;
+    parms.vMajor.u.value32 = CR_PROTOCOL_VERSION_MAJOR;
+    parms.vMinor.type      = VMMDevHGCMParmType_32bit;
+    parms.vMinor.u.value32 = CR_PROTOCOL_VERSION_MINOR;
+
+    rc = crVBoxHGCMCall(&parms, sizeof(parms));
+
+    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.result))
+    {
+        crWarning("Host doesn't accept our version %d.%d. Make sure you have appropriate additions installed!",
+                  parms.vMajor.u.value32, parms.vMinor.u.value32);
+        return FALSE;
+    }
+
+    conn->vMajor = CR_PROTOCOL_VERSION_MAJOR;
+    conn->vMinor = CR_PROTOCOL_VERSION_MINOR;
+
+    return TRUE;
 }
 
@@ -744 +774 @@
             conn->u32ClientID = info.u32ClientID;
             crDebug("HGCM connect was successful: client id =0x%x\n", conn->u32ClientID);
+
+            return crVBoxHGCMSetVersion(conn, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR);
         }
         else

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;
 }