Changeset 88079 in vbox

Timestamp:

Mar 10, 2021 8:48:09 PM (4 years ago)

Author:

vboxsync

Message:

VBoxManage: When setting the host interface for bridging or hostonly
attachments do a sanity check on it. Make sure IHost knows about it
and that the interface is of correct type. Warn the user if that's
not the case, but the warning is non-fatal. The API setters don't do
this, so provide at least some protection from typos and mistakes.
bugref:9966.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManageControlVM.cpp (modified) (3 diffs)
• VBoxManageModifyVM.cpp (modified) (3 diffs)
• VBoxManageUtils.cpp (added)
• VBoxManageUtils.h (added)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -78 +78 @@
  VBoxManage_SOURCES    = \
         VBoxManage.cpp \
+        VBoxManageUtils.cpp \
         VBoxInternalManage.cpp \
         VBoxManageAppliance.cpp \

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

@@ -38 +38 @@
 
 #include "VBoxManage.h"
+#include "VBoxManageUtils.h"
 
 #include <list>
@@ -1186 +1187 @@
                         }
                         CHECK_ERROR_RET(adapter, COMSETTER(BridgedInterface)(Bstr(a->argv[3]).raw()), RTEXITCODE_FAILURE);
+                        verifyHostNetworkInterfaceName(a->virtualBox, a->argv[3], HostNetworkInterfaceType_Bridged);
                         CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_Bridged), RTEXITCODE_FAILURE);
                     }
@@ -1209 +1211 @@
                         }
                         CHECK_ERROR_RET(adapter, COMSETTER(HostOnlyInterface)(Bstr(a->argv[3]).raw()), RTEXITCODE_FAILURE);
+                        verifyHostNetworkInterfaceName(a->virtualBox, a->argv[3], HostNetworkInterfaceType_HostOnly);
                         CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_HostOnly), RTEXITCODE_FAILURE);
                     }

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

@@ -38 +38 @@
 #include <VBox/log.h>
 #include "VBoxManage.h"
+#include "VBoxManageUtils.h"
 
 #ifndef VBOX_ONLY_DOCS
@@ -1730 +1731 @@
                 {
                     CHECK_ERROR(nic, COMSETTER(BridgedInterface)(Bstr(ValueUnion.psz).raw()));
+                    verifyHostNetworkInterfaceName(a->virtualBox, ValueUnion.psz,
+                                                   HostNetworkInterfaceType_Bridged);
                 }
                 break;
@@ -1751 +1754 @@
                 {
                     CHECK_ERROR(nic, COMSETTER(HostOnlyInterface)(Bstr(ValueUnion.psz).raw()));
+                    verifyHostNetworkInterfaceName(a->virtualBox, ValueUnion.psz,
+                                                   HostNetworkInterfaceType_HostOnly);
                 }
                 break;