From fa9c5cb8c07f98511e98572c379c63a2f9afc425 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 24 Jul 2020 14:24:38 +0200
Subject: [FUSE] Fix returning pending request on RTT measurement

---
 src/fuse/connection.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'src/fuse/connection.c')

diff --git a/src/fuse/connection.c b/src/fuse/connection.c
index 2fa7c57..7bd8018 100644
--- a/src/fuse/connection.c
+++ b/src/fuse/connection.c
@@ -385,13 +385,10 @@ static void* connection_receiveThreadMain( void *sockPtr )
 				}
 			} else {
 				// Found a match
-				request->buffer = malloc( request->length ); // char*
 				const ssize_t ret = sock_recv( sockFd, request->buffer, request->length );
 				if ( ret != (ssize_t)request->length ) {
 					logadd( LOG_DEBUG1, "receiving payload for a block reply failed" );
 					connection_read( request );
-					free( request->buffer );
-					request->buffer = NULL;
 					goto fail;
 				}
 				// Check RTT
@@ -409,15 +406,8 @@ static void* connection_receiveThreadMain( void *sockPtr )
 					}
 					unlock_rw( &altLock );
 				}
-				int fuse_reply = fuse_reply_buf( request->fuse_req, request->buffer, request->length );
-				if ( fuse_reply != 0 ) {
-					printf( "ERROR ON FUSE REPLY %i \n", fuse_reply );
-					fuse_reply_err( request->fuse_req, fuse_reply );
-				}
-				free( request->buffer );
-				request->buffer = NULL;
+				fuse_reply_buf( request->fuse_req, request->buffer, request->length );
 				free( request );
-				request = NULL;
 			}
 		} else if ( reply.cmd == CMD_GET_SERVERS ) {
 			// List of known alt servers
@@ -715,7 +705,9 @@ static void probeAltServers()
 				connection_read( request );
 				goto fail;
 			}
-			// Success, wake up caller
+			// Success, reply to fuse
+			fuse_reply_buf( request->fuse_req, request->buffer, request->length );
+			free( request );
 			logadd( LOG_DEBUG1, "%s probe: Successful direct probe", hstr );
 		} else {
 			// Wasn't a request that's in our request queue
-- 
cgit v1.2.3-55-g7522