Changeset 21523 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

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/GuestHost/OpenGL/util

Files:

• net.c (modified) (1 diff)
• vboxhgcm.c (modified) (2 diffs)

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