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-19 23:47:47 +08:00
parent f2fd6554ad
commit cc4310106b
29 changed files with 157 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
connector/tunnel/conn.go
View File

@ -75,8 +75,8 @@ func (c *udpConn) Read(b []byte) (n int, err error) {
buf := bufpool.Get(dlen)
defer bufpool.Put(buf)
_, err = io.ReadFull(c.Conn, *buf)
n = copy(b, *buf)
_, err = io.ReadFull(c.Conn, buf)
n = copy(b, buf)
return
}
@ -169,8 +169,8 @@ func (c *bindUDPConn) Read(b []byte) (n int, err error) {
buf := bufpool.Get(dlen)
defer bufpool.Put(buf)
_, err = io.ReadFull(c.Conn, *buf)
n = copy(b, *buf)
_, err = io.ReadFull(c.Conn, buf)
n = copy(b, buf)
return
}

7
connector/tunnel/metadata.go
View File

@ -11,10 +11,6 @@ import (
"github.com/google/uuid"
)
const (
defaultMuxVersion = 2
)
var (
ErrInvalidTunnelID = errors.New("tunnel: invalid tunnel ID")
)
@ -51,9 +47,6 @@ func (c *tunnelConnector) parseMetadata(md mdata.Metadata) (err error) {
MaxReceiveBuffer: mdutil.GetInt(md, "mux.maxReceiveBuffer"),
MaxStreamBuffer: mdutil.GetInt(md, "mux.maxStreamBuffer"),
}
if c.md.muxCfg.Version == 0 {
c.md.muxCfg.Version = defaultMuxVersion
}
return
}