go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix race condition

Browse Source
This commit is contained in:
ginuerzh
2023-10-18 19:19:43 +08:00
parent 3f3deb98b8
commit 54b56df214
3 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
handler/forward/remote/handler.go
View File

@ -2,7 +2,6 @@ package remote
import (
"bufio"
"bytes"
"context"
"crypto/tls"
"errors"
@ -197,7 +196,7 @@ func (h *forwardHandler) handleHTTP(ctx context.Context, rw io.ReadWriter, remot
err = func() error {
req, err := http.ReadRequest(br)
if err != nil {
log.Errorf("read http request: %v", err)
// log.Errorf("read http request: %v", err)
return err
}
@ -272,10 +271,14 @@ func (h *forwardHandler) handleHTTP(ctx context.Context, rw io.ReadWriter, remot
cc = proxyproto.WrapClientConn(h.md.proxyProtocol, remoteAddr, localAddr, cc)
if err := req.Write(cc); err != nil {
cc.Close()
log.Warnf("send request to node %s(%s): %v", target.Name, target.Addr, err)
return resp.Write(rw)
}
if req.Header.Get("Upgrade") == "websocket" {
var buf bytes.Buffer
req.Write(&buf)
err := xnet.Transport(cc, xio.NewReadWriter(io.MultiReader(&buf, br), rw))
err := xnet.Transport(cc, xio.NewReadWriter(br, rw))
if err == nil {
err = io.EOF
}
@ -285,12 +288,6 @@ func (h *forwardHandler) handleHTTP(ctx context.Context, rw io.ReadWriter, remot
go func() {
defer cc.Close()
if err := req.Write(cc); err != nil {
log.Warnf("send request to node %s(%s): %v", target.Name, target.Addr, err)
resp.Write(rw)
return
}
res, err := http.ReadResponse(bufio.NewReader(cc), req)
if err != nil {
log.Warnf("read response from node %s(%s): %v", target.Name, target.Addr, err)