Changeset 7029 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/daemon

Timestamp:

Feb 20, 2008 11:54:09 AM (17 years ago)

Author:

vboxsync

Message:

XPCOM/IPC: Made IPC_AddName()/IPC_RemoveName(), IPC_DefineTarget() to return a failure when the name/target is already defined or when a non-existent name/target is requested for removal.

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src

Files:

• ipcClient.cpp (modified) (4 diffs)
• ipcClient.h (modified) (4 diffs)
• ipcCommandModule.cpp (modified) (8 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcClient.cpp

@@ -96 +96 @@
 }
 
-void
+PRBool
 ipcClient::DelName(const char *name)
 {
     LOG(("deleting client name: %s\n", name));
 
-    mNames.FindAndDelete(name);
+    return mNames.FindAndDelete(name);
 }
 
@@ -115 +115 @@
 }
 
-void
+PRBool
 ipcClient::DelTarget(const nsID &target)
 {
@@ -124 +124 @@
     //
     if (!target.Equals(IPCM_TARGET))
-        mTargets.FindAndDelete(target);
+        return mTargets.FindAndDelete(target);
+
+    return PR_FALSE;
 }
 
@@ -185 +187 @@
         }
     }
-  
+
     if (inFlags & PR_POLL_WRITE) {
         LOG(("client socket is now writable\n"));

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcClient.h

@@ -65 +65 @@
 
     void   AddName(const char *name);
-    void   DelName(const char *name);
+    PRBool DelName(const char *name);
     PRBool HasName(const char *name) const { return mNames.Find(name) != NULL; }
 
     void   AddTarget(const nsID &target);
-    void   DelTarget(const nsID &target);
+    PRBool DelTarget(const nsID &target);
     PRBool HasTarget(const nsID &target) const { return mTargets.Find(target) != NULL; }
 
@@ -96 +96 @@
     //
     // returns:
-    //   0             - to cancel client connection  
+    //   0             - to cancel client connection
     //   PR_POLL_READ  - to poll for a readable socket
     //   PR_POLL_WRITE - to poll for a writable socket
@@ -102 +102 @@
     //
     // the socket is non-blocking.
-    // 
+    //
     int Process(PRFileDesc *sockFD, int pollFlags);
 
@@ -125 +125 @@
     // encoded in it.
     PRUint32      mPID;
-    
+
     // the hwnd of the client's message window.
     HWND          mHwnd;

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcCommandModule.cpp

@@ -62 +62 @@
 
         const ipcStringNode *node;
-        
+
         for (node = nodes; node; node = node->mNext)
             count++;
@@ -84 +84 @@
 
         const ipcIDNode *node;
-        
+
         for (node = nodes; node; node = node->mNext)
             count++;
@@ -133 +133 @@
         LOG(("got CLIENT_ADD_NAME\n"));
 
+        PRInt32 status = IPCM_OK;
+        PRUint32 requestIndex = IPCM_GetRequestIndex(rawMsg);
+
         ipcMessageCast<ipcmMessageClientAddName> msg(rawMsg);
         const char *name = msg->Name();
-        if (name)
-            client->AddName(name);
-
-        // TODO: send better status code (e.g., suppose name already defined for client)
-        IPC_SendMsg(client, new ipcmMessageResult(IPCM_GetRequestIndex(rawMsg), IPCM_OK));
+        if (name) {
+            ipcClient *result = IPC_GetClientByName(msg->Name());
+            if (result) {
+                LOG(("  client with such name already exists (ID = %d)\n", result->ID()));
+                status = IPCM_ERROR_ALREADY_EXISTS;
+            }
+            else
+                client->AddName(name);
+        }
+        else
+            status = IPCM_ERROR_INVALID_ARG;
+
+        IPC_SendMsg(client, new ipcmMessageResult(requestIndex, status));
     }
 
@@ -146 +157 @@
     {
         LOG(("got CLIENT_DEL_NAME\n"));
+
+        PRInt32 status = IPCM_OK;
+        PRUint32 requestIndex = IPCM_GetRequestIndex(rawMsg);
 
         ipcMessageCast<ipcmMessageClientDelName> msg(rawMsg);
         const char *name = msg->Name();
-        if (name)
-            client->DelName(name);
-
-        // TODO: send better status code (e.g., suppose name not defined for client)
-        IPC_SendMsg(client, new ipcmMessageResult(IPCM_GetRequestIndex(rawMsg), IPCM_OK));
+        if (name) {
+            if (!client->DelName(name)) {
+                LOG(("  client doesn't have name '%s'\n", name));
+                status = IPCM_ERROR_NO_SUCH_DATA;
+            }
+        }
+        else
+            status = IPCM_ERROR_INVALID_ARG;
+
+        IPC_SendMsg(client, new ipcmMessageResult(requestIndex, status));
     }
 
@@ -161 +180 @@
         LOG(("got CLIENT_ADD_TARGET\n"));
 
+        PRInt32 status = IPCM_OK;
+        PRUint32 requestIndex = IPCM_GetRequestIndex(rawMsg);
+
         ipcMessageCast<ipcmMessageClientAddTarget> msg(rawMsg);
-        client->AddTarget(msg->Target());
-
-        // TODO: send better status code (e.g., suppose target already defined for client)
-        IPC_SendMsg(client, new ipcmMessageResult(IPCM_GetRequestIndex(rawMsg), IPCM_OK));
+        if (client->HasTarget(msg->Target())) {
+            LOG(("  target already defined for client\n"));
+            status = IPCM_ERROR_ALREADY_EXISTS;
+        }
+        else
+            client->AddTarget(msg->Target());
+
+        IPC_SendMsg(client, new ipcmMessageResult(requestIndex, status));
     }
 
@@ -173 +199 @@
         LOG(("got CLIENT_DEL_TARGET\n"));
 
+        PRInt32 status = IPCM_OK;
+        PRUint32 requestIndex = IPCM_GetRequestIndex(rawMsg);
+
         ipcMessageCast<ipcmMessageClientDelTarget> msg(rawMsg);
-        client->DelTarget(msg->Target());
-
-        // TODO: send better status code (e.g., suppose target not defined for client)
-        IPC_SendMsg(client, new ipcmMessageResult(IPCM_GetRequestIndex(rawMsg), IPCM_OK));
+        if (!client->DelTarget(msg->Target())) {
+            LOG(("  client doesn't have the given target\n"));
+            status = IPCM_ERROR_NO_SUCH_DATA;
+        }
+
+        IPC_SendMsg(client, new ipcmMessageResult(requestIndex, status));
     }
 
@@ -222 +253 @@
         else {
             LOG(("  client does not exist\n"));
-            IPC_SendMsg(client, new ipcmMessageError(IPCM_ERROR_CLIENT_NOT_FOUND, msg->RequestIndex()));
+            IPC_SendMsg(client, new ipcmMessageError(IPCM_ERROR_NO_CLIENT, msg->RequestIndex()));
         }
     }
@@ -278 +309 @@
     type--;
     if (type < 0 || type >= (int) (sizeof(handlers)/sizeof(handlers[0]))) {
-        LOG(("unknown request -- ignoring message\n")); 
+        LOG(("unknown request -- ignoring message\n"));
         return;
     }