Fix the varlink upgraded calls

Although an upgraded call is requested, the server has to send at least
one reply (can be an error) and the client has to check the reply,
before assuming an upgraded connection.

Signed-off-by: Harald Hoyer <harald@redhat.com>

2 files changed, 13 insertions, 3 deletions

diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go
index 2234899a5..8051f07be 100644
--- a/pkg/varlinkapi/attach.go
+++ b/pkg/varlinkapi/attach.go
@@ -60,7 +60,10 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st
 	if !start && state != libpod.ContainerStateRunning {
 		return call.ReplyErrorOccurred("container must be running to attach")
 	}
-	call.Reply(nil)
+
+	// ACK the client upgrade request
+	call.ReplyAttach()
+
 	reader, writer, _, pw, streams := setupStreams(call)
 
 	go func() {
diff --git a/pkg/varlinkapi/transfers.go b/pkg/varlinkapi/transfers.go
index 96f76bcdc..24a91a86f 100644
--- a/pkg/varlinkapi/transfers.go
+++ b/pkg/varlinkapi/transfers.go
@@ -29,6 +29,12 @@ func (i *LibpodAPI) SendFile(call iopodman.VarlinkCall, ftype string, length int
 		return call.ReplyErrorOccurred(err.Error())
 	}
 
+	// FIXME return parameter
+	if err = call.ReplySendFile("FIXME_file_handle"); err != nil {
+		// If an error occurs while sending the reply, return the error
+		return err
+	}
+
 	writer := bufio.NewWriter(outputFile)
 	defer writer.Flush()
 
@@ -60,9 +66,10 @@ func (i *LibpodAPI) ReceiveFile(call iopodman.VarlinkCall, filepath string, dele
 	}
 
 	// Send the file length down to client
-	// Varlink connection upraded
+	// Varlink connection upgraded
 	if err = call.ReplyReceiveFile(fileInfo.Size()); err != nil {
-		return call.ReplyErrorOccurred(err.Error())
+		// If an error occurs while sending the reply, return the error
+		return err
 	}
 
 	reader := bufio.NewReader(fs)