Changeset 25826 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 14, 2010 10:59:36 AM (15 years ago)

Author:

vboxsync

Message:

VBoxNetAdpCtl, Main/NetIf: multiple vboxnet instance fixes for Solaris.

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2853 +2853 @@
             }
             else
+            {
+#ifdef RT_OS_SOLARIS
+                /** Grab the IP number from the 'vboxnetX' instance number and add one (at least on Solaris) */
+                const char *pszInstance = pszHifName;
+                pszInstance += sizeof("vboxnet") - 1;
+                int Instance = atoi(pszInstance);
+                Instance++;
+                char szDefaultIPV4Addr[sizeof(VBOXNET_IPV4ADDR_DEFAULT) + 1];
+                RTStrPrintf(szDefaultIPV4Addr, sizeof(szDefaultIPV4Addr), "%s%d", VBOXNET_IPV4NETPREFIX_DEFAULT, Instance);
+                hrc = hostInterface->EnableStaticIpConfig(Bstr(szDefaultIPV4Addr),
+                                                          Bstr(VBOXNET_IPV4MASK_DEFAULT));
+#else
                 hrc = hostInterface->EnableStaticIpConfig(Bstr(VBOXNET_IPV4ADDR_DEFAULT),
                                                           Bstr(VBOXNET_IPV4MASK_DEFAULT));
+#endif
+            }
+            
             ComAssertComRC(hrc); /** @todo r=bird: Why this isn't fatal? (H()) */
 

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

@@ -27 +27 @@
 #include <iprt/asm.h>
 
-#define VBOXNET_IPV4ADDR_DEFAULT "192.168.56.1"
-#define VBOXNET_IPV4MASK_DEFAULT "255.255.255.0"
+#define VBOXNET_IPV4ADDR_DEFAULT      "192.168.56.1"
+#define VBOXNET_IPV4NETPREFIX_DEFAULT "192.168.56."
+#define VBOXNET_IPV4MASK_DEFAULT      "255.255.255.0"
 
 #define VBOXNET_MAX_SHORT_NAME 50