From 017927ba8c5e82a62888f7e4b1a237430a8ba3cf Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 19 Dec 2006 20:49:12 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=11700 --- checkin_notes | 10 +++ doc/boinc_news.php | 6 +- doc/client_msgs.php | 5 ++ doc/links.php | 4 + doc/project_options.php | 194 ++++++++++++++++++++++++++-------------- lib/boinc_cmd.C | 7 +- lib/crypt.C | 4 +- lib/error_numbers.h | 4 - lib/util.C | 3 - 9 files changed, 156 insertions(+), 81 deletions(-) diff --git a/checkin_notes b/checkin_notes index 0d30c77708..cd9fab7469 100755 --- a/checkin_notes +++ b/checkin_notes @@ -13532,3 +13532,13 @@ David 19 Dec 2006 http_curl.C log_flags.C,h scheduler_op.C + +David 19 Dec 2006 + - boinc_cmd: fix help() + - get rid of some unused error codes + + lib/ + boinc_cmd.C + crypt.C + error_numbers.h + util.C diff --git a/doc/boinc_news.php b/doc/boinc_news.php index b18b293ef8..9455aa8e1e 100644 --- a/doc/boinc_news.php +++ b/doc/boinc_news.php @@ -2,15 +2,15 @@ $project_news = array( array("December 8, 2006", - " + " Olaf Bornack of Team BOINC@Halle/Saale has supplied stencils for creating skins for the new BOINC GUI. These have been used to make skins with - BOINCcast - and BOINC@Halle/Saale themes. + BOINCcast, + BOINC@Halle/Saale, and BOINCmas! themes.
" ), diff --git a/doc/client_msgs.php b/doc/client_msgs.php index ade48e502b..abc2eff711 100644 --- a/doc/client_msgs.php +++ b/doc/client_msgs.php @@ -25,6 +25,7 @@ This file has the following format: [ N ] [ 0|1 ] + [ 0|1 ] [ N ] [ N ] [ N ] @@ -154,6 +155,10 @@ list_item_func("", If this flag is set, this check is skipped. Use it if you need to modify files locally for some reason." ); +list_item_func("", + "Set this flag to use HTTP 1.0 instead of 1.1 + (this may be needed with some proxies)." +); list_item_func("", "Act as if there were N CPUs: run N tasks at once. This is for debugging, i.e. to simulate 2 CPUs diff --git a/doc/links.php b/doc/links.php index ef9e37fed5..0b34683a31 100644 --- a/doc/links.php +++ b/doc/links.php @@ -219,6 +219,10 @@ language("Japanese", array( "http://boinc.oocp.org/", "translation by Komori Hitoshi") )); +language("Korean", array( + site("http://boincatkorea.xo.st/", "BOINC@KOREA"), +)); + language("Polish", array( site("http://www.boinc.org.pl/", "Team boinc.pl"), site("http://www.boinc.prv.pl", "BOINC@Kolobrzeg"), diff --git a/doc/project_options.php b/doc/project_options.php index ef8f07ac0e..7530835292 100644 --- a/doc/project_options.php +++ b/doc/project_options.php @@ -12,70 +12,34 @@ echo " The following elements in the <config> section of your config.xml file control various aspects of your project. + +

Hosts, directories, and URLs

+

+(These are created by make_project; normally you don't need to change them.) "; echo html_text(" - URL - name - project.hostname.ip - databasename - database.host.ip - database_user_name - database_password - shared_memory_key - http://A/URL - /path/to/directory - /path/to/directory - N - http://A/URL - /path/to/directory - http://A/URL - - [ ] - [ ] - [ ] - [ ] - [ N ] - [ 0|1 ] - [ N ] - [ N ] - [ ] - [ ] - [ ] - [ N ] - [ N ] - [ N ] - [ N ] - [ N ] - [ 0|1 ] - [ 0|1 ] - [ 0|1 ] - [ path ] - [ N ] - [ X ] - [ X ] - [ X ] - [ X ] - [ X ] - [ URL ] - [ ] - [ N ] - [ N ] - [ ] - - - - ../ + URL + name + project.hostname.ip + databasename + database.host.ip + database_user_name + database_password + shared_memory_key + http://A/URL + /path/to/directory + /path/to/directory + N + http://A/URL + /path/to/directory + http://A/URL + + ../ bin cgi-bin - -") -; - +[ path ] +"); list_start(); -list_bar("Hosts, directories, and URLs (these are created -by make_project; normally you don't need to change them)"); list_option("host", "name of project's main host, as given by Python's socket.hostname(). Daemons and tasks run on this host by default." @@ -102,7 +66,15 @@ list_option("sched_lockfile_dir", directory where scheduler lockfiles are stored. Must be writable to the Apache user. "); -list_bar("Web site features"); +list_end(); +echo " +

Web site features

+"; +echo html_text(" +[ ] +[ ] +"); +list_start(); list_option("profile_screening", "If present, don't show profile pictures until they've been screened and approved by project admins." @@ -110,16 +82,35 @@ list_option("profile_screening", list_option("show_results", "Enable web site features that show results (per user, host, etc.)" ); +list_end(); -list_bar( "Miscellaneous"); +echo " +

Miscellaneous

+"; +echo html_text(" +[ ] +[ N ] +"); +list_start(); list_option("disable_account_creation", "If present, disallow account creation" ); list_option("min_passwd_length", "Minimum length of user passwords. Default is 6." ); +list_end(); -list_bar( "Client control"); +echo " +

Client control

+"; +echo html_text(" +[ ] +[ URL ] +[ N ] +[ N ] +[ 0|1 ] +"); +list_start(); list_option("verify_files_on_app_start", "Before starting or restarting an app, check contents of input files and app version files @@ -157,7 +148,15 @@ list_option("non_cpu_intensive", applications that use little CPU time, e.g. that do network or host measurements." ); -list_bar( "Server logging"); +list_end(); +echo " +

Server logging

+"; +echo html_text(" +[ N ] +[ N ] +"); +list_start(); list_option("sched_debug_level", "Verbosity level for scheduler log output. 1=minimal, 2=normal (default), 3=verbose." @@ -167,7 +166,16 @@ list_option("fuh_debug_level", 1=minimal, 2=normal (default), 3=verbose." ); -list_bar( "Credit"); +list_end(); +echo " +

Credit

+"; +echo html_text(" +[ X ] +[ X ] +"); +list_start(); list_option("fp_benchmark_weight", "The weighting given to the Whetstone benchmark in the calculation of claimed credit. @@ -180,7 +188,29 @@ list_option("fp_benchmark_weight", run against the database of a running project, will suggest what value to use." ); -list_bar( "Scheduling options and parameters"); +list_end(); +echo " +

Scheduling options and parameters

+"; +echo html_text(" +[ ] +[ N ] +[ N ] +[ N ] +[ ] +[ ] +[ ] +[ N ] +[ N 0|1 ] +[ 0|1 ] +[ 0|1 ] +[ 0|1 ] +[ X ] +[ X ] +[ X ] +"); +list_start(); list_option("one_result_per_user_per_wu", "If present, send at most one result of a given workunit to a given user. This is useful for checking accuracy/validity of results. @@ -345,8 +375,15 @@ list_item("reliable_time
reliable_min_avg_credit
(typically 0.5 or so). " ); +list_end(); -list_bar( "File deleter options"); +echo " +

File deleter options

+"; +echo html_text(" +[ ] +"); +list_start(); list_option("dont_delete_batches", "If this boolean is set, the file deleter won't delete any files for which @@ -360,6 +397,31 @@ list_option("dont_delete_batches", If you use this option, replace the indices on file_delete_state with indices on (file_delete_state, batch)." ); +list_end(); +echo " +

Server status page options

+"; +echo html_text(" +[ hostname ] +[ hostname ] +[ path ] +[ hostname ] +[ path ] +[ path ] +[ path ] +"); +list_start(); +list_option("www_host", "Host name of web server"); +list_option("sched_host", "Host name of scheduling server"); +list_option("sched_pid", + "pid file of scheduling server (default: /etc/httpd/run/httpd.pid)" +); +list_option("uldl_host", "Host name of upload/download server"); +list_option("sched_pid", + "pid file of upload/download server (default: /etc/httpd/run/httpd.pid)" +); +list_option("ssh_exe", "path to ssh (default: /usr/bin/ssh)"); +list_option("ps_exe", "path to ps (which supports \"w\" flag) (default: /bin/ps)"); list_end(); diff --git a/lib/boinc_cmd.C b/lib/boinc_cmd.C index 600c9efddd..b5649c794c 100644 --- a/lib/boinc_cmd.C +++ b/lib/boinc_cmd.C @@ -59,7 +59,7 @@ void version(){ } void help() { - printf("\n\n\ + fprintf(stderr, "\n\n\ usage: boinc_cmd [--host hostname] [--passwd passwd] command\n\n\ Commands:\n\ --get_state show entire state\n\ @@ -72,8 +72,8 @@ Commands:\n\ --project url {reset | detach | update | suspend | resume | nomorework | allowmorework}\n\ --project_attach url auth\n\ --file_transfer url filename {retry | abort}\n\ - --set_run_mode {always | auto | never}\n\ - --set_network_mode {always | auto | never}\n\ + --set_run_mode {always | auto | never} duration\n\ + --set_network_mode {always | auto | never} duration\n\ --get_proxy_settings\n\ --set_proxy_settings\n\ --get_messages seqno show messages > seqno\n\ @@ -116,6 +116,7 @@ void show_error(int retval) { char* next_arg(int argc, char** argv, int& i) { if (i >= argc) { fprintf(stderr, "Missing command-line argument\n"); + help(); exit(1); } return argv[i++]; diff --git a/lib/crypt.C b/lib/crypt.C index 6d8672cdd9..3d4dedaa89 100644 --- a/lib/crypt.C +++ b/lib/crypt.C @@ -196,9 +196,9 @@ int sscan_key_hex(const char* buf, KEY* key, int size) { key->bits = num_bits; //key->bits is a short //fprintf(stderr, "key->bits = %d\n", key->bits); - if (n != 1) return ERR_SCANF; + if (n != 1) return ERR_XML_PARSE; buf = strchr(buf, '\n'); - if (!buf) return ERR_STRCHR; + if (!buf) return ERR_XML_PARSE; buf += 1; db.data = key->data; db.len = size - sizeof(key->bits); //huh??? diff --git a/lib/error_numbers.h b/lib/error_numbers.h index 1c8a055c1d..b129d90999 100755 --- a/lib/error_numbers.h +++ b/lib/error_numbers.h @@ -73,8 +73,6 @@ #define ERR_BENCHMARK_FAILED -133 #define ERR_BAD_HEX_FORMAT -134 // hex-format key data is bad -#define ERR_USER_REJECTED -135 - // user rejected executable file #define ERR_DB_NOT_FOUND -136 // no rows found in lookup() or enumerate() #define ERR_DB_NOT_UNIQUE -137 @@ -84,8 +82,6 @@ // gets() or fgets() #define ERR_SCANF -140 // scanf() or fscanf() -#define ERR_STRCHR -141 -#define ERR_STRSTR -142 #define ERR_READDIR -143 #define ERR_SHMGET -144 #define ERR_SHMCTL -145 diff --git a/lib/util.C b/lib/util.C index 773e39e3f9..00c126870b 100755 --- a/lib/util.C +++ b/lib/util.C @@ -1111,14 +1111,11 @@ const char* boincerror(int which_error) { case ERR_GETRUSAGE: return "system getrusage"; case ERR_BENCHMARK_FAILED: return "benchmark failed"; case ERR_BAD_HEX_FORMAT: return "hex format key data bad"; - case ERR_USER_REJECTED: return "user rejected executable file"; case ERR_DB_NOT_FOUND: return "no database rows found in lookup/enumerate"; case ERR_DB_NOT_UNIQUE: return "database lookup not unique"; case ERR_DB_CANT_CONNECT: return "can't connect to datbase"; case ERR_GETS: return "system gets/fgets"; case ERR_SCANF: return "system scanf/fscanf"; - case ERR_STRCHR: return "system strchr"; - case ERR_STRSTR: return "system strstr"; case ERR_READDIR: return "system readdir"; case ERR_SHMGET: return "system shmget"; case ERR_SHMCTL: return "system shmctl";