Changeset 103489 in vbox

Timestamp:

Feb 21, 2024 11:03:57 AM (9 months ago)

Author:

vboxsync

Message:

libs/xpcom: VBoxSVC and the IPC daemon spawning code need to agree on what is the magic going through the startup pipe, bugref:10594

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd

Files:

• client/src/ipcdclient.cpp (modified) (1 diff)
• shared/src/ipcConfig.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp

@@ -1393 +1393 @@
           hPipeWr = NIL_RTPIPE;
 
-          uint8_t ch;
-          vrc = RTPipeReadBlocking(hPipeRd, &ch, sizeof(ch), NULL /*pcbRead*/);
+          size_t cbRead = 0;
+          char msg[10];
+          memset(msg, '\0', sizeof(msg));
+          vrc = RTPipeReadBlocking(hPipeRd, &msg[0], sizeof(msg) - 1, &cbRead);
           if (   RT_SUCCESS(vrc)
-              && ch == IPC_STARTUP_PIPE_MAGIC)
+              && cbRead == 5
+              && !strcmp(msg, "READY"))
           {
             RTPipeClose(hPipeRd);

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.h

@@ -61 +61 @@
 NS_HIDDEN_(void) IPC_GetDefaultSocketPath(char *buf, PRUint32 bufLen);
 
-// common shared configuration values
-
-#define IPC_STARTUP_PIPE_NAME   "ipc:startup-pipe"
-#define IPC_STARTUP_PIPE_MAGIC  0x1C
-
 #endif // !ipcProto_h__