Changeset 10530 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 11, 2008 2:46:47 PM (17 years ago)

Author:

vboxsync

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

33215

Message:

Implemented trunk and flag matching when opening a network.

File:

• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -83 +83 @@
     void                   *pvObj;
 } INTNETIF;
+/** Pointer to an internal network interface. */
 typedef INTNETIF *PINTNETIF;
 
@@ -103 +104 @@
     /** The SUPR0 object id. */
     void                   *pvObj;
-    /**  Access restricted? */
-    bool                    fRestrictAccess;
+    /** Network creation flags (INTNET_OPEN_FLAGS_*). */
+    uint32_t                fFlags;
     /** The length of the network name. */
     uint8_t                 cchName;
     /** The network name. */
     char                    szName[INTNET_MAX_NETWORK_NAME];
+    /** The trunk type. */
+    INTNETTRUNKTYPE         enmTrunkType;
+    /** The trunk name. */
+    char                    szTrunk[INTNET_MAX_TRUNK_NAME];
 } INTNETNETWORK;
+/** Pointer to an internal network. */
 typedef INTNETNETWORK *PINTNETNETWORK;
 
@@ -1272 +1278 @@
  *
  * @returns VBox status code.
- * @param   pIntNet     The instance data.
- * @param   pSession    The current session.
- * @param   pszNetwork  The network name. This has a valid length.
- * @param   ppNetwork   Where to store the pointer to the network on success.
- */
-static int intnetOpenNetwork(PINTNET pIntNet, PSUPDRVSESSION pSession, const char *pszNetwork, PINTNETNETWORK *ppNetwork)
-{
-    LogFlow(("intnetOpenNetwork: pIntNet=%p pSession=%p pszNetwork=%p:{%s} ppNetwork=%p\n",
-             pIntNet, pSession, pszNetwork, pszNetwork, ppNetwork));
-
+ * @param   pIntNet         The instance data.
+ * @param   pSession        The current session.
+ * @param   pszNetwork      The network name. This has a valid length.
+ * @param   enmTrunkType    The trunk type.
+ * @param   pszTrunk        The trunk name. Its meaning is specfic to the type.
+ * @param   fFlags          Flags, see INTNET_OPEN_FLAGS_*.
+ * @param   ppNetwork       Where to store the pointer to the network on success.
+ */
+static int intnetOpenNetwork(PINTNET pIntNet, PSUPDRVSESSION pSession, const char *pszNetwork, INTNETTRUNKTYPE enmTrunkType,
+                             const char *pszTrunk, uint32_t fFlags, PINTNETNETWORK *ppNetwork)
+{
+    LogFlow(("intnetOpenNetwork: pIntNet=%p pSession=%p pszNetwork=%p:{%s} enmTrunkType=%d pszTrunk=%p:{%s} fFlags=%#x ppNetwork=%p\n",
+             pIntNet, pSession, pszNetwork, pszNetwork, enmTrunkType, pszTrunk, pszTrunk, fFlags, ppNetwork));
+
+    /* just pro forma validation, the caller is internal. */
     AssertPtr(pIntNet);
     AssertPtr(pSession);
     AssertPtr(pszNetwork);
+    Assert(enmTrunkType > kIntNetTrunkType_Invalid && enmTrunkType < kIntNetTrunkType_End);
+    AssertPtr(pszTrunk);
+    Assert(!(fFlags & ~(INTNET_OPEN_FLAGS_PUBLIC)));
     AssertPtr(ppNetwork);
     *ppNetwork = NULL;
@@ -1304 +1318 @@
         {
             /*
-             * Increment the reference and check that the
-             * session can access this network.
+             * Found the network, now check that we have the same ideas
+             * about the trunk setup and security.
              */
-            int rc = SUPR0ObjAddRef(pCur->pvObj, pSession);
-            RTSpinlockRelease(pIntNet->Spinlock, &Tmp);
-
-            if (VBOX_SUCCESS(rc))
+            int rc;
+            if (    enmTrunkType == kIntNetTrunkType_WhateverNone
+                ||  (   pCur->enmTrunkType == enmTrunkType
+                     && !strcmp(pCur->szTrunk, pszTrunk)))
             {
-                if (pCur->fRestrictAccess)
-                    rc = SUPR0ObjVerifyAccess(pCur->pvObj, pSession, pCur->szName);
-                if (VBOX_SUCCESS(rc))
-                    *ppNetwork = pCur;
+                if (!((pCur->fFlags ^ fFlags) & (INTNET_OPEN_FLAGS_PUBLIC)))
+                {
+                    /*
+                     * Increment the reference and check that the
+                     * session can access this network.
+                     */
+                    rc = SUPR0ObjAddRef(pCur->pvObj, pSession);
+                    RTSpinlockRelease(pIntNet->Spinlock, &Tmp);
+
+                    if (VBOX_SUCCESS(rc))
+                    {
+                        if (!(pCur->fFlags & INTNET_OPEN_FLAGS_PUBLIC))
+                            rc = SUPR0ObjVerifyAccess(pCur->pvObj, pSession, pCur->szName);
+                        if (VBOX_SUCCESS(rc))
+                            *ppNetwork = pCur;
+                        else
+                        {
+                            RTSpinlockAcquire(pIntNet->Spinlock, &Tmp);
+                            SUPR0ObjRelease(pCur->pvObj, pSession);
+                            RTSpinlockRelease(pIntNet->Spinlock, &Tmp);
+                        }
+                    }
+                }
                 else
-                {
-                    RTSpinlockAcquire(pIntNet->Spinlock, &Tmp);
-                    SUPR0ObjRelease(pCur->pvObj, pSession);
-                    RTSpinlockRelease(pIntNet->Spinlock, &Tmp);
-                }
+                    rc = VERR_INTNET_INCOMPATIBLE_FLAGS;
             }
+            else
+                rc = VERR_INTNET_INCOMPATIBLE_TRUNK;
+
             LogFlow(("intnetOpenNetwork: returns %Vrc *ppNetwork=%p\n", rc, *ppNetwork));
             return rc;
@@ -1330 +1362 @@
     RTSpinlockRelease(pIntNet->Spinlock, &Tmp);
 
-    LogFlow(("intnetOpenNetwork: returns VERR_FILE_NOT_FOUND\n"));
-    return VERR_FILE_NOT_FOUND;
+    LogFlow(("intnetOpenNetwork: returns VERR_NOT_FOUND\n"));
+    return VERR_NOT_FOUND;
 }
 
@@ -1343 +1375 @@
  * @returns VBox status code.
  * @param   pIntNet         The instance data.
+ * @param   pSession        The session handle.
  * @param   pszNetwork      The name of the network. This must be at least one character long and no longer
  *                          than the INTNETNETWORK::szName.
- * @param   fRestrictAccess Whether new participants should be subjected to access check or not.
- * @param   pSession        The session handle.
+ * @param   enmTrunkType    The trunk type.
+ * @param   pszTrunk        The trunk name. Its meaning is specfic to the type.
+ * @param   fFlags          Flags, see INTNET_OPEN_FLAGS_*.
  * @param   ppNetwork       Where to store the network.
  */
-static int intnetCreateNetwork(PINTNET pIntNet, PSUPDRVSESSION pSession, const char *pszNetwork, bool fRestrictAccess, PINTNETNETWORK *ppNetwork)
-{
-    LogFlow(("intnetCreateNetwork: pIntNet=%p pSession=%p pszNetwork=%p:{%s} ppNetwork=%p\n",
-             pIntNet, pSession, pszNetwork, pszNetwork, ppNetwork));
-
+static int intnetCreateNetwork(PINTNET pIntNet, PSUPDRVSESSION pSession, const char *pszNetwork, INTNETTRUNKTYPE enmTrunkType,
+                               const char *pszTrunk, uint32_t fFlags, PINTNETNETWORK *ppNetwork)
+{
+    LogFlow(("intnetCreateNetwork: pIntNet=%p pSession=%p pszNetwork=%p:{%s} enmTrunkType=%d pszTrunk=%p:{%s} fFlags=%#x ppNetwork=%p\n",
+             pIntNet, pSession, pszNetwork, pszNetwork, enmTrunkType, pszTrunk, pszTrunk, fFlags, ppNetwork));
+
+    /* just pro forma validation, the caller is internal. */
     AssertPtr(pIntNet);
     AssertPtr(pSession);
     AssertPtr(pszNetwork);
+    Assert(enmTrunkType > kIntNetTrunkType_Invalid && enmTrunkType < kIntNetTrunkType_End);
+    AssertPtr(pszTrunk);
+    Assert(!(fFlags & ~(INTNET_OPEN_FLAGS_PUBLIC)));
     AssertPtr(ppNetwork);
     *ppNetwork = NULL;
@@ -1387 +1426 @@
         //pNew->pIFs = NULL;
         pNew->pIntNet = pIntNet;
+        pNew->fFlags = fFlags;
         pNew->cchName = cchName;
-        pNew->fRestrictAccess = fRestrictAccess;
         Assert(cchName && cchName < sizeof(pNew->szName));  /* caller's responsibility. */
         memcpy(pNew->szName, pszNetwork, cchName);          /* '\0' by alloc. */
+        pNew->enmTrunkType = enmTrunkType;
+        Assert(strlen(pszTrunk) < sizeof(pNew->szTrunk));   /* caller's responsibility. */
+        strcpy(pNew->szTrunk, pszTrunk);
 
         /*
@@ -1399 +1441 @@
         {
             /*
-             * Insert the network into the list.
+             * Check again that the network doesn't exist and then link in the new one.
              * This must be done before we attempt any SUPR0ObjRelease call.
              */
             RTSpinlockAcquire(pIntNet->Spinlock, &Tmp);
+            for (PINTNETNETWORK pCur = pIntNet->pNetworks; pCur; pCur = pCur->pNext)
+                if (    pCur->cchName == cchName
+                    &&  !memcmp(pCur->szName, pszNetwork, cchName))
+                    rc = VERR_ALREADY_EXISTS;
             pNew->pNext = pIntNet->pNetworks;
             pIntNet->pNetworks = pNew;
             RTSpinlockRelease(pIntNet->Spinlock, &Tmp);
 
-            /*
-             * Check if the current session is actually allowed to create and open
-             * the network. It is possible to implement network name based policies
-             * and these must be checked now. SUPR0ObjRegister does no such checks.
-             */
-            rc = SUPR0ObjVerifyAccess(pNew->pvObj, pSession, pNew->szName);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
-                *ppNetwork = pNew;
-                LogFlow(("intnetCreateNetwork: returns VINF_SUCCESS *ppNetwork=%p\n", pNew));
-                return VINF_SUCCESS;
+                /*
+                 * Check if the current session is actually allowed to create and open
+                 * the network. It is possible to implement network name based policies
+                 * and these must be checked now. SUPR0ObjRegister does no such checks.
+                 */
+                rc = SUPR0ObjVerifyAccess(pNew->pvObj, pSession, pNew->szName);
+                if (VBOX_SUCCESS(rc))
+                {
+                    *ppNetwork = pNew;
+                    LogFlow(("intnetCreateNetwork: returns VINF_SUCCESS *ppNetwork=%p\n", pNew));
+                    return VINF_SUCCESS;
+                }
             }
 
@@ -1474 +1523 @@
         const char *pszTrunkEnd = (const char *)memchr(pszTrunk, '\0', INTNET_MAX_TRUNK_NAME);
         AssertReturn(pszTrunkEnd, VERR_INVALID_PARAMETER);
-        if (pszTrunkEnd == pszTrunk)
-            pszTrunk = NULL;
-    }
+    }
+    else
+        pszTrunk = "";
+
     AssertMsgReturn(enmTrunkType > kIntNetTrunkType_Invalid && enmTrunkType < kIntNetTrunkType_End,
                     ("%d\n", enmTrunkType), VERR_INVALID_PARAMETER);
@@ -1508 +1558 @@
      */
     PINTNETNETWORK pNetwork;
-    rc = intnetOpenNetwork(pIntNet, pSession, pszNetwork, &pNetwork);
-    if (rc == VERR_FILE_NOT_FOUND)
-        rc = intnetCreateNetwork(pIntNet, pSession, pszNetwork, !(fFlags & INTNET_OPEN_FLAGS_PUBLIC), &pNetwork);
+    rc = intnetOpenNetwork(pIntNet, pSession, pszNetwork, enmTrunkType, pszTrunk, fFlags, &pNetwork);
+    if (rc == VERR_NOT_FOUND)
+        rc = intnetCreateNetwork(pIntNet, pSession, pszNetwork, enmTrunkType, pszTrunk, fFlags, &pNetwork);
     if (VBOX_SUCCESS(rc))
     {