- client: There was already a way to check if the reference site

check was in progress, I missed it through my first pass
        through the manager code while trying to debug the proxy problem
        get_cc_config returns NETWORK_STATUS_LOOKUP_PENDING which
        then causes the manager to call get_cc_status again.
        
    client/
        gui_rpc_server_ops.cpp
        net_stats.cpp, .h

svn path=/trunk/boinc/; revision=18743
This commit is contained in:
Rom Walton 2009-07-28 04:16:32 +00:00
parent 05e09c2fa6
commit c3dc333f26
4 changed files with 12 additions and 17 deletions

View File

@ -6571,3 +6571,14 @@ Rom 27 July 2009
clientgui/
AccountManagerPropertiesPage.cpp, .h
ProjectPropertiesPage.cpp, .h
Rom 27 July 2009
- client: There was already a way to check if the reference site
check was in progress, I missed it through my first pass
through the manager code while trying to debug the proxy problem
get_cc_config returns NETWORK_STATUS_LOOKUP_PENDING which
then causes the manager to call get_cc_status again.
client/
gui_rpc_server_ops.cpp
net_stats.cpp, .h

View File

@ -645,20 +645,11 @@ void GUI_RPC_CONN::handle_get_project_config(char* buf, MIOFILE& fout) {
void GUI_RPC_CONN::handle_get_project_config_poll(char*, MIOFILE& fout) {
if (get_project_config_op.error_num) {
int x;
// if the HTTP op failed, it triggers a net status check (to google).
// If this is in progress, act as if the HTTP op is still in progress
//
if (net_status.ref_site_check_in_progress()) {
x = ERR_IN_PROGRESS;
} else {
x = get_project_config_op.error_num;
}
fout.printf(
"<project_config>\n"
" <error_num>%d</error_num>\n"
"</project_config>\n",
x
get_project_config_op.error_num
);
} else {
fout.printf("%s", get_project_config_op.reply.c_str());

View File

@ -258,10 +258,4 @@ void NET_STATUS::poll() {
}
}
bool NET_STATUS::ref_site_check_in_progress() {
if (need_to_contact_reference_site) return true;
if (gstate.lookup_website_op.error_num == ERR_IN_PROGRESS) return true;
return false;
}
const char *BOINC_RCSID_733b4006f5 = "$Id$";

View File

@ -91,7 +91,6 @@ public:
last_comm_time = 0;
}
void poll();
bool ref_site_check_in_progress();
};
/// This is used to access a reference website (like yahoo or google)