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

account manager fix 

svn path=/trunk/boinc/; revision=9464
This commit is contained in:
David Anderson 2006-02-14 21:20:43 +00:00
parent 2aa8eedae8
commit 15044d5d06
5 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -1796,3 +1796,13 @@ Rom 13 Feb 2006
clientgui/ clientgui/
BOINCDialupManager.cpp BOINCDialupManager.cpp
David 14 Feb 2006
- fix bug that broke account manager attach
- removed 2nd arg (CurlError) from handle_reply functions.
We were using this to check for DNS failure,
but we're not doing this anymore.
client/
acct_setup.C,h
gui_http.C,h

12
client/acct_setup.C
View File

@ -101,7 +101,7 @@ int GET_PROJECT_CONFIG_OP::do_rpc(string master_url) {
return retval; return retval;
} }
void GET_PROJECT_CONFIG_OP::handle_reply(int http_op_retval, int) { void GET_PROJECT_CONFIG_OP::handle_reply(int http_op_retval) {
if (http_op_retval) { if (http_op_retval) {
error_num = http_op_retval; error_num = http_op_retval;
} else { } else {
@ -130,7 +130,7 @@ int LOOKUP_ACCOUNT_OP::do_rpc(ACCOUNT_IN& ai) {
return retval; return retval;
} }
void LOOKUP_ACCOUNT_OP::handle_reply(int http_op_retval, int) { void LOOKUP_ACCOUNT_OP::handle_reply(int http_op_retval) {
if (http_op_retval) { if (http_op_retval) {
error_num = http_op_retval; error_num = http_op_retval;
} else { } else {
@ -159,7 +159,7 @@ int CREATE_ACCOUNT_OP::do_rpc(ACCOUNT_IN& ai) {
return retval; return retval;
} }
void CREATE_ACCOUNT_OP::handle_reply(int http_op_retval, int) { void CREATE_ACCOUNT_OP::handle_reply(int http_op_retval) {
if (http_op_retval) { if (http_op_retval) {
error_num = http_op_retval; error_num = http_op_retval;
} else { } else {
@ -187,7 +187,7 @@ int LOOKUP_WEBSITE_OP::do_rpc(string& url) {
return retval; return retval;
} }
void LOOKUP_WEBSITE_OP::handle_reply(int http_op_retval, int CurlResult) { void LOOKUP_WEBSITE_OP::handle_reply(int http_op_retval) {
error_num = http_op_retval; error_num = http_op_retval;
// if we couldn't contact a reference web site, // if we couldn't contact a reference web site,
@ -196,7 +196,7 @@ void LOOKUP_WEBSITE_OP::handle_reply(int http_op_retval, int CurlResult) {
// Set a flag that will signal the Manager to that effect // Set a flag that will signal the Manager to that effect
// //
if (checking_network) { if (checking_network) {
if (CurlResult) { if (http_op_retval) {
gstate.need_physical_connection = true; gstate.need_physical_connection = true;
msg_printf(0, MSG_INFO, "Network check: failure"); msg_printf(0, MSG_INFO, "Network check: failure");
} else { } else {
@ -252,7 +252,7 @@ static bool parse_version(FILE* f, char* new_version) {
return false; return false;
} }
void GET_CURRENT_VERSION_OP::handle_reply(int http_op_retval, int) { void GET_CURRENT_VERSION_OP::handle_reply(int http_op_retval) {
char buf[256], new_version[256]; char buf[256], new_version[256];
if (http_op_retval) { if (http_op_retval) {
error_num = http_op_retval; error_num = http_op_retval;

10
client/acct_setup.h
View File

@ -56,7 +56,7 @@ struct GET_PROJECT_CONFIG_OP: public GUI_HTTP_OP {
virtual ~GET_PROJECT_CONFIG_OP(){} virtual ~GET_PROJECT_CONFIG_OP(){}
int do_rpc(string url); int do_rpc(string url);
virtual void handle_reply(int http_op_retval, int); virtual void handle_reply(int http_op_retval);
GET_PROJECT_CONFIG_OP(){error_num = BOINC_SUCCESS;} GET_PROJECT_CONFIG_OP(){error_num = BOINC_SUCCESS;}
}; };
@ -66,7 +66,7 @@ struct LOOKUP_ACCOUNT_OP: public GUI_HTTP_OP {
virtual ~LOOKUP_ACCOUNT_OP(){} virtual ~LOOKUP_ACCOUNT_OP(){}
int do_rpc(ACCOUNT_IN&); int do_rpc(ACCOUNT_IN&);
virtual void handle_reply(int http_op_retval, int); virtual void handle_reply(int http_op_retval);
LOOKUP_ACCOUNT_OP(){error_num = BOINC_SUCCESS;} LOOKUP_ACCOUNT_OP(){error_num = BOINC_SUCCESS;}
}; };
@ -76,7 +76,7 @@ struct CREATE_ACCOUNT_OP: public GUI_HTTP_OP {
virtual ~CREATE_ACCOUNT_OP(){} virtual ~CREATE_ACCOUNT_OP(){}
int do_rpc(ACCOUNT_IN&); int do_rpc(ACCOUNT_IN&);
virtual void handle_reply(int http_op_retval, int); virtual void handle_reply(int http_op_retval);
CREATE_ACCOUNT_OP(){error_num = BOINC_SUCCESS;} CREATE_ACCOUNT_OP(){error_num = BOINC_SUCCESS;}
}; };
@ -86,7 +86,7 @@ struct LOOKUP_WEBSITE_OP: public GUI_HTTP_OP {
virtual ~LOOKUP_WEBSITE_OP(){} virtual ~LOOKUP_WEBSITE_OP(){}
int do_rpc(std::string&); int do_rpc(std::string&);
virtual void handle_reply(int http_op_retval, int); virtual void handle_reply(int http_op_retval);
LOOKUP_WEBSITE_OP(){ LOOKUP_WEBSITE_OP(){
error_num = BOINC_SUCCESS; error_num = BOINC_SUCCESS;
checking_network = false; checking_network = false;
@ -98,7 +98,7 @@ struct GET_CURRENT_VERSION_OP: public GUI_HTTP_OP {
virtual ~GET_CURRENT_VERSION_OP(){} virtual ~GET_CURRENT_VERSION_OP(){}
int do_rpc(); int do_rpc();
virtual void handle_reply(int http_op_retval, int); virtual void handle_reply(int http_op_retval);
GET_CURRENT_VERSION_OP(){error_num = BOINC_SUCCESS;} GET_CURRENT_VERSION_OP(){error_num = BOINC_SUCCESS;}
}; };

2
client/gui_http.C
View File

@ -74,7 +74,7 @@ bool GUI_HTTP::poll() {
if (http_op.http_op_state == HTTP_STATE_DONE) { if (http_op.http_op_state == HTTP_STATE_DONE) {
gstate.http_ops->remove(&http_op); gstate.http_ops->remove(&http_op);
gui_http_op->handle_reply(http_op.http_op_retval, http_op.CurlResult); gui_http_op->handle_reply(http_op.http_op_retval);
gui_http_op = NULL; gui_http_op = NULL;
state = GUI_HTTP_STATE_IDLE; state = GUI_HTTP_STATE_IDLE;
} }

2
client/gui_http.h
View File

@ -31,7 +31,7 @@ using std::string;
// base class for various types of ops // base class for various types of ops
// //
struct GUI_HTTP_OP { struct GUI_HTTP_OP {
virtual void handle_reply(int, int) {} virtual void handle_reply(int) {}
GUI_HTTP_OP(){} GUI_HTTP_OP(){}
virtual ~GUI_HTTP_OP(){} virtual ~GUI_HTTP_OP(){}
}; };