Changeset 25826 in vbox

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

Files:

• VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)
• VBox/Main/include/netif.h (modified) (1 diff)
• apps/adpctl/VBoxNetAdpCtl.cpp (modified) (9 diffs)

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

trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp

@@ -56 +56 @@
 #define VBOXADPCTL_IFCONFIG_PATH "/sbin/ifconfig"
 
-#ifdef RT_OS_LINUX
-#define VBOXADPCTL_DEL_CMD "del"
+#if defined(RT_OS_LINUX)
+# define VBOXADPCTL_DEL_CMD "del"
+# define VBOXADPCTL_ADD_CMD "add"
+#elif defined(RT_OS_SOLARIS)
+# define VBOXADPCTL_DEL_CMD "removeif"
+# define VBOXADPCTL_ADD_CMD "addif"
 #else
-#define VBOXADPCTL_DEL_CMD "delete"
+# define VBOXADPCTL_DEL_CMD "delete"
+# define VBOXADPCTL_ADD_CMD "add"
 #endif
 
@@ -224 +229 @@
 {
     char szAdapterName[VBOXNETADP_MAX_NAME_LEN];
-    char *pszAdapterName;
-    const char *pszAddress;
+    char *pszAdapterName = NULL;
+    const char *pszAddress = NULL;
     const char *pszNetworkMask = NULL;
     const char *pszOption = NULL;
@@ -235 +240 @@
     {
         case 5:
+        {
+            /* Add a netmask to existing interface */
             if (strcmp("netmask", argv[3]))
             {
@@ -246 +253 @@
             pszAddress = argv[2];
             break;
+        }
+
         case 4:
+        {
+            /* Remove a single address from existing interface */
             if (strcmp("remove", argv[3]))
             {
@@ -257 +268 @@
             pszAddress = argv[2];
             break;
+        }
+
         case 3:
+        {
+            /* Remove an existing interface */
             pszAdapterName = argv[1];
             pszAddress = argv[2];
@@ -265 +280 @@
                 if (rc)
                     return rc;
+#ifdef RT_OS_SOLARIS
+                return 1;
+#else
                 memset(&Req, '\0', sizeof(Req));
                 snprintf(Req.szName, sizeof(Req.szName), "%s", szAdapterName);
                 return doIOCtl(VBOXNETADP_CTL_REMOVE, &Req);
+#endif
             }
             break;
+        }
+
         case 2:
+        {
+            /* Create a new interface */
             if (strcmp("add", argv[1]) == 0)
             {
+#ifdef RT_OS_SOLARIS
+                return 1;
+#else
                 memset(&Req, '\0', sizeof(Req));
                 rc = doIOCtl(VBOXNETADP_CTL_ADD, &Req);
                 if (rc == 0)
                     puts(Req.szName);
+#endif
                 return rc;
             }
             /* Fall through */
+        }
+
         default:
             fprintf(stderr, "Invalid number of arguments.\n\n");
@@ -300 +329 @@
         else
         {
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_LINUX)
             rc = executeIfconfig(pszAdapterName, "0.0.0.0");
 #else
-            rc = executeIfconfig(pszAdapterName, "delete", pszAddress);
+            rc = executeIfconfig(pszAdapterName, VBOXADPCTL_DEL_CMD, pszAddress);
+#endif
+
+#ifdef RT_OS_SOLARIS
+            /* On Solaris we can unplumb the ipv4 interface */
+            executeIfconfig(pszAdapterName, "inet", "unplumb");
 #endif
         }
@@ -312 +346 @@
         if (strchr(pszAddress, ':'))
         {
+#ifdef RT_OS_SOLARIS
+            /* On Solaris we need to plumb the interface first if it's not already plumbed. */
+            if (executeIfconfig(pszAdapterName, "inet6") != 0)
+                executeIfconfig(pszAdapterName, "inet6", "plumb", "up");
+#endif
             /*
              * Before we set IPv6 address we'd like to remove
@@ -320 +359 @@
                 rc = EXIT_FAILURE;
             else
-                rc = executeIfconfig(pszAdapterName, "inet6", "add", pszAddress, pszOption, pszNetworkMask);
+                rc = executeIfconfig(pszAdapterName, "inet6", VBOXADPCTL_ADD_CMD, pszAddress, pszOption, pszNetworkMask);
         }
         else
+        {
+#ifdef RT_OS_SOLARIS
+            /* On Solaris we need to plumb the interface first if it's not already plumbed. */
+            if (executeIfconfig(pszAdapterName, "inet") != 0)
+                executeIfconfig(pszAdapterName, "plumb", "up");
+#endif
             rc = executeIfconfig(pszAdapterName, pszAddress, pszOption, pszNetworkMask);
+        }
     }
     return rc;