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

- VBOX: When the system confirms our port number request or assigns us a 

new port number to work with convert it from network byte order 
        (big endian) to the host byte order (little endian on x86/x64 processors).

    samples/vboxwrapper/
        vbox.cpp

svn path=/trunk/boinc/; revision=25671
This commit is contained in:
Rom Walton 2012-05-11 18:53:36 +00:00
parent 003700930e
commit 63483b5bb7
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -3809,9 +3809,17 @@ David 10 May 2012
lib/ lib/
diagnostics.cpp diagnostics.cpp
Bernd 8 May 2012 Bernd 11 May 2012
- scheduler: don't try to send_file_deletes() with an incomplete request - scheduler: don't try to send_file_deletes() with an incomplete request
sched/ sched/
handle_request.cpp handle_request.cpp
Rom 11 May 2012
- VBOX: When the system confirms our port number request or assigns us a
new port number to work with convert it from network byte order
(big endian) to the host byte order (little endian on x86/x64 processors).
samples/vboxwrapper/
vbox.cpp

32
samples/vboxwrapper/vbox.cpp
View File

@ -297,7 +297,6 @@ int VBOX_VM::stop() {
if (online) { if (online) {
command = "controlvm \"" + vm_name + "\" savestate"; command = "controlvm \"" + vm_name + "\" savestate";
retval = vbm_popen(command, output, "stop VM", true, false); retval = vbm_popen(command, output, "stop VM", true, false);
if (retval) return retval;
poll(false); poll(false);
@ -335,7 +334,6 @@ int VBOX_VM::poweroff() {
if (online) { if (online) {
command = "controlvm \"" + vm_name + "\" poweroff"; command = "controlvm \"" + vm_name + "\" poweroff";
retval = vbm_popen(command, output, "poweroff VM", true, false); retval = vbm_popen(command, output, "poweroff VM", true, false);
if (retval) return retval;
poll(false); poll(false);
@ -872,7 +870,7 @@ int VBOX_VM::deregister_vm() {
vbm_popen(command, output, "deregister storage controller (floppy disk)"); vbm_popen(command, output, "deregister storage controller (floppy disk)");
} }
// Next delete VM // Next, delete VM
// //
fprintf( fprintf(
stderr, stderr,
@ -1266,14 +1264,14 @@ int VBOX_VM::get_vm_process_id(int& process_id) {
} }
int VBOX_VM::get_port_forwarding_port() { int VBOX_VM::get_port_forwarding_port() {
struct sockaddr_in addr; sockaddr_in addr;
BOINC_SOCKLEN_T addrsize; BOINC_SOCKLEN_T addrsize;
int sock; int sock;
int retval; int retval;
addrsize = sizeof(struct sockaddr_in); addrsize = sizeof(sockaddr_in);
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(sockaddr_in));
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(pf_host_port); addr.sin_port = htons(pf_host_port);
addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
@ -1281,12 +1279,12 @@ int VBOX_VM::get_port_forwarding_port() {
retval = boinc_socket(sock); retval = boinc_socket(sock);
if (retval) return retval; if (retval) return retval;
retval = bind(sock, (struct sockaddr *)&addr, addrsize); retval = bind(sock, (const sockaddr*)&addr, addrsize);
if (retval < 0) { if (retval < 0) {
boinc_close_socket(sock); boinc_close_socket(sock);
// Lets see if we can get anything useable at this point // Lets see if we can get anything useable at this point
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(sockaddr_in));
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(0); addr.sin_port = htons(0);
addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
@ -1294,29 +1292,29 @@ int VBOX_VM::get_port_forwarding_port() {
retval = boinc_socket(sock); retval = boinc_socket(sock);
if (retval) return retval; if (retval) return retval;
retval = bind(sock, (struct sockaddr *)&addr, addrsize); retval = bind(sock, (const sockaddr*)&addr, addrsize);
if (retval < 0) { if (retval < 0) {
boinc_close_socket(sock); boinc_close_socket(sock);
return ERR_BIND; return ERR_BIND;
} }
} }
getsockname(sock, (struct sockaddr *)&addr, &addrsize); getsockname(sock, (sockaddr*)&addr, &addrsize);
pf_host_port = addr.sin_port; pf_host_port = ntohs(addr.sin_port);
boinc_close_socket(sock); boinc_close_socket(sock);
return 0; return 0;
} }
int VBOX_VM::get_remote_desktop_port() { int VBOX_VM::get_remote_desktop_port() {
struct sockaddr_in addr; sockaddr_in addr;
BOINC_SOCKLEN_T addrsize; BOINC_SOCKLEN_T addrsize;
int sock; int sock;
int retval; int retval;
addrsize = sizeof(struct sockaddr_in); addrsize = sizeof(sockaddr_in);
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(sockaddr_in));
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(0); addr.sin_port = htons(0);
addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
@ -1324,14 +1322,14 @@ int VBOX_VM::get_remote_desktop_port() {
retval = boinc_socket(sock); retval = boinc_socket(sock);
if (retval) return retval; if (retval) return retval;
retval = bind(sock, (struct sockaddr *)&addr, addrsize); retval = bind(sock, (const sockaddr*)&addr, addrsize);
if (retval < 0) { if (retval < 0) {
boinc_close_socket(sock); boinc_close_socket(sock);
return ERR_BIND; return ERR_BIND;
} }
getsockname(sock, (struct sockaddr *)&addr, &addrsize); getsockname(sock, (sockaddr*)&addr, &addrsize);
rd_host_port = addr.sin_port; rd_host_port = ntohs(addr.sin_port);
boinc_close_socket(sock); boinc_close_socket(sock);
return 0; return 0;