From 2da776cf200fc1d77a7c32a978f861ba65746b94 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 29 Mar 2007 18:41:41 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=12283
---
 checkin_notes      | 10 ++++++++++
 client/file_xfer.C |  5 ++++-
 doc/upload.php     |  4 ++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index 182797c12b..0faa0e4b39 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -2940,3 +2940,13 @@ David  29 Mar 2007
 
     api/
         boinc_api.C
+
+David  29 Mar 2007
+    - core client: include MD5 in file upload handler requests,
+        so that the server can (if it wants) verify the MD5.
+        NOTE: I don't think this should be necessary.
+
+        Also include core client release # in all requests
+
+    client/
+        file_xfer.C
diff --git a/client/file_xfer.C b/client/file_xfer.C
index 69b9805335..fe149c8f9e 100644
--- a/client/file_xfer.C
+++ b/client/file_xfer.C
@@ -107,6 +107,7 @@ int FILE_XFER::init_upload(FILE_INFO& file_info) {
             "<data_server_request>\n"
             "    <core_client_major_version>%d</core_client_major_version>\n"
             "    <core_client_minor_version>%d</core_client_minor_version>\n"
+            "    <core_client_release>%d</core_client_release>\n"
             "<file_upload>\n"
             "<file_info>\n"
             "%s"
@@ -115,12 +116,14 @@ int FILE_XFER::init_upload(FILE_INFO& file_info) {
             "</xml_signature>\n"
             "</file_info>\n"
             "<nbytes>%.0f</nbytes>\n"
+            "<md5_cksum>%s</md5_cksum>\n"
             "<offset>%.0f</offset>\n"
             "<data>\n",
-            BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION,
+            BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION, BOINC_RELEASE,
             file_info.signed_xml,
             file_info.xml_signature,
             file_info.nbytes,
+            file_info.md5_cksum,
             file_info.upload_offset
         );
         file_size_query = false;
diff --git a/doc/upload.php b/doc/upload.php
index dcdf2cce73..afa78a8ce3 100644
--- a/doc/upload.php
+++ b/doc/upload.php
@@ -29,6 +29,7 @@ The request message has the form:
 <data_server_request>
     <core_client_major_version>1</core_client_major_version>
     <core_client_minor_version>1</core_client_minor_version>
+    <core_client_release>1</core_client_release>
     <get_file_size>filename</get_file_size>
 </data_server_request>
 "), "</pre>
@@ -61,6 +62,7 @@ Request message format:
 <data_server_request>
 <core_client_major_version>1</core_client_major_version>
 <core_client_minor_version>1</core_client_minor_version>
+    <core_client_release>1</core_client_release>
 <file_upload>
 <file_info>
    ...
@@ -69,6 +71,7 @@ Request message format:
 </xml_signature>
 </file_info>
 <nbytes>x</nbytes>
+<md5_cksum>x</md5_cksum>
 <offset>x</offset>
 <data>
 ... (nbytes bytes of data; may include non-ASCII data)
@@ -80,6 +83,7 @@ scheduling server to the client.
 It includes a signature based on the project's file upload
 authentication key pair.
 &lt;nbytes> is the size of the file.
+&lt;md5_cksum> is MD5 of the entire file.
 &lt;offset> is the offset within the file.
 <p>
 Reply message format: