kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Close pipe properly

This commit is contained in:
Qian Wang 2019-07-25 22:06:33 +01:00
parent eb68185f3c
commit 592175f73d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/ck-server/ck-server.go
View File

@ -9,6 +9,7 @@ import (
"log" "log"
"net" "net"
"net/http" "net/http"
_ "net/http/pprof"
"os" "os"
"runtime" "runtime"
"strings" "strings"

7
internal/multiplex/stream.go
View File

@ -73,11 +73,16 @@ func (stream *Stream) feed() {
} }
_, err := stream.feederW.Write(data) _, err := stream.feederW.Write(data)
if err != nil { if err != nil {
if err == io.ErrClosedPipe {
stream.Close()
return
} else {
log.Println(err) log.Println(err)
} }
} }
} }
} }
}
func (stream *Stream) Read(buf []byte) (n int, err error) { func (stream *Stream) Read(buf []byte) (n int, err error) {
if len(buf) == 0 { if len(buf) == 0 {
@ -164,6 +169,8 @@ func (stream *Stream) Close() error {
stream.session.sb.send(tlsRecord) stream.session.sb.send(tlsRecord)
stream.session.delStream(stream.id) stream.session.delStream(stream.id)
stream.feederW.Close()
stream.feederR.Close()
//log.Printf("%v actively closed\n", stream.id) //log.Printf("%v actively closed\n", stream.id)
stream.writingM.Unlock() stream.writingM.Unlock()
return nil return nil