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

added SOCKS username/server prefs to client_state 

svn path=/trunk/boinc/; revision=769
This commit is contained in:
Eric Heien 2002-12-19 00:00:43 +00:00
parent 9de7bf8f32
commit 53d5743480
2 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
client/client_state.C
View File

@ -71,9 +71,12 @@ CLIENT_STATE::CLIENT_STATE() {
max_bytes = 0;
minimize = false;
user_idle = true;
use_proxy = false;
proxy_server_name[0] = 0;
use_http_proxy = false;
use_socks_proxy = false;
strcpy(proxy_server_name,"");
proxy_server_port = 80;
strcpy(socks_user_name,"");
strcpy(socks_user_passwd,"");
suspend_requested = false;
#ifdef _WIN32
time_tests_handle = NULL;
@ -498,12 +501,12 @@ int CLIENT_STATE::parse_state_file() {
// TODO: handle old client state file if different version
} else if (match_tag(buf, "<core_client_minor_version>")) {
// TODO: handle old client state file if different version
} else if (match_tag(buf, "<prefs_confirm/>")) {
} else if (match_tag(buf, "<confirm_before_connect/>")) {
global_prefs.confirm_before_connecting = true;
} else if (match_tag(buf, "<hangup_if_dialed/>")) {
global_prefs.hangup_if_dialed = true;
} else if (match_tag(buf, "<use_http_proxy/>")) {
use_proxy = true;
use_http_proxy = true;
} else if (parse_str(buf, "<http_proxy_server>", proxy_server_name, sizeof(proxy_server_name))) {
} else if (parse_int(buf, "<http_proxy_port>", proxy_server_port)) {
} else {
@ -570,13 +573,19 @@ int CLIENT_STATE::write_state_file() {
"%s"
"%s"
"%s"
"<http_proxy_server>%s</http_proxy_server>\n"
"<http_proxy_port>%d</http_proxy_port>\n",
use_proxy?"<use_http_proxy/>\n":"",
global_prefs.confirm_before_connecting?"<prefs_confirm/>\n":"",
"%s"
"<proxy_server_name>%s</proxy_server_name>\n"
"<proxy_server_port>%d</proxy_server_port>\n"
"<socks_user_name>%s</socks_user_name>\n"
"<socks_user_passwd>%s</socks_user_passwd>\n",
use_http_proxy?"<use_http_proxy/>\n":"",
use_socks_proxy?"<use_socks_proxy/>\n":"",
global_prefs.confirm_before_connecting?"<confirm_before_connect/>\n":"",
global_prefs.hangup_if_dialed?"<hangup_if_dialed/>\n":"",
proxy_server_name,
proxy_server_port
proxy_server_port,
socks_user_name,
socks_user_passwd
);
fprintf(f, "</client_state>\n");
fclose(f);
@ -992,7 +1001,6 @@ bool CLIENT_STATE::update_results() {
//
void CLIENT_STATE::parse_cmdline(int argc, char** argv) {
int i;
char *p, temp[256];
for (i=1; i<argc; i++) {
if (!strcmp(argv[i], "-exit_when_idle")) {
@ -1038,13 +1046,32 @@ void CLIENT_STATE::parse_cmdline(int argc, char** argv) {
continue;
}
}
}
void CLIENT_STATE::parse_env_vars() {
char *p, temp[256];
if ((p = getenv("HTTP_PROXY"))) {
if (strlen(p) > 0) {
use_proxy = true;
use_http_proxy = true;
parse_url(p, proxy_server_name, proxy_server_port, temp);
}
}
if ((p = getenv("SOCKS_SERVER"))) {
if (strlen(p) > 0) {
use_socks_proxy = true;
parse_url(p, proxy_server_name, proxy_server_port, temp);
}
}
if ((p = getenv("SOCKS_USER"))) {
strcpy(socks_user_name, p);
}
if ((p = getenv("SOCKS_PASSWD"))) {
strcpy(socks_user_name, p);
}
}
// Returns true if the core client should exit

6
client/client_state.h
View File

@ -63,6 +63,7 @@ public:
int exit();
bool do_something();
void parse_cmdline(int argc, char** argv);
void parse_env_vars();
bool time_to_exit();
bool run_time_tests();
int time_tests();
@ -81,9 +82,12 @@ public:
bool minimize; // put client in the background after it's started up
bool user_idle;
bool suspend_requested;
bool use_proxy;
bool use_http_proxy;
bool use_socks_proxy;
int proxy_server_port;
char proxy_server_name[256];
char socks_user_name[256];
char socks_user_passwd[256];
private: