Changeset 18829 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Apr 7, 2009 3:42:32 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45835

Message:

undo 45832

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageInfo.cpp (modified) (2 diffs)
• VBoxManageModifyVM.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -694 +694 @@
                     {
                         Bstr strBridgeAdp;
-                        nic->COMGETTER(BridgedInterface)(strBridgeAdp.asOutParam());
+                        nic->COMGETTER(HostInterface)(strBridgeAdp.asOutParam());
                         if (details == VMINFO_MACHINEREADABLE)
                         {
@@ -721 +721 @@
                     {
                         Bstr strHostonlyAdp;
-                        nic->COMGETTER(HostOnlyInterface)(strHostonlyAdp.asOutParam());
+                        nic->COMGETTER(HostInterface)(strHostonlyAdp.asOutParam());
                         if (details == VMINFO_MACHINEREADABLE)
                         {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -130 +130 @@
     std::vector <char *> nictracefile (NetworkAdapterCount, 0);
     std::vector <char *> nicspeed (NetworkAdapterCount, 0);
-    std::vector <char *> bridgedifdev (NetworkAdapterCount, 0);
-    std::vector <char *> hostonlyifdev (NetworkAdapterCount, 0);
+    std::vector <char *> hostifdev (NetworkAdapterCount, 0);
     std::vector <const char *> intnet (NetworkAdapterCount, 0);
     std::vector <const char *> natnet (NetworkAdapterCount, 0);
@@ -489 +488 @@
             if (a->argc <= i + 1)
                 return errorArgument("Missing argument to '%s'", a->argv[i]);
-            bridgedifdev[n - 1] = a->argv[i + 1];
+            hostifdev[n - 1] = a->argv[i + 1];
             i++;
         }
@@ -500 +499 @@
             if (a->argc <= i + 1)
                 return errorArgument("Missing argument to '%s'", a->argv[i]);
-            bridgedifdev[n - 1] = a->argv[i + 1];
+            hostifdev[n - 1] = a->argv[i + 1];
             i++;
         }
@@ -512 +511 @@
             if (a->argc <= i + 1)
                 return errorArgument("Missing argument to '%s'", a->argv[i]);
-            hostonlyifdev[n - 1] = a->argv[i + 1];
+            hostifdev[n - 1] = a->argv[i + 1];
             i++;
         }
@@ -1644 +1643 @@
 
             /* the host interface device? */
-            if (hostonlyifdev[n])
+            if (hostifdev[n])
             {
                 /* remove it? */
-                if (!strcmp(hostonlyifdev[n], "none"))
-                {
-                    CHECK_ERROR_RET(nic, COMSETTER(HostOnlyInterface)(NULL), 1);
+                if (!strcmp(hostifdev[n], "none"))
+                {
+                    CHECK_ERROR_RET(nic, COMSETTER(HostInterface)(NULL), 1);
                 }
                 else
                 {
-                    CHECK_ERROR_RET(nic, COMSETTER(HostOnlyInterface)(Bstr(hostonlyifdev[n])), 1);
-                }
-            }
-
-            if (bridgedifdev[n])
-            {
-                /* remove it? */
-                if (!strcmp(bridgedifdev[n], "none"))
-                {
-                    CHECK_ERROR_RET(nic, COMSETTER(BridgedInterface)(NULL), 1);
-                }
-                else
-                {
-                    CHECK_ERROR_RET(nic, COMSETTER(BridgedInterface)(Bstr(bridgedifdev[n])), 1);
+                    CHECK_ERROR_RET(nic, COMSETTER(HostInterface)(Bstr(hostifdev[n])), 1);
                 }
             }