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

- client: fix bugs with white space around code sign keys 

and file signatures
	- client: when describing app versions in scheduler requests,
		we still must use CUDA instead of NVIDIA; that's what's in the server code.

svn path=/trunk/boinc/; revision=24135
This commit is contained in:
David Anderson 2011-09-06 22:50:46 +00:00
parent 248282685e
commit 8cd20da680
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkin_notes
View File

@ -5634,3 +5634,12 @@ David 6 Sept 2011
sched/ sched/
sched_send.cpp sched_send.cpp
David 6 Sept 2011
- client: fix bugs with white space around code sign keys
and file signatures
- client: when describing app versions in scheduler requests,
we still must use CUDA instead of NVIDIA; that's what's in the server code.
client/
client_types.cpp

8
client/client_types.cpp
View File

@ -227,7 +227,6 @@ int PROJECT::parse_state(XML_PARSER& xp) {
); );
if (retval) return retval; if (retval) return retval;
strip_whitespace(code_sign_key); strip_whitespace(code_sign_key);
strcat(code_sign_key, "\n");
continue; continue;
} }
if (xp.parse_int("nrpc_failures", nrpc_failures)) continue; if (xp.parse_int("nrpc_failures", nrpc_failures)) continue;
@ -969,6 +968,7 @@ int FILE_INFO::parse(XML_PARSER& xp) {
sizeof(file_signature) sizeof(file_signature)
); );
if (retval) return retval; if (retval) return retval;
strip_whitespace(file_signature);
continue; continue;
} }
if (xp.match_tag("signatures")) { if (xp.match_tag("signatures")) {
@ -1081,7 +1081,7 @@ int FILE_INFO::write(MIOFILE& out, bool to_server) {
if (gzip_when_done) out.printf(" <gzip_when_done/>\n"); if (gzip_when_done) out.printf(" <gzip_when_done/>\n");
if (signature_required) out.printf(" <signature_required/>\n"); if (signature_required) out.printf(" <signature_required/>\n");
if (is_user_file) out.printf(" <is_user_file/>\n"); if (is_user_file) out.printf(" <is_user_file/>\n");
if (strlen(file_signature)) out.printf(" <file_signature>\n%s</file_signature>\n", file_signature); if (strlen(file_signature)) out.printf(" <file_signature>\n%s\n</file_signature>\n", file_signature);
} }
for (i=0; i<download_urls.urls.size(); i++) { for (i=0; i<download_urls.urls.size(); i++) {
xml_escape(download_urls.urls[i].c_str(), buf, sizeof(buf)); xml_escape(download_urls.urls[i].c_str(), buf, sizeof(buf));
@ -1395,12 +1395,14 @@ int APP_VERSION::write(MIOFILE& out, bool write_file_info) {
} }
} }
if (gpu_usage.rsc_type) { if (gpu_usage.rsc_type) {
const char* p = rsc_name(gpu_usage.rsc_type);
if (!strcmp(p, "NVIDIA")) p = "CUDA";
out.printf( out.printf(
" <coproc>\n" " <coproc>\n"
" <type>%s</type>\n" " <type>%s</type>\n"
" <count>%f</count>\n" " <count>%f</count>\n"
" </coproc>\n", " </coproc>\n",
rsc_name(gpu_usage.rsc_type), p,
gpu_usage.usage gpu_usage.usage
); );
} }