Skip to content

Handle correctly servers not initiating close #6

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

Open
adrianlzt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle correctly servers not initiating close #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 deletions shovel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,34 @@ package main

import (
"io"
"log"
"strings"
)

// proxy between two sockets
func Shovel(local, remote io.ReadWriteCloser) error {
errch := make(chan error, 1)

defer func() {
go local.Close()
}()

defer func() {
go remote.Close()
}()

go chanCopy(errch, local, remote)
go chanCopy(errch, remote, local)

for i := 0; i < 2; i++ {
if err := <-errch; err != nil {
// If this returns early the second func will push into the
// buffer, and the GC will clean up
return err
}
}
<-errch
return nil
}

// copy between pipes, sending errors to channel
func chanCopy(e chan error, dst, src io.ReadWriter) {
_, err := io.Copy(dst, src)
if err != nil && !strings.HasSuffix(err.Error(), ": use of closed network connection") {
log.Printf("[ERROR] chanCopy: %v\n", err)
}
e <- err
}