儲存庫 vbox 的更動 17855

時間撮記:

2009-3-13 下午06:28:26 (16 年 以前)

作者:

vboxsync

訊息:

Linux ip config fixes

位置:

trunk/src/apps

檔案:

• Makefile.kmk (修改) (1 筆差異)
• adpctl/VBoxNetAdpCtl.cpp (修改) (8 筆差異)

trunk/src/apps/Makefile.kmk

@@ -33 +33 @@
  endif
 endif
-if1of ($(KBUILD_TARGET),darwin solaris)
+if1of ($(KBUILD_TARGET),darwin solaris linux)
  ifneq ($(wildcard $(PATH_SUB_CURRENT)/adpctl),)
   include $(PATH_SUB_CURRENT)/adpctl/Makefile.kmk

trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp

@@ -34 +34 @@
 #define VBOXADPCTL_IFCONFIG_PATH "/sbin/ifconfig"
 
+#ifdef RT_OS_LINUX
+#define VBOXADPCTL_DEL_CMD "del"
+#else
+#define VBOXADPCTL_DEL_CMD "delete"
+#endif
+
 static void showUsage(void)
 {
@@ -42 +48 @@
                            const char *pcszArg2 = NULL,
                            const char *pcszArg3 = NULL,
-                           const char *pcszArg4 = NULL)
+                           const char *pcszArg4 = NULL,
+                           const char *pcszArg5 = NULL)
 {
     const char * const argv[] =
@@ -52 +59 @@
         pcszArg3, /* ['netmask'] */
         pcszArg4, /* [network mask] */
+        pcszArg5, /* [network mask] */
         NULL  /* terminator */
     };
@@ -100 +108 @@
         if (!pszWord || strcmp(pszWord, "inet6"))
             continue;
+#ifdef RT_OS_LINUX
+        pszWord = strtok(NULL, " ");
+        /* Skip "addr:". */
+        if (!pszWord || strcmp(pszWord, "addr:"))
+            continue;
+#endif
         pszWord = strtok(NULL, " ");
         /* Skip link-local addresses. */
@@ -110 +124 @@
     for (int i = 0; i < cAddrs; i++)
     {
-        if (executeIfconfig(pszAdapterName, "inet6", aszAddresses[i], "remove") != EXIT_SUCCESS)
+        if (executeIfconfig(pszAdapterName, "inet6", VBOXADPCTL_DEL_CMD, aszAddresses[i]) != EXIT_SUCCESS)
             return false;
     }
@@ -126 +140 @@
     const char *pszOption = NULL;
     int rc = EXIT_SUCCESS;
+    bool fRemove = false;
 
     switch (argc)
@@ -148 +163 @@
                 return 1;
             }
-            pszOption = "remove";
+            fRemove = true;
             pszAdapterName = argv[1];
             pszAddress = argv[2];
@@ -170 +185 @@
     }
 
-    if (strchr(pszAddress, ':'))
-    {
-        /*
-         * Before we set IPv6 address we'd like to remove
-         * all previously assigned addresses except the
-         * self-assigned one.
-         */
-        if (pszOption && !strcmp(pszOption, "remove"))
-            rc = executeIfconfig(pszAdapterName, "inet6", pszAddress, pszOption);
-        else if (!removeAddresses(pszAdapterName))
-            rc = EXIT_FAILURE;
+    if (fRemove)
+    {
+        if (strchr(pszAddress, ':'))
+            rc = executeIfconfig(pszAdapterName, "inet6", VBOXADPCTL_DEL_CMD, pszAddress);
         else
-            rc = executeIfconfig(pszAdapterName, "inet6", pszAddress, pszOption, pszNetworkMask);
+        {
+#ifdef RT_OS_LINUX
+            rc = executeIfconfig(pszAdapterName, "0.0.0.0");
+#else
+            rc = executeIfconfig(pszAdapterName, "delete", pszAddress);
+#endif
+        }
     }
     else
-        rc = executeIfconfig(pszAdapterName, pszAddress, pszOption, pszNetworkMask);
+    {
+        /* We are setting/replacing address. */
+        if (strchr(pszAddress, ':'))
+        {
+            /*
+             * Before we set IPv6 address we'd like to remove
+             * all previously assigned addresses except the
+             * self-assigned one.
+             */
+            if (!removeAddresses(pszAdapterName))
+                rc = EXIT_FAILURE;
+            else
+                rc = executeIfconfig(pszAdapterName, "inet6", "add", pszAddress, pszOption, pszNetworkMask);
+        }
+        else
+            rc = executeIfconfig(pszAdapterName, pszAddress, pszOption, pszNetworkMask);
+    }
     return rc;
 }