Changeset 12326 in vbox for trunk

Timestamp:

Sep 10, 2008 8:11:30 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

36347

Message:

Solaris/vboxnetflt: Premature raw mode check eliminations.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (5 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -81 +81 @@
 /** Dynamic module binding specific oddities. */
 #define VBOXNETFLT_IFNAME_LEN           LIFNAMSIZ + 1
-#define VBOXNETFLT_MODE_REQ_MAGIC       0xacce55ed
 
 
@@ -324 +323 @@
 
 static int vboxNetFltSolarisUnitDataToRaw(PVBOXNETFLTINS pThis, mblk_t *pMsg, mblk_t **ppRawMsg);
+static int vboxNetFltSolarisRawToUnitData(mblk_t *pMsg, mblk_t **ppDlpiMsg);
 
 static mblk_t *vboxNetFltSolarisMBlkFromSG(PVBOXNETFLTINS pThis, PINTNETSG pSG, uint32_t fDst);
@@ -860 +860 @@
                     if (pIOC->ioc_id == pStream->ModeReqId)
                     {
-                        pStream->ModeReqId = VBOXNETFLT_MODE_REQ_MAGIC;
                         pStream->fRawMode = !pStream->fRawMode;
-
-                        /*
-                         * Somehow raw mode is turned off?? This should never really happen...
-                         */
-                        if (pStream->fRawMode == false)
-                        {
-                            LogFlow((DEVICE_NAME ":re-requesting raw mode!\n"));
-                            vboxNetFltSolarisSetRawMode(pQueue);
-                        }
+                        LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: Mode acknowledgement. RawMode is %s\n",
+                                pStream->fRawMode ? "ON" : "OFF"));
 
                         freemsg(pMsg);
@@ -1048 +1040 @@
                             miocack(pQueue, pMsg, msgsize(pMsg->b_cont), EINVAL);
                             LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModWritePut: Fast path request acknowledged.\n"));
-                            LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModWritePut: ============================================\n"));
                         }
                     }
@@ -1707 +1698 @@
                                         if (RT_SUCCESS(rc))
                                         {
-                                            bool fRawModeOk = true;
-#if 0
-                                            bool fRawModeOk = !fAttach;   /* Raw mode check is always ok during the detach case */
-                                            if (fAttach)
-                                            {
-                                                /*
-                                                 * Check if our raw mode request was successful (only in the IP stream).
-                                                 */
-                                                vboxnetflt_stream_t *pStream = pThis->u.s.pvStream;
-                                                if (RT_LIKELY(pStream))
-                                                {
-                                                    if (   pStream->fRawMode == true
-                                                        && pStream->ModeReqId == VBOXNETFLT_MODE_REQ_MAGIC)
-                                                    {
-                                                        pStream->ModeReqId = 0;
-                                                        fRawModeOk = true;
-                                                    }
-                                                }
-                                            }
-#endif
-
-                                            if (fRawModeOk)
-                                            {
-                                                /*
-                                                 * Close the devices ONLY during the return from function case; otherwise
-                                                 * we end up close twice which is an instant kernel panic.
-                                                 */
-                                                vboxNetFltSolarisCloseDev(pVNodeUDPHeld, pUserUDP);
-                                                ldi_close(ARPDevHandle, FREAD | FWRITE, kcred);
-                                                ldi_close(IPDevHandle, FREAD | FWRITE, kcred);
-
-                                                LogFlow((DEVICE_NAME ":vboxNetFltSolarisModSetup: Success! %s %s@(Ip:%d Arp:%d) "
-                                                        "%s interface %s\n", fAttach ? "Injected" : "Ejected", StrMod.mod_name,
-                                                        StrMod.pos, ArpStrMod.pos, fAttach ? "to" : "from", pThis->szName));
-                                                return VINF_SUCCESS;
-                                            }
-                                            else
-                                                LogRel((DEVICE_NAME ":vboxNetFltSolarisModSetup: Raw mode request failed.\n"));
+                                            /*
+                                             * Close the devices ONLY during the return from function case; otherwise
+                                             * we end up close twice which is an instant kernel panic.
+                                             */
+                                            vboxNetFltSolarisCloseDev(pVNodeUDPHeld, pUserUDP);
+                                            ldi_close(ARPDevHandle, FREAD | FWRITE, kcred);
+                                            ldi_close(IPDevHandle, FREAD | FWRITE, kcred);
+
+                                            LogFlow((DEVICE_NAME ":vboxNetFltSolarisModSetup: Success! %s %s@(Ip:%d Arp:%d) "
+                                                    "%s interface %s\n", fAttach ? "Injected" : "Ejected", StrMod.mod_name,
+                                                    StrMod.pos, ArpStrMod.pos, fAttach ? "to" : "from", pThis->szName));
+                                            return VINF_SUCCESS;
                                         }
                                         else