Changeset 25841 in vbox

Timestamp:

Jan 14, 2010 6:35:33 PM (15 years ago)

Author:

vboxsync

Message:

VBoxNet (host-only): Revised version of r56609, GUI now uses proper defaults too.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (2 diffs)
• HostNetworkInterfaceImpl.cpp (modified) (3 diffs)
• include/netif.h (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -99 +99 @@
 # include <HostNetworkInterfaceImpl.h>
 # include <netif.h>
+# include <stdlib.h>
 #endif
 
@@ -2855 +2856 @@
             else
             {
-#ifdef RT_OS_SOLARIS
-                /* Grab the IP number from the 'vboxnetX' instance number */
-                const char *pszInstance = pszHifName;
-                pszInstance += sizeof("vboxnet") - 1;
-                int Instance = VBOXNET_IPV4NETPREFIX_DEFAULT + atoi(pszInstance);
-                char szDefaultIPV4Addr[sizeof(VBOXNET_IPV4ADDR_DEFAULT) + 1];
-                RTStrPrintf(szDefaultIPV4Addr, sizeof(szDefaultIPV4Addr), "%s%d.%d", VBOXNET_IPV4NET_DEFAULT, Instance, VBOXNET_IPV4NETHOST_DEFAULT);
-                hrc = hostInterface->EnableStaticIpConfig(Bstr(szDefaultIPV4Addr),
+                /* Grab the IP number from the 'vboxnetX' instance number (see netif.h) */
+                hrc = hostInterface->EnableStaticIpConfig(getDefaultIPv4Address(Bstr(pszHifName)),
                                                           Bstr(VBOXNET_IPV4MASK_DEFAULT));
-#else
-                hrc = hostInterface->EnableStaticIpConfig(Bstr(VBOXNET_IPV4ADDR_DEFAULT),
-                                                          Bstr(VBOXNET_IPV4MASK_DEFAULT));
-#endif
             }
             

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -26 +26 @@
 #include "netif.h"
 
-#ifndef RT_OS_WINDOWS
-#include <arpa/inet.h>
-# ifdef RT_OS_FREEBSD
-#  include <netinet/in.h> /* INADDR_NONE */
-# endif
-#endif /* RT_OS_WINDOWS */
+#ifdef RT_OS_FREEBSD
+# include <netinet/in.h> /* INADDR_NONE */
+#endif /* RT_OS_FREEBSD */
 
 // constructor / destructor
@@ -220 +217 @@
     if (m.IPAddress == 0)
     {
-        Bstr(VBOXNET_IPV4ADDR_DEFAULT).detachTo(aIPAddress);
+        getDefaultIPv4Address(mInterfaceName).detachTo(aIPAddress);
         return S_OK;
     }
@@ -561 +558 @@
         hrc = mVBox->GetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPNetMask", mInterfaceName.raw())), tmpMask.asOutParam());
         if (tmpAddr.isEmpty())
-            tmpAddr = Bstr(VBOXNET_IPV4ADDR_DEFAULT);
+            tmpAddr = getDefaultIPv4Address(mInterfaceName);
         if (tmpMask.isEmpty())
             tmpMask = Bstr(VBOXNET_IPV4MASK_DEFAULT);

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

@@ -27 +27 @@
 #include <iprt/asm.h>
 
-#define VBOXNET_IPV4ADDR_DEFAULT      "192.168.56.1"
-#define VBOXNET_IPV4NET_DEFAULT       "192.168."
-#define VBOXNET_IPV4NETPREFIX_DEFAULT 56
-#define VBOXNET_IPV4NETHOST_DEFAULT   1
+#ifndef RT_OS_WINDOWS
+#include <arpa/inet.h>
+#include <stdio.h>
+#endif /* RT_OS_WINDOWS */
+
+#define VBOXNET_IPV4ADDR_DEFAULT      0x0138A8C0  /* 192.168.56.1 */
 #define VBOXNET_IPV4MASK_DEFAULT      "255.255.255.0"
 
@@ -143 +145 @@
 }
 
+DECLINLINE(Bstr) getDefaultIPv4Address(Bstr bstrIfName)
+{
+    /* Get the index from the name */
+    int iInstance;
+    if (sscanf(Utf8Str(bstrIfName).raw(), "vboxnet%d", &iInstance) != 1)
+        return Bstr("0.0.0.0");
+
+    in_addr tmp;
+#if defined(RT_OS_WINDOWS)
+    tmp.S_un.S_addr = VBOXNET_IPV4ADDR_DEFAULT + (iInstance << 16);
+#else
+    tmp.s_addr = VBOXNET_IPV4ADDR_DEFAULT + (iInstance << 16);
+#endif
+    char *addr = inet_ntoa(tmp);
+    return Bstr(addr);
+}
+
 #endif  /* ___netif_h */
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */