history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: ss udp return error when addr parse failed

Browse Source
This commit is contained in:
Dreamacro
2020-03-01 01:46:02 +08:00
parent e81b88fb94
commit 814bd05315
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
adapters/outbound/socks5.go
View File

@ -161,7 +161,7 @@ func (uc *socksPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n
}
func (uc *socksPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
n, a, e := uc.PacketConn.ReadFrom(b)
n, _, e := uc.PacketConn.ReadFrom(b)
if e != nil {
return 0, nil, e
}
@ -170,9 +170,8 @@ func (uc *socksPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
return 0, nil, err
}
// due to DecodeUDPPacket is mutable, record addr length
addrLength := len(addr)
copy(b, payload)
return n - addrLength - 3, a, nil
return n - len(addr) - 3, addr.UDPAddr(), nil
}
func (uc *socksPacketConn) Close() error {