Changeset 12783 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Sep 29, 2008 9:31:21 AM (16 years ago)

Author:

vboxsync

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

37128

Message:

Solaris/vboxnetflt: Unplumbed interfaces. Disabled Main enumeration as it requires NSL link fix.

File:

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

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

@@ -320 +320 @@
 } vboxnetflt_promisc_stream_t;
 
-/**
- * vboxnetflt_state_t: per-driver data
- */
-typedef struct vboxnetflt_state_t
-{
-    /** The list of all opened streams. */
-    vboxnetflt_stream_t *pOpenedStreams;
-    /**
-     * pCurInstance is the currently VBox instance to be associated with the stream being created
-     * in ModOpen. This is just shared global data between the dynamic attach and the ModOpen procedure.
-     */
-    PVBOXNETFLTINS pCurInstance;
-    /** Goes along with pCurInstance to determine type of stream being opened/created. */
-    VBOXNETFLTSTREAMTYPE CurType;
-} vboxnetflt_state_t;
-
 
 /*******************************************************************************
@@ -366 +350 @@
 *   Global Variables                                                           *
 *******************************************************************************/
+/** Global device info handle. */
+static dev_info_t *g_pVBoxNetFltSolarisDip = NULL;
+
 /** The (common) global data. */
 static VBOXNETFLTGLOBALS g_VBoxNetFltSolarisGlobals;
-/** Global state. */
-static vboxnetflt_state_t g_VBoxNetFltSolarisState;
+
 /** Mutex protecting dynamic binding of the filter. */
 RTSEMFASTMUTEX g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
-/** Global device info handle. */
-static dev_info_t *g_pVBoxNetFltSolarisDip = NULL;
-
+
+/** The list of all opened streams. */
+vboxnetflt_stream_t *g_VBoxNetFltSolarisStreams;
+
+/**
+ * g_VBoxNetFltInstance is the current PVBOXNETFLTINS to be associated with the stream being created
+ * in ModOpen. This is just shared global data between the dynamic attach and the ModOpen procedure.
+ */
+PVBOXNETFLTINS volatile g_VBoxNetFltSolarisInstance;
+
+/** Goes along with the instance to determine type of stream being opened/created. */
+VBOXNETFLTSTREAMTYPE volatile g_VBoxNetFltSolarisStreamType;
 
 /** GCC C++ hack. */
@@ -405 +400 @@
          * Initialize Solaris specific globals here.
          */
-        g_VBoxNetFltSolarisState.pOpenedStreams = NULL;
-        g_VBoxNetFltSolarisState.pCurInstance = NULL;
+        g_VBoxNetFltSolarisStreams = NULL;
+        g_VBoxNetFltSolarisInstance = NULL;
         rc = RTSemFastMutexCreate(&g_VBoxNetFltSolarisMtx);
         if (RT_SUCCESS(rc))
@@ -619 +614 @@
      * Check for the VirtualBox instance.
      */
-    vboxnetflt_state_t *pState = &g_VBoxNetFltSolarisState;
-    if (RT_UNLIKELY(!pState->pCurInstance))
+    if (RT_UNLIKELY(!g_VBoxNetFltSolarisInstance))
     {
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed to get VirtualBox instance.\n"));
@@ -627 +621 @@
 
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    PVBOXNETFLTINS pThis = pState->pCurInstance;
+    PVBOXNETFLTINS pThis = g_VBoxNetFltSolarisInstance;
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
 
@@ -633 +627 @@
      * Check VirtualBox stream type.
      */
-    if (pState->CurType == kUndefined)
+    if (g_VBoxNetFltSolarisStreamType == kUndefined)
     {
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed due to undefined VirtualBox open mode.\n"));
@@ -646 +640 @@
     minor_t DevMinor = 0;
     vboxnetflt_stream_t *pStream = NULL;
-    vboxnetflt_stream_t **ppPrevStream = &pState->pOpenedStreams;
+    vboxnetflt_stream_t **ppPrevStream = &g_VBoxNetFltSolarisStreams;
     if (fStreamMode == CLONEOPEN)
     {
@@ -660 +654 @@
         DevMinor = getminor(*pDev);
 
-    if (pState->CurType == kPromiscStream)
+    if (g_VBoxNetFltSolarisStreamType == kPromiscStream)
     {
         vboxnetflt_promisc_stream_t *pPromiscStream = RTMemAlloc(sizeof(vboxnetflt_promisc_stream_t));
@@ -701 +695 @@
      */
     ASMAtomicUoWritePtr((void * volatile *)&pStream->pThis, pThis);
-    pStream->Type = pState->CurType;
+    pStream->Type = g_VBoxNetFltSolarisStreamType;
     switch (pStream->Type)
     {
@@ -811 +805 @@
      * Unlink it from the list of streams.
      */
-    for (ppPrevStream = &g_VBoxNetFltSolarisState.pOpenedStreams; (pStream = *ppPrevStream) != NULL; ppPrevStream = &pStream->pNext)
+    for (ppPrevStream = &g_VBoxNetFltSolarisStreams; (pStream = *ppPrevStream) != NULL; ppPrevStream = &pStream->pNext)
         if (pStream == (vboxnetflt_stream_t *)pQueue->q_ptr)
             break;
@@ -1687 +1681 @@
  * the I_PUSH phase.
  *
+ * @param   pThis       The instance.
  */
 static int vboxNetFltSolarisOpenStream(PVBOXNETFLTINS pThis)
@@ -1710 +1705 @@
         if (!ret)
         {
-            g_VBoxNetFltSolarisState.pCurInstance = pThis;
-            g_VBoxNetFltSolarisState.CurType = kPromiscStream;
+            g_VBoxNetFltSolarisInstance = pThis;
+            g_VBoxNetFltSolarisStreamType = kPromiscStream;
 
             rc = ldi_ioctl(pThis->u.s.hIface, I_PUSH, (intptr_t)DEVICE_NAME, FKIOCTL, kcred, &ret);
 
-            g_VBoxNetFltSolarisState.pCurInstance = NULL;
-            g_VBoxNetFltSolarisState.CurType = kUndefined;
+            g_VBoxNetFltSolarisInstance = NULL;
+            g_VBoxNetFltSolarisStreamType = kUndefined;
 
             if (!rc)
@@ -1782 +1777 @@
      * Statuatory Warning: Hackish code ahead.
      */
-    if (strlen(pThis->szName) > VBOXNETFLT_IFNAME_LEN - 1)
-    {
-        LogRel((DEVICE_NAME ":vboxNetFltSolarisModSetup: interface name too long %s\n", pThis->szName));
-        return VERR_INTNET_FLT_IF_NOT_FOUND;
-    }
-
     char *pszModName = DEVICE_NAME;
 
@@ -1900 +1889 @@
                                  * of the inability to pass user data while inserting.
                                  */
-                                g_VBoxNetFltSolarisState.pCurInstance = pThis;
-                                g_VBoxNetFltSolarisState.CurType = kIpStream;
+                                g_VBoxNetFltSolarisInstance = pThis;
+                                g_VBoxNetFltSolarisStreamType = kIpStream;
 
                                 /*
@@ -1913 +1902 @@
                                      * Inject/Eject from the host ARP stack.
                                      */
-                                    g_VBoxNetFltSolarisState.CurType = kArpStream;
+                                    g_VBoxNetFltSolarisStreamType = kArpStream;
                                     rc = strioctl(pVNodeArp, fAttach ? _I_INSERT : _I_REMOVE, (intptr_t)&ArpStrMod, 0, K_TO_K,
                                                 kcred, &ret);
                                     if (!rc)
                                     {
-                                        g_VBoxNetFltSolarisState.pCurInstance = NULL;
-                                        g_VBoxNetFltSolarisState.CurType = kUndefined;
+                                        g_VBoxNetFltSolarisInstance = NULL;
+                                        g_VBoxNetFltSolarisStreamType = kUndefined;
 
                                         /*
@@ -1990 +1979 @@
     }
     else
-        LogRel((DEVICE_NAME ":vboxNetFltSolarisModSetup: invalid interface '%s'.\n", pThis->szName));
+    {
+        /*
+         * This would happen for interfaces that are not plumbed.
+         */
+        LogRel((DEVICE_NAME ":vboxNetFltSolarisModSetup: Warning: seems '%s' is unplumbed.\n", pThis->szName));
+        rc = VINF_SUCCESS;
+    }
 
     ldi_close(ARPDevHandle, FREAD | FWRITE, kcred);
     ldi_close(IPDevHandle, FREAD | FWRITE, kcred);
+
+    if (RT_SUCCESS(rc))
+        return rc;
 
     return VERR_INTNET_FLT_IF_FAILED;
@@ -2018 +2016 @@
         if (RT_SUCCESS(rc))
             ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, false);
+        else
+            vboxNetFltSolarisCloseStream(pThis);
     }
     else
@@ -2573 +2573 @@
      * Don't loopback packets we transmit to the wire.
      */
+    /** @todo maybe we need not check for loopback for INTNETTRUNKDIR_HOST case? */
     if (vboxNetFltSolarisIsOurMBlk(pThis, pPromiscStream, pMsg))
     {
@@ -2580 +2581 @@
     }
 
-#if 0
-    /*
-     * Yeah, I wish.
-     */
-    if (pMsg->b_flag & MSGNOLOOP)
-    {
-        freemsg(pMsg);
-        return VINF_SUCCESS;
-    }
-#endif
-
     /*
      * Figure out the source of the packet based on the source Mac address.
      */
-    /** @todo Is there a more fool-proof way to determine if the packet was indeed sent from the host?? */
     uint32_t fSrc = INTNETTRUNKDIR_WIRE;
     PRTNETETHERHDR pEthHdr = (PRTNETETHERHDR)pMsg->b_rptr;
@@ -2642 +2631 @@
         return NULL;
 
-    vboxnetflt_stream_t *pCur = g_VBoxNetFltSolarisState.pOpenedStreams;
+    vboxnetflt_stream_t *pCur = g_VBoxNetFltSolarisStreams;
     for (; pCur; pCur = pCur->pNext)
         if (pCur == pStream)
@@ -2860 +2849 @@
 {
     LogFlow((DEVICE_NAME ":vboxNetFltPortOsGetMacAddress pThis=%p\n", pThis));
-
-    RTMAC EmptyMac;
-    bzero(&EmptyMac, sizeof(EmptyMac));
-    if (!bcmp(&pThis->u.s.Mac, &EmptyMac, sizeof(EmptyMac)))    /* This should never happen... */
-    {
-        /* Bummer, Mac address is not copied yet. */
-        LogRel((DEVICE_NAME ":vboxNetFltPortOsGetMacAddress: Mac address not cached yet!\n"));
-        return;
-    }
-
     *pMac = pThis->u.s.Mac;
 }
@@ -2995 +2974 @@
 
                 vboxNetFltSolarisQueueLoopback(pThis, pPromiscStream, pMsg);
-
-#if 0
-                /*
-                 * Too bad we can't keep this, though it "works"....
-                 */
-                pMsg->b_flag |= MSGNOLOOP;
-#endif
                 putnext(WR(pPromiscStream->Stream.pReadQueue), pMsg);
             }
@@ -3035 +3007 @@
 
                     vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvArpStream);
-                    if (RT_LIKELY(pArpStream))
+                    if (pArpStream)
                     {
                         queue_t *pArpReadQueue = pArpStream->pReadQueue;
@@ -3041 +3013 @@
                     }
                     else
-                        rc = VERR_INVALID_POINTER;
+                    {
+                        /*
+                         * For unplumbed interfaces we may not be bound to ARP.
+                         */
+                        freemsg(pMsg);
+                    }
                 }
                 else
@@ -3057 +3034 @@
                 LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST\n"));
 
-                pMsg->b_rptr += sizeof(RTNETETHERHDR);
-
                 vboxnetflt_stream_t *pIpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIpStream);
-                if (RT_LIKELY(pIpStream))
+                if (pIpStream)
                 {
+                    pMsg->b_rptr += sizeof(RTNETETHERHDR);
                     queue_t *pIpReadQueue = pIpStream->pReadQueue;
                     putnext(pIpReadQueue, pMsg);
                 }
                 else
-                    rc = VERR_INVALID_POINTER;                    
+                {
+                    /*
+                     * For unplumbed interfaces we may not be bound to IP.
+                     */
+                    freemsg(pMsg);
+                }
             }
         }