From 6605712331b79f0258b25a779f227a0fbed9ed29 Mon Sep 17 00:00:00 2001
From: Mike Hibler <hibler@cs.utah.edu>
Date: Fri, 14 Aug 2015 16:23:33 -0600
Subject: [PATCH] Fix uploader timeout code. Was not being properly detected.

---
 clientside/os/frisbee.redux/frisuploader.c | 14 +++++++-------
 clientside/os/frisbee.redux/upload.c       |  5 +----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/clientside/os/frisbee.redux/frisuploader.c b/clientside/os/frisbee.redux/frisuploader.c
index 49b4da515..ad664460e 100644
--- a/clientside/os/frisbee.redux/frisuploader.c
+++ b/clientside/os/frisbee.redux/frisuploader.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2014 University of Utah and the Flux Group.
+ * Copyright (c) 2010-2015 University of Utah and the Flux Group.
  * 
  * {{{EMULAB-LICENSE
  * 
@@ -277,10 +277,7 @@ recv_file()
 			cc = remaining;
 		ncc = conn_read(conn, wbuf, cc);
 		if (ncc < 0) {
-			if (conn_timeout(conn))
-				rv = 2;
-			else
-				FrisPwarning("socket read");
+			FrisPwarning("socket read");
 			goto done;
 		}
 		if (ncc == 0)
@@ -297,8 +294,11 @@ recv_file()
 			goto done;
 		}
 	}
-	/* Note that coming up short (remaining > 0) is not an error */
-	rv = 0;
+	/*
+	 * Note that coming up short (remaining > 0) is not an error
+	 * unless we timed out.
+	 */
+	rv = conn_timeout(conn) ? 2 : 0;
 
  done:
 	gettimeofday(&et, NULL);
diff --git a/clientside/os/frisbee.redux/upload.c b/clientside/os/frisbee.redux/upload.c
index 510bf7b17..6e2810e1d 100644
--- a/clientside/os/frisbee.redux/upload.c
+++ b/clientside/os/frisbee.redux/upload.c
@@ -577,10 +577,7 @@ send_file(void)
 
 		cc = conn_write(conn, rbuf, ncc);
 		if (cc < 0) {
-			if (conn_timeout(conn))
-				rv = 2;
-			else
-				FrisPwarning("socket write");
+			FrisPwarning("socket write");
 			goto done;
 		}
 		remaining -= cc;
-- 
GitLab