Changeset 47234 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Jul 18, 2013 3:36:30 PM (11 years ago)

Author:

vboxsync

Message:

VBoxTray: Add a magic for the IPC header.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxIPC.cpp (modified) (2 diffs)
• VBoxTrayMsg.h (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp

@@ -295 +295 @@
             rc = RTLocalIpcSessionRead(hSession, &ipcHdr, sizeof(ipcHdr),
                                        NULL /* Exact read, blocking */);
+            bool fRejected = false;
+            if (RT_SUCCESS(rc))
+                fRejected = ipcHdr.uMagic != VBOXTRAY_IPC_HDR_MAGIC;
+
             if (RT_SUCCESS(rc))
             {
@@ -313 +317 @@
                     default:
                     {
-                        static int s_cRejectedCmds = 0;
-                        if (++s_cRejectedCmds <= 3)
-                        {
-                            LogRelFunc(("Session %p: Received unknown command %RU32 (%RU32 bytes), rejecting (%RU32/3)\n",
-                                        pThis, ipcHdr.uMsgType, ipcHdr.uMsgLen, s_cRejectedCmds + 1));
-                            if (ipcHdr.uMsgLen)
-                            {
-                                /* Get and discard payload data. */
-                                size_t cbRead;
-                                uint8_t devNull[_1K];
-                                while (ipcHdr.uMsgLen)
-                                {
-                                    rc = RTLocalIpcSessionRead(hSession, &devNull, sizeof(devNull), &cbRead);
-                                    if (RT_FAILURE(rc))
-                                        break;
-                                    AssertRelease(cbRead <= ipcHdr.uMsgLen);
-                                    ipcHdr.uMsgLen -= (uint32_t)cbRead;
-                                }
-                            }
-                        }
-                        else
-                            rc = VERR_INVALID_PARAMETER; /* Enough fun, bail out. */
+                        /* Unknown command, reject. */
+                        fRejected = true;
                         break;
                     }
-
-                    if (RT_FAILURE(rc))
-                        LogFunc(("Session %p: Handling command %RU32 failed with rc=%Rrc\n",
-                                 pThis, ipcHdr.uMsgType, rc));
                 }
+
+                if (RT_FAILURE(rc))
+                    LogFunc(("Session %p: Handling command %RU32 failed with rc=%Rrc\n",
+                             pThis, ipcHdr.uMsgType, rc));
+            }
+
+            if (fRejected)
+            {
+                static int s_cRejectedCmds = 0;
+                if (++s_cRejectedCmds <= 3)
+                {
+                    LogRelFunc(("Session %p: Received invalid/unknown command %RU32 (%RU32 bytes), rejecting (%RU32/3)\n",
+                                pThis, ipcHdr.uMsgType, ipcHdr.uMsgLen, s_cRejectedCmds + 1));
+                    if (ipcHdr.uMsgLen)
+                    {
+                        /* Get and discard payload data. */
+                        size_t cbRead;
+                        uint8_t devNull[_1K];
+                        while (ipcHdr.uMsgLen)
+                        {
+                            rc = RTLocalIpcSessionRead(hSession, &devNull, sizeof(devNull), &cbRead);
+                            if (RT_FAILURE(rc))
+                                break;
+                            AssertRelease(cbRead <= ipcHdr.uMsgLen);
+                            ipcHdr.uMsgLen -= (uint32_t)cbRead;
+                        }
+                    }
+                }
+                else
+                    rc = VERR_INVALID_PARAMETER; /* Enough fun, bail out. */
             }
         }

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTrayMsg.h

@@ -19 +19 @@
 #define ___VBOXTRAY_MSG_H
 
+/** The IPC pipe's prefix. Will be followed by the
+ *  username VBoxTray runs under. */
 #define VBOXTRAY_IPC_PIPE_PREFIX      "VBoxTrayIPC-"
+/** The IPC header's magic. */
+#define VBOXTRAY_IPC_HDR_MAGIC        0x19840804
 
 enum VBOXTRAYIPCMSGTYPE
@@ -37 +41 @@
 typedef struct VBOXTRAYIPCHEADER
 {
-    /** @todo Add magic? */
+    /** The header's magic. */
+    uint32_t uMagic;
     /** Header version, must be 0 by now. */
     uint32_t uHdrVersion;