Changeset 25829 in vbox

Timestamp:

Jan 14, 2010 2:26:58 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/Main/VBoxNet: use different network for auto vboxnet IP assigning.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (1 diff)
• include/netif.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2855 +2855 @@
             {
 #ifdef RT_OS_SOLARIS
-                /* Grab the IP number from the 'vboxnetX' instance number and add one (at least on Solaris) */
+                /* Grab the IP number from the 'vboxnetX' instance number */
                 const char *pszInstance = pszHifName;
                 pszInstance += sizeof("vboxnet") - 1;
-                int Instance = atoi(pszInstance);
-                Instance++;
+                int Instance = VBOXNET_IPV4NETPREFIX_DEFAULT + atoi(pszInstance);
                 char szDefaultIPV4Addr[sizeof(VBOXNET_IPV4ADDR_DEFAULT) + 1];
-                RTStrPrintf(szDefaultIPV4Addr, sizeof(szDefaultIPV4Addr), "%s%d", VBOXNET_IPV4NETPREFIX_DEFAULT, Instance);
+                RTStrPrintf(szDefaultIPV4Addr, sizeof(szDefaultIPV4Addr), "%s%d.%d", VBOXNET_IPV4NET_DEFAULT, Instance, VBOXNET_IPV4NETHOST_DEFAULT);
                 hrc = hostInterface->EnableStaticIpConfig(Bstr(szDefaultIPV4Addr),
                                                           Bstr(VBOXNET_IPV4MASK_DEFAULT));

trunk/src/VBox/Main/include/netif.h

@@ -28 +28 @@
 
 #define VBOXNET_IPV4ADDR_DEFAULT      "192.168.56.1"
-#define VBOXNET_IPV4NETPREFIX_DEFAULT "192.168.56."
+#define VBOXNET_IPV4NET_DEFAULT       "192.168."
+#define VBOXNET_IPV4NETPREFIX_DEFAULT 56
+#define VBOXNET_IPV4NETHOST_DEFAULT   1
 #define VBOXNET_IPV4MASK_DEFAULT      "255.255.255.0"