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

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (7 diffs)

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