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/relay/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/relay/metadata.go
View File

@ -10,10 +10,6 @@ import (
"github.com/google/uuid"
)
const (
defaultMuxVersion = 1
)
type metadata struct {
connectTimeout time.Duration
noDelay bool
@ -47,9 +43,6 @@ func (c *relayConnector) 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
}

2
connector/socks/v5/bind.go
View File

@ -62,7 +62,7 @@ func (c *socks5Connector) muxBindTCP(ctx context.Context, conn net.Conn, network
return nil, err
}
session, err := mux.ServerSession(conn, nil)
session, err := mux.ServerSession(conn, c.md.muxCfg)
if err != nil {
return nil, err
}

12
connector/socks/v5/conn.go
View File

@ -36,7 +36,7 @@ func (c *udpRelayConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
buf := bufpool.Get(c.bufferSize)
defer bufpool.Put(buf)
nn, err := c.udpConn.Read(*buf)
nn, err := c.udpConn.Read(buf)
if err != nil {
return
}
@ -48,7 +48,7 @@ func (c *udpRelayConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
dgram := gosocks5.UDPDatagram{
Header: &header,
}
_, err = dgram.ReadFrom(bytes.NewReader((*buf)[:nn]))
_, err = dgram.ReadFrom(bytes.NewReader(buf[:nn]))
if err != nil {
return
}
@ -81,15 +81,15 @@ func (c *udpRelayConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
buf := bufpool.Get(c.bufferSize)
defer bufpool.Put(buf)
nn, err := dgram.WriteTo(bytes.NewBuffer((*buf)[:0]))
nn, err := dgram.WriteTo(bytes.NewBuffer(buf[:0]))
if err != nil {
return
}
if nn > int64(len(*buf)) {
nn = int64(len(*buf))
if nn > int64(len(buf)) {
nn = int64(len(buf))
}
_, err = c.udpConn.Write((*buf)[:nn])
_, err = c.udpConn.Write(buf[:nn])
n = len(b)
return

11
connector/socks/v5/metadata.go
View File

@ -5,6 +5,7 @@ import (
mdata "github.com/go-gost/core/metadata"
mdutil "github.com/go-gost/core/metadata/util"
"github.com/go-gost/x/internal/util/mux"
)
const (
@ -16,6 +17,7 @@ type metadata struct {
noTLS bool
relay string
udpBufferSize int
muxCfg *mux.Config
}
func (c *socks5Connector) parseMetadata(md mdata.Metadata) (err error) {
@ -34,5 +36,14 @@ func (c *socks5Connector) parseMetadata(md mdata.Metadata) (err error) {
c.md.udpBufferSize = defaultUDPBufferSize
}
c.md.muxCfg = &mux.Config{
Version: mdutil.GetInt(md, "mux.version"),
KeepAliveInterval: mdutil.GetDuration(md, "mux.keepaliveInterval"),
KeepAliveDisabled: mdutil.GetBool(md, "mux.keepaliveDisabled"),
KeepAliveTimeout: mdutil.GetDuration(md, "mux.keepaliveTimeout"),
MaxFrameSize: mdutil.GetInt(md, "mux.maxFrameSize"),
MaxReceiveBuffer: mdutil.GetInt(md, "mux.maxReceiveBuffer"),
MaxStreamBuffer: mdutil.GetInt(md, "mux.maxStreamBuffer"),
}
return
}

6
connector/ss/connector.go
View File

@ -80,7 +80,7 @@ func (c *ssConnector) Connect(ctx context.Context, conn net.Conn, network, addre
rawaddr := bufpool.Get(512)
defer bufpool.Put(rawaddr)
n, err := addr.Encode(*rawaddr)
n, err := addr.Encode(rawaddr)
if err != nil {
log.Error("encoding addr: ", err)
return nil, err
@ -99,12 +99,12 @@ func (c *ssConnector) Connect(ctx context.Context, conn net.Conn, network, addre
if c.md.noDelay {
sc = ss.ShadowConn(conn, nil)
// write the addr at once.
if _, err := sc.Write((*rawaddr)[:n]); err != nil {
if _, err := sc.Write(rawaddr[:n]); err != nil {
return nil, err
}
} else {
// cache the header
sc = ss.ShadowConn(conn, (*rawaddr)[:n])
sc = ss.ShadowConn(conn, rawaddr[:n])
}
return sc, nil

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
}