From 46507b64fee92ee3995d607e1050a1a09fac5e0a Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 30 Sep 2005 22:16:07 +0000
Subject: [PATCH] exit file xfer backoff on retry request

svn path=/trunk/boinc/; revision=8375
---
 checkin_notes               | 8 ++++++++
 client/gui_rpc_server_ops.C | 8 ++++++--
 doc/contact.php             | 1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 6db19ad194..8e46790b5a 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12492,3 +12492,11 @@ David  30 Sept 2005
     client/
         client_types.C,h
         pers_file_xfer.C,h
+
+David  30 Sept 2005
+    - A refinement of the above: if the user manually retries
+        a file transfer, exit project-level backoff mode
+        (suggested by John F. Hall)
+
+    client/
+        gui_rpc_server_ops.C
diff --git a/client/gui_rpc_server_ops.C b/client/gui_rpc_server_ops.C
index 9a3daa5a1e..14ef151aed 100644
--- a/client/gui_rpc_server_ops.C
+++ b/client/gui_rpc_server_ops.C
@@ -358,13 +358,17 @@ static void handle_file_transfer_op(char* buf, MIOFILE& fout, const char* op) {
         return;
     }
     
-    if (!f->pers_file_xfer) {
+    PERS_FILE_XFER* pfx = f->pers_file_xfer;
+    if (!pfx) {
         fout.printf("<error>No such transfer waiting</error>\n");
         return;
     }
 
     if (!strcmp(op, "retry")) {
-        f->pers_file_xfer->next_request_time = 0;
+        pfx->next_request_time = 0;
+            // leave file-level backoff mode
+        f->project->file_xfer_succeeded(pfx->is_upload);
+            // and leave project-level backoff mode
     } else if (!strcmp(op, "abort")) {
         f->pers_file_xfer->abort();
     } else {
diff --git a/doc/contact.php b/doc/contact.php
index 0a3d0a4559..16e7c7faef 100644
--- a/doc/contact.php
+++ b/doc/contact.php
@@ -123,6 +123,7 @@ show_name("Michael Gary");
 show_name("Marco Gazzoni");
 show_name("Gary Gibson");
 show_name("Walt Gribben");
+show_name("John F. Hall");
 show_name("Jim Harris");
 show_name("Volker Hatzenberger");
 show_name("Ian Hay");