儲存庫 vbox 的更動 12209

時間撮記:

2008-9-8 上午09:40:34 (16 年 以前)

作者:

vboxsync

訊息:

Solaris/vboxnetflt: No rediscovery.

檔案:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (修改) (13 筆差異)

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

@@ -67 +67 @@
 /** The module name. */
 #define DEVICE_NAME              "vboxflt"
+/** The module descriptions as seen in 'modinfo'. */
 #define DEVICE_DESC_DRV          "VirtualBox NetFilter Driver"
 #define DEVICE_DESC_MOD          "VirtualBox NetFilter Module"
-
 
 /** @todo Remove the below hackery once done! */
@@ -370 +370 @@
     {
         /*
-         * Initialize the globals and connect to the support driver.
-         *
-         * This will call back vboxNetFltOsOpenSupDrv (and maybe vboxNetFltOsCloseSupDrv)
-         * for establishing the connect to the support driver.
+         * Initialize Solaris specific globals here.
          */
-        memset(&g_VBoxNetFltSolarisGlobals, 0, sizeof(g_VBoxNetFltSolarisGlobals));
-        rc = vboxNetFltInitGlobals(&g_VBoxNetFltSolarisGlobals);
+        g_VBoxNetFltSolarisState.pOpenedStreams = NULL;
+        g_VBoxNetFltSolarisState.pCurInstance = NULL;
+        rc = RTSemFastMutexCreate(&g_VBoxNetFltSolarisMtx);
         if (RT_SUCCESS(rc))
-            return mod_install(&g_VBoxNetFltSolarisModLinkage);
+        {
+            /*
+             * Initialize the globals and connect to the support driver.
+             *
+             * This will call back vboxNetFltOsOpenSupDrv (and maybe vboxNetFltOsCloseSupDrv)
+             * for establishing the connect to the support driver.
+             */
+            memset(&g_VBoxNetFltSolarisGlobals, 0, sizeof(g_VBoxNetFltSolarisGlobals));
+            rc = vboxNetFltInitGlobals(&g_VBoxNetFltSolarisGlobals);
+            if (RT_SUCCESS(rc))
+            {
+                rc = mod_install(&g_VBoxNetFltSolarisModLinkage);
+                if (!rc)
+                    return rc;
+
+                LogRel((DEVICE_NAME ":mod_install failed. rc=%d\n", rc));
+                vboxNetFltTryDeleteGlobals(&g_VBoxNetFltSolarisGlobals);                
+            }
+            else
+                LogRel((DEVICE_NAME ":failed to initialize globals.\n"));
+
+            RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
+            g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
+        }
         else
-            LogRel((DEVICE_NAME ":failed to initialize globals.\n"));
+            LogRel((DEVICE_NAME ":failed to create mutex.\n"));
 
         RTR0Term();
@@ -407 +428 @@
     }
 
+    if (g_VBoxNetFltSolarisMtx != NIL_RTSEMFASTMUTEX)
+    {
+        RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
+        g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
+    }
+
     RTR0Term();
 
@@ -440 +467 @@
         case DDI_ATTACH:
         {
-            int rc = RTSemFastMutexCreate(&g_VBoxNetFltSolarisMtx);
-            if (RT_SUCCESS(rc))
+            int instance = ddi_get_instance(pDip);
+            int rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, CLONE_DEV);
+            if (rc == DDI_SUCCESS)
             {
-                int instance = ddi_get_instance(pDip);
-                int rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, CLONE_DEV);
-                if (rc == DDI_SUCCESS)
-                {
-                    g_VBoxNetFltSolarisState.pDip = pDip;
-                    g_VBoxNetFltSolarisState.pOpenedStreams = NULL;
-                    g_VBoxNetFltSolarisState.pCurInstance = NULL;
-                    ddi_report_dev(pDip);
-                    return DDI_SUCCESS;
-                }
-                else
-                    LogRel((DEVICE_NAME ":VBoxNetFltSolarisAttach failed to create minor node. rc%d\n", rc));
-
-                RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
-                g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
+                g_VBoxNetFltSolarisState.pDip = pDip;
+                ddi_report_dev(pDip);
+                return DDI_SUCCESS;
             }
             else
-                LogRel((DEVICE_NAME ":VBoxNetFltSolarisAttach failed to create mutex.rc=%d\n", rc));
+                LogRel((DEVICE_NAME ":VBoxNetFltSolarisAttach failed to create minor node. rc%d\n", rc));
             return DDI_FAILURE;
         }
@@ -492 +508 @@
             int instance = ddi_get_instance(pDip);
             ddi_remove_minor_node(pDip, NULL);
-
-            RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
-            g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
             return DDI_SUCCESS;
         }
@@ -652 +665 @@
      */
     if (pStream->Type == kIpStream)
-        vboxNetFltSolarisPhysAddrReq(pQueue);
+        vboxNetFltSolarisPhysAddrReq(pStream->pReadQueue);
 
     /*
@@ -1487 +1500 @@
 /**
  * Dynamically attaches this streams module on to the host stack.
- * As a side-effect, this streams also gets opened during the actual
- * insertion phase.
+ * As a side-effect, this streams also gets opened/closed during
+ * the actual injection/ejection phase.
  *
  * @returns VBox status code.
- * @param   pThis           The instance.
- * @param   fRediscovery    Rediscovery attempt, currently unused on solaris.
+ * @param   pThis       The instance.
+ * @param   fAttach     Is this an attach or detach.
  */
 static int vboxNetFltSolarisModSetup(PVBOXNETFLTINS pThis, bool fAttach)
 {
     LogFlow(("vboxNetFltSolarisModSetup: pThis=%p (%s) fAttach=%s\n", pThis, pThis->szName, fAttach ? "true" : "false"));
-
-    Assert(!g_VBoxNetFltSolarisState.pCurInstance);
-    Assert(g_VBoxNetFltSolarisState.CurType == kUndefined);
 
     /*
@@ -1619 +1629 @@
                                 /*
                                  * Set global data which will be grabbed by ModOpen.
+                                 * There is a known (though very unlikely) race here because
+                                 * of the inability to pass user data while inserting.
                                  */
                                 g_VBoxNetFltSolarisState.pCurInstance = pThis;
@@ -2331 +2343 @@
 
 
+/**
+ * Simple packet dump, used for internal debugging.
+ *
+ * @param   pMsg    Pointer to the message to analyze and dump.
+ */
 static void vboxNetFltSolarisAnalyzeMBlk(mblk_t *pMsg)
 {
@@ -2339 +2356 @@
     {
         PRTNETIPV4 pIpHdr = (PRTNETIPV4)(pEthHdr + 1);
-        size_t cbLen = MBLKSIZE(pMsg) - sizeof(*pEthHdr);
+        size_t cbLen = MBLKL(pMsg) - sizeof(*pEthHdr);
         if (RTNetIPv4IsHdrValid(pIpHdr, cbLen, cbLen))
         {
@@ -2397 +2414 @@
 bool vboxNetFltPortOsIsHostMac(PVBOXNETFLTINS pThis, PCRTMAC pMac)
 {
-    /* ASSUMES that the MAC address never changes. */
+    /*
+     * MAC address change acknowledgements are intercepted on the read side
+     * hence theoritically we are always update to date with any changes.
+     */
     return pThis->u.s.Mac.au16[0] == pMac->au16[0]
         && pThis->u.s.Mac.au16[1] == pMac->au16[1]
@@ -2409 +2429 @@
 
     /*
-     * Enable promiscuous mode.
+     * Enable/disable promiscuous mode.
      */
     vboxnetflt_stream_t *pStream = pThis->u.s.pvStream;
@@ -2461 +2481 @@
 bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThis)
 {
-    return true;
+    /*
+     * We don't support interface rediscovery on Solaris hosts because the
+     * filter is very tightly bound to the stream.
+     */
+    return false;
 }