SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-04 04:17:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix concurrent write on UoT conn

Browse source
This commit is contained in:
世界 2022-09-13 08:49:15 +08:00
parent 3039fce1d5
commit 27ddefbb89
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
common/uot/client.go
View file

@ -4,6 +4,7 @@ import (
"encoding/binary"
"io"
"net"
"sync"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
@ -12,13 +13,20 @@ import (
type ClientConn struct {
net.Conn
readAccess sync.Mutex
writeAccess sync.Mutex
}
func NewClientConn(conn net.Conn) *ClientConn {
return &ClientConn{conn}
return &ClientConn{
Conn: conn,
}
}
func (c *ClientConn) ReadPacket(buffer *buf.Buffer) (M.Socksaddr, error) {
c.readAccess.Lock()
defer c.readAccess.Unlock()
destination, err := AddrParser.ReadAddrPort(c)
if err != nil {
return M.Socksaddr{}, err
@ -35,6 +43,9 @@ func (c *ClientConn) ReadPacket(buffer *buf.Buffer) (M.Socksaddr, error) {
}
func (c *ClientConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
c.writeAccess.Lock()
defer c.writeAccess.Unlock()
defer buffer.Release()
err := AddrParser.WriteAddrPort(c, destination)
if err != nil {
@ -48,6 +59,9 @@ func (c *ClientConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) er
}
func (c *ClientConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
c.readAccess.Lock()
defer c.readAccess.Unlock()
addrPort, err := AddrParser.ReadAddrPort(c)
if err != nil {
return 0, nil, err
@ -69,6 +83,9 @@ func (c *ClientConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
}
func (c *ClientConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
c.writeAccess.Lock()
defer c.writeAccess.Unlock()
err = AddrParser.WriteAddrPort(c, M.SocksaddrFromNet(addr))
if err != nil {
return