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

Fix UDP async write

Browse source
This commit is contained in:
世界 2023-08-03 14:57:58 +08:00
parent b5da22fad2
commit 5c6fb54965
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 77 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

45
server_conn.go
View file

@ -4,6 +4,7 @@ import (
"encoding/binary"
"io"
"net"
"sync"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
@ -79,6 +80,7 @@ var (
type serverPacketConn struct {
N.ExtendedConn
access sync.Mutex
destination M.Socksaddr
responseWritten bool
}
@ -112,6 +114,12 @@ func (c *serverPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksad
pLen := buffer.Len()
common.Must(binary.Write(buf.With(buffer.ExtendHeader(2)), binary.BigEndian, uint16(pLen)))
if !c.responseWritten {
c.access.Lock()
if c.responseWritten {
c.access.Unlock()
} else {
defer c.access.Unlock()
}
buffer.ExtendHeader(1)[0] = statusSuccess
c.responseWritten = true
}
@ -133,9 +141,16 @@ func (c *serverPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error)
func (c *serverPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
if !c.responseWritten {
_, err = c.ExtendedConn.Write([]byte{statusSuccess})
if err != nil {
return
c.access.Lock()
if c.responseWritten {
c.access.Unlock()
} else {
defer c.access.Unlock()
_, err = c.ExtendedConn.Write([]byte{statusSuccess})
if err != nil {
return
}
c.responseWritten = true
}
}
err = binary.Write(c.ExtendedConn, binary.BigEndian, uint16(len(p)))
@ -167,6 +182,7 @@ var (
type serverPacketAddrConn struct {
N.ExtendedConn
access sync.Mutex
responseWritten bool
}
@ -205,9 +221,16 @@ func (c *serverPacketAddrConn) ReadFrom(p []byte) (n int, addr net.Addr, err err
func (c *serverPacketAddrConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
if !c.responseWritten {
_, err = c.ExtendedConn.Write([]byte{statusSuccess})
if err != nil {
return
c.access.Lock()
if c.responseWritten {
c.access.Unlock()
} else {
defer c.access.Unlock()
_, err = c.ExtendedConn.Write([]byte{statusSuccess})
if err != nil {
return
}
c.responseWritten = true
}
}
err = M.SocksaddrSerializer.WriteAddrPort(c.ExtendedConn, M.SocksaddrFromNet(addr))
@ -243,8 +266,14 @@ func (c *serverPacketAddrConn) WritePacket(buffer *buf.Buffer, destination M.Soc
common.Must(binary.Write(buf.With(buffer.ExtendHeader(2)), binary.BigEndian, uint16(pLen)))
common.Must(M.SocksaddrSerializer.WriteAddrPort(buf.With(buffer.ExtendHeader(M.SocksaddrSerializer.AddrPortLen(destination))), destination))
if !c.responseWritten {
buffer.ExtendHeader(1)[0] = statusSuccess
c.responseWritten = true
c.access.Lock()
if c.responseWritten {
c.access.Unlock()
} else {
defer c.access.Unlock()
buffer.ExtendHeader(1)[0] = statusSuccess
c.responseWritten = true
}
}
return c.ExtendedConn.WriteBuffer(buffer)
}