Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cancellation #44

Merged
merged 11 commits into from
Jan 10, 2022
Merged

Cancellation #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4c607e1
reintroduce send side streaming
vu3rdd Nov 29, 2021
385e174
set the length of the buffer to be the same as that in JS side
vu3rdd Dec 1, 2021
8fae68b
bug fix for reading the last read from a file
vu3rdd Dec 3, 2021
257bd93
go fmt
vu3rdd Dec 3, 2021
8162de0
change bufSize back to its original value
vu3rdd Dec 6, 2021
078e85f
avoid a re-calculation
vu3rdd Dec 7, 2021
7930f24
do not create a new background context
vu3rdd Dec 8, 2021
a216d6f
send: do not create a new context, reuse existing context
vu3rdd Dec 8, 2021
ab224b9
do not close connection here, as it is done elsewhere now
vu3rdd Dec 8, 2021
b17056d
go fmt
vu3rdd Dec 8, 2021
80810ab
Merge branch 'master' into cancellation3
vu3rdd Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion wormhole/recv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ func (c *Client) Receive(ctx context.Context, code string, disableListener bool,
answer := &genericMessage{
Error: &errStr,
}
ctx := context.Background()

err = clientProto.WriteAppData(ctx, answer)
if err != nil {
Expand Down
8 changes: 3 additions & 5 deletions wormhole/send.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,11 @@ func (c *Client) sendFileDirectory(ctx context.Context, offer *offerMsg, r io.Re
totalSize = offer.Directory.ZipSize
}

var cancel func()
ctx, cancel = context.WithCancel(ctx)
defer cancel()

go func() {
<-ctx.Done()
ch <- SendResult{
Error: errors.New("context canceled"),
}
conn.Close()
}()

Expand Down Expand Up @@ -444,7 +443,6 @@ func (c *Client) sendFileDirectory(ctx context.Context, offer *offerMsg, r io.Re
ch <- SendResult{
OK: true,
}
close(ch)
}()

return pwStr, ch, nil
Expand Down