Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

VBOX: Rename bridged_mode to enable_network_bridged_mode. 

VBOX: Set the network configuration at VM creation time.  set_network_access() is called whenever the network is suspended or resumed.  It'll cause multiple DHCP requests to be spawned on a network resume.
This commit is contained in:
Rom Walton 2014-08-19 14:48:10 -04:00
parent dd9826c817
commit 188a13b2fb
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
samples/vboxwrapper/vbox.cpp
View File

@ -101,7 +101,7 @@ VBOX_VM::VBOX_VM() {
enable_remotedesktop = false; enable_remotedesktop = false;
register_only = false; register_only = false;
enable_network = false; enable_network = false;
bridged_mode = false; enable_network_bridged_mode = false;
pf_guest_port = 0; pf_guest_port = 0;
pf_host_port = 0; pf_host_port = 0;
headless = true; headless = true;
@ -519,18 +519,32 @@ int VBOX_VM::create_vm() {
// Tweak the VM's Network Configuration // Tweak the VM's Network Configuration
// //
fprintf( if (enable_network_bridged_mode) {
stderr, fprintf(
"%s Setting Network Configuration for VM.\n", stderr,
vboxwrapper_msg_prefix(buf, sizeof(buf)) "%s Setting Network Configuration for Bridged Mode.\n",
); vboxwrapper_msg_prefix(buf, sizeof(buf))
command = "modifyvm \"" + vm_name + "\" "; );
command += "--nic1 nat "; command = "modifyvm \"" + vm_name + "\" ";
command += "--natdnsproxy1 on "; command += "--nic1 bridged";
command += "--cableconnected1 off "; command += "--cableconnected1 off ";
retval = vbm_popen(command, output, "modifynetwork"); retval = vbm_popen(command, output, "set bridged mode");
if (retval) return retval; if (retval) return retval;
} else {
fprintf(
stderr,
"%s Setting Network Configuration for NAT.\n",
vboxwrapper_msg_prefix(buf, sizeof(buf))
);
command = "modifyvm \"" + vm_name + "\" ";
command += "--nic1 nat ";
command += "--natdnsproxy1 on ";
command += "--cableconnected1 off ";
retval = vbm_popen(command, output, "modifynetwork");
if (retval) return retval;
}
// Tweak the VM's USB Configuration // Tweak the VM's USB Configuration
// //
@ -2395,14 +2409,6 @@ int VBOX_VM::set_network_access(bool enabled) {
retval = vbm_popen(command, output, "enable network"); retval = vbm_popen(command, output, "enable network");
if (retval) return retval; if (retval) return retval;
if (bridged_mode) {
command = "modifyvm \"" + vm_name + "\" ";
command += "--nic1 bridged";
retval = vbm_popen(command, output, "set bridged mode");
if (retval) return retval;
}
} else { } else {
fprintf( fprintf(
stderr, stderr,

6
samples/vboxwrapper/vbox.h
View File

@ -116,8 +116,6 @@ public:
// Is VM restoring from checkpoint? // Is VM restoring from checkpoint?
bool crashed; bool crashed;
// Has the VM crashed? // Has the VM crashed?
bool enable_cern_dataformat;
// whether to use CERN specific data structures
bool register_only; bool register_only;
// whether we were instructed to only register the VM. // whether we were instructed to only register the VM.
// useful for debugging VMs. // useful for debugging VMs.
@ -134,13 +132,15 @@ public:
// the type of disk controller to emulate // the type of disk controller to emulate
std::string vm_disk_controller_model; std::string vm_disk_controller_model;
// the disk controller model to emulate // the disk controller model to emulate
bool enable_cern_dataformat;
// whether to use CERN specific data structures
bool enable_isocontextualization; bool enable_isocontextualization;
// whether to use an iso9660 image to implement VM contextualization (e.g. uCernVM) // whether to use an iso9660 image to implement VM contextualization (e.g. uCernVM)
bool enable_cache_disk; bool enable_cache_disk;
// whether to add an extra cache disk for systems like uCernVM // whether to add an extra cache disk for systems like uCernVM
bool enable_network; bool enable_network;
// whether to allow network access // whether to allow network access
bool bridged_mode; bool enable_network_bridged_mode;
// use bridged mode for network // use bridged mode for network
bool enable_shared_directory; bool enable_shared_directory;
// whether to use shared directory infrastructure // whether to use shared directory infrastructure

2
samples/vboxwrapper/vboxwrapper.cpp
View File

@ -199,7 +199,7 @@ int parse_job_file(VBOX_VM& vm) {
else if (xp.parse_string("fraction_done_filename", vm.fraction_done_filename)) continue; else if (xp.parse_string("fraction_done_filename", vm.fraction_done_filename)) continue;
else if (xp.parse_bool("enable_cern_dataformat", vm.enable_cern_dataformat)) continue; else if (xp.parse_bool("enable_cern_dataformat", vm.enable_cern_dataformat)) continue;
else if (xp.parse_bool("enable_network", vm.enable_network)) continue; else if (xp.parse_bool("enable_network", vm.enable_network)) continue;
else if (xp.parse_bool("bridged_mode", vm.bridged_mode)) continue; else if (xp.parse_bool("enable_network_bridged_mode", vm.enable_network_bridged_mode)) continue;
else if (xp.parse_bool("enable_shared_directory", vm.enable_shared_directory)) continue; else if (xp.parse_bool("enable_shared_directory", vm.enable_shared_directory)) continue;
else if (xp.parse_bool("enable_floppyio", vm.enable_floppyio)) continue; else if (xp.parse_bool("enable_floppyio", vm.enable_floppyio)) continue;
else if (xp.parse_bool("enable_cache_disk", vm.enable_cache_disk)) continue; else if (xp.parse_bool("enable_cache_disk", vm.enable_cache_disk)) continue;