Changeset 41272 in vbox for trunk/src/apps

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.

File:

• trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp (modified) (4 diffs)

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);