From 75f7cdcf65ff892db472ddbcc477666ca4f3f612 Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Tue, 25 Sep 2018 09:39:18 -0700 Subject: [PATCH] introduce magic bytes to stop --- src/recipient/recipient.go | 10 +++++++--- src/sender/sender.go | 6 ++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/recipient/recipient.go b/src/recipient/recipient.go index 652225a..3860fd0 100644 --- a/src/recipient/recipient.go +++ b/src/recipient/recipient.go @@ -216,6 +216,10 @@ func receive(forceSend int, serverAddress, serverTCP string, isLocal bool, c *we log.Error(err) return err } + if bytes.Equal(message, []byte("magic")) { + log.Debug("got magic") + break + } // do decryption var enc crypt.Encryption @@ -244,9 +248,9 @@ func receive(forceSend int, serverAddress, serverTCP string, isLocal bool, c *we // update the progress bar bar.Add(n) - if int64(bytesWritten) == fstats.Size { - break - } + // if int64(bytesWritten) == fstats.Size { + // break + // } } c.WriteMessage(websocket.BinaryMessage, []byte("done")) diff --git a/src/sender/sender.go b/src/sender/sender.go index a660c1b..00b28cf 100644 --- a/src/sender/sender.go +++ b/src/sender/sender.go @@ -224,6 +224,12 @@ func send(forceSend int, serverAddress, serverTCP string, isLocal bool, c *webso } } // finish + dataChan <- DataChan{ + b: []byte("magic"), + bytesRead: len([]byte("magic")), + err: nil, + } + // finish dataChan <- DataChan{ b: nil, bytesRead: 0,