Changeset 41272 in vbox

Timestamp:

May 14, 2012 9:02:00 AM (13 years ago)

Author:

vboxsync

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

77932

Message:

Network: Increased the limit of host-only interfaces to 128.

Location:

trunk

Files:

• doc/manual/en_US/user_Networking.xml (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (modified) (1 diff)
• src/apps/adpctl/VBoxNetAdpCtl.cpp (modified) (4 diffs)

trunk/doc/manual/en_US/user_Networking.xml

@@ -637 +637 @@
         </listitem>
       </itemizedlist></para>
+    <para><note>On Linux and Mac OS X hosts the number of host-only interfaces is
+    limited to 128.</note></para>
   </sect1>
 

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c

@@ -1185 +1185 @@
     memset(g_aUnits, 0, sizeof(g_aUnits));
     memset(g_aAdapters, 0, sizeof(g_aAdapters));
+    LogFlow(("vboxnetadp: max host-only interfaces supported: %d (%d bytes)\n",
+             VBOXNETADP_MAX_INSTANCES, sizeof(g_aAdapters)));
     for (i = 0; i < RT_ELEMENTS(g_aAdapters); i++)
     {

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h

@@ -30 +30 @@
 typedef struct VBOXNETADPGLOBALS *PVBOXNETADPGLOBALS;
 
-#define VBOXNETADP_MAX_INSTANCES   8
+#define VBOXNETADP_MAX_INSTANCES   128
 #define VBOXNETADP_MAX_UNITS       128
 #define VBOXNETADP_NAME            "vboxnet"
@@ -126 +126 @@
         void *pvAlign;
         /** Padding. */
-#if defined(RT_OS_WINDOWS)
-# if defined(VBOX_NETFLT_ONDEMAND_BIND)
-        uint8_t abPadding[192];
-# else
-        uint8_t abPadding[1024];
-# endif
-#elif defined(RT_OS_LINUX)
         uint8_t abPadding[64];
-#else
-        uint8_t abPadding[64];
-#endif
     } u;
     /** The interface name. */

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c

@@ -315 +315 @@
             {
                 Log(("VBoxNetAdpLinuxIOCtl: vboxNetAdpCreate -> %Rrc\n", rc));
-                return -EINVAL;
+                return -(rc == VERR_OUT_OF_RESOURCES ? ENOMEM : EINVAL);
             }
 

trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp

@@ -39 +39 @@
 /** @todo These are duplicates from src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h */
 #define VBOXNETADP_CTL_DEV_NAME    "/dev/vboxnetctl"
+#define VBOXNETADP_MAX_INSTANCES   128
 #define VBOXNETADP_NAME            "vboxnet"
 #define VBOXNETADP_MAX_NAME_LEN    32
@@ -184 +185 @@
     if (fd == -1)
     {
-        fprintf(stderr, "VBoxNetAdpCtl: Error while %s '%s': ",
-               uCmd == VBOXNETADP_CTL_REMOVE ? "removing" : "adding", pReq->szName);
+        fprintf(stderr, "VBoxNetAdpCtl: Error while %s %s: ",
+                uCmd == VBOXNETADP_CTL_REMOVE ? "removing" : "adding",
+                pReq->szName[0] ? pReq->szName : "new interface");
         perror("failed to open " VBOXNETADP_CTL_DEV_NAME);
         return ADPCTLERR_NO_CTL_DEV;
@@ -193 +195 @@
     if (rc == -1)
     {
-        fprintf(stderr, "VBoxNetAdpCtl: Error while %s '%s': ",
-               uCmd == VBOXNETADP_CTL_REMOVE ? "removing" : "adding", pReq->szName);
+        fprintf(stderr, "VBoxNetAdpCtl: Error while %s %s: ",
+                uCmd == VBOXNETADP_CTL_REMOVE ? "removing" : "adding",
+                pReq->szName[0] ? pReq->szName : "new interface");
         perror("VBoxNetAdpCtl: ioctl failed for " VBOXNETADP_CTL_DEV_NAME);
         rc = ADPCTLERR_IOCTL_FAILED;
@@ -210 +213 @@
     if (   strlen(pcszNameIn) >= VBOXNETADP_MAX_NAME_LEN
         || sscanf(pcszNameIn, "vboxnet%d", &iAdapterIndex) != 1
-        || iAdapterIndex < 0 || iAdapterIndex > 99 )
+        || iAdapterIndex < 0 || iAdapterIndex >= VBOXNETADP_MAX_INSTANCES )
     {
         fprintf(stderr, "VBoxNetAdpCtl: Setting configuration for '%s' is not supported.\n", pcszNameIn);