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

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