Skip to content

improve vboxwrapper network setup #6111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AenBleidd merged 2 commits into from
Feb 23, 2025
Merged

improve vboxwrapper network setup #6111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
488ed03
improve vboxwrapper network setup
computezrmle Feb 23, 2025
d20d8b0
Update graphics controller logging
computezrmle Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 95 additions & 8 deletions samples/vboxwrapper/vbox_vboxmanage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,15 @@ int VBOX_VM::initialize() {
int VBOX_VM::create_vm() {
string command;
string output;
string needle;
string default_interface;
bool disable_acceleration = false;
char buf[256];
int retval;
int save_retval;
string vm_nictype1;
size_t vm_nictype1_start;
size_t vm_nictype1_end;

vboxlog_msg("Create VM. (%s, slot#%d)", vm_master_name.c_str(), aid.slot);

Expand Down Expand Up @@ -235,7 +239,7 @@ int VBOX_VM::create_vm() {

// Tweak the VM's Graphics Controller Options
//
vboxlog_msg("Setting Graphics Controller Options for VM.");
vboxlog_msg("Setting Graphics Controller Options for VM. (Driver: %s, %dMB)", vm_graphics_controller_type.c_str(), (int)vram_size_mb);
snprintf(buf, sizeof(buf), "%d", (int)vram_size_mb);

command = "modifyvm \"" + vm_name + "\" ";
Expand Down Expand Up @@ -264,11 +268,65 @@ int VBOX_VM::create_vm() {

// Tweak the VM's Network Configuration
//
command = "showvminfo \"" + vm_name + "\" ";
command += "--machinereadable ";

retval = vbm_popen(command, output, "get default networkadapter type", false, false);
if (retval) return retval;

vm_nictype1.clear();
needle = "nictype1=\"";

if ((vm_nictype1_start = output.find(needle.c_str())) != string::npos) {
vm_nictype1_start += needle.size();
vm_nictype1_end = output.find("\"", vm_nictype1_start);
vm_nictype1 = output.substr(vm_nictype1_start, vm_nictype1_end - vm_nictype1_start);
}

// virtio-net is available since VirtualBox version 3.1.
// use it for Linux guests.
// see the VirtualBox manual for further details.
//
if (output.find("effparavirtprovider=\"kvm\"") != string::npos) {
vm_nictype1 = "virtio";
}

// if a valid adapter name is set in vbox_job.xml use that one
// see the VirtualBox manual for valid names.
//
if (vm_network_driver.size()) {
command = "help modifyvm ";

retval = vbm_popen(command, output, "verify custom networkadapter name", false, false);
if (retval) return retval;

if (output.find(vm_network_driver.c_str()) != string::npos) {
vm_nictype1 = vm_network_driver;
} else {
vboxlog_msg("Invalid vm_network_driver '%s' detected in 'vbox_job.xml'.", vm_network_driver.c_str());
vboxlog_msg("Will use '%s' instead.", vm_nictype1.c_str());
}
}

if (network_bridged_mode) {
vboxlog_msg("Setting Network Configuration for Bridged Mode.");
vboxlog_msg("Setting Network Configuration for Bridged Mode. (Driver: %s)", vm_nictype1.c_str());
command = "modifyvm \"" + vm_name + "\" ";
command += "--nic1 bridged ";
command += "--cableconnected1 off ";
if (is_virtualbox_version_newer(6, 9, 99)) {
if (vm_nictype1.size()) {
command += "--nic-type1 \"";
command += vm_nictype1;
command += "\" ";
}
command += "--cable-connected1 off ";
} else {
if (vm_nictype1.size()) {
command += "--nictype1 \"";
command += vm_nictype1;
command += "\" ";
}
command += "--cableconnected1 off ";
}

retval = vbm_popen(command, output, "set bridged mode");
if (retval) return retval;
Expand All @@ -284,11 +342,32 @@ int VBOX_VM::create_vm() {
retval = vbm_popen(command, output, "set bridged interface");
if (retval) return retval;
} else {
vboxlog_msg("Setting Network Configuration for NAT.");
vboxlog_msg("Setting Network Configuration for NAT. (Driver: %s)", vm_nictype1.c_str());
command = "modifyvm \"" + vm_name + "\" ";
command += "--nic1 nat ";
command += "--natdnsproxy1 on ";
command += "--cableconnected1 off ";
if (is_virtualbox_version_newer(6, 9, 99)) {
if (vm_nictype1.size()) {
command += "--nic-type1 \"";
command += vm_nictype1;
command += "\" ";
}
command += "--cable-connected1 off ";
command += "--nat-dns-proxy1 on ";
if (enable_nat_dns_host_resolver) {
command += "--nat-dns-host-resolver1 on ";
}
} else {
if (vm_nictype1.size()) {
command += "--nictype1 \"";
command += vm_nictype1;
command += "\" ";
}
command += "--cableconnected1 off ";
command += "--natdnsproxy1 on ";
if (enable_nat_dns_host_resolver) {
command += "--natdnshostresolver1 on ";
}
}

retval = vbm_popen(command, output, "set nat mode");
if (retval) return retval;
Expand All @@ -297,13 +376,21 @@ int VBOX_VM::create_vm() {
if (enable_network) {
vboxlog_msg("Enabling VM Network Access.");
command = "modifyvm \"" + vm_name + "\" ";
command += "--cableconnected1 on ";
if (is_virtualbox_version_newer(6, 9, 99)) {
command += "--cable-connected1 on ";
} else {
command += "--cableconnected1 on ";
}
retval = vbm_popen(command, output, "enable network");
if (retval) return retval;
} else {
vboxlog_msg("Disabling VM Network Access.");
command = "modifyvm \"" + vm_name + "\" ";
command += "--cableconnected1 off ";
if (is_virtualbox_version_newer(6, 9, 99)) {
command += "--cable-connected1 off ";
} else {
command += "--cableconnected1 off ";
}
retval = vbm_popen(command, output, "disable network");
if (retval) return retval;
}
Expand Down
4 changes: 4 additions & 0 deletions samples/vboxwrapper/vboxjob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,10 @@ void VBOX_JOB::clear() {
enable_floppyio = false;
enable_cache_disk = false;
enable_isocontextualization = false;
vm_network_driver.clear();
enable_network = false;
network_bridged_mode = false;
enable_nat_dns_host_resolver = false;
enable_remotedesktop = false;
enable_gbac = false;
enable_screenshots_on_error = false;
Expand Down Expand Up @@ -187,8 +189,10 @@ int VBOX_JOB::parse() {
else if (xp.parse_string("temporary_exit_trigger_file", temporary_exit_trigger_file)) continue;
else if (xp.parse_string("multiattach_vdi_file", multiattach_vdi_file)) continue;
else if (xp.parse_bool("enable_cern_dataformat", enable_cern_dataformat)) continue;
else if (xp.parse_string("vm_network_driver", vm_network_driver)) continue;
else if (xp.parse_bool("enable_network", enable_network)) continue;
else if (xp.parse_bool("network_bridged_mode", network_bridged_mode)) continue;
else if (xp.parse_bool("enable_nat_dns_host_resolver", enable_nat_dns_host_resolver)) continue;
else if (xp.parse_bool("enable_shared_directory", enable_shared_directory)) continue;
else if (xp.parse_bool("enable_scratch_directory", enable_scratch_directory)) continue;
else if (xp.parse_bool("share_slot_dir", share_slot_dir)) continue;
Expand Down
6 changes: 6 additions & 0 deletions samples/vboxwrapper/vboxjob.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,16 @@ struct VBOX_JOB {
// add an extra cache disk for systems like uCernVM
bool boot_iso;
// put the iso as the first boot device
string vm_network_driver;
// name of the virtual network driver to be used
// see the VirtualBox manual for valid values
bool enable_network;
// allow network access
bool network_bridged_mode;
// use bridged mode for network
bool enable_nat_dns_host_resolver;
// specifies whether the NAT engine uses the host system's
// resolver mechanisms to handle DNS requests
bool enable_shared_directory;
// create slot/shared and share it as 'shared'
bool enable_scratch_directory;
Expand Down
Loading