xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: ss udp return error when addr parse failed

Browse source
This commit is contained in:
gVisor bot 2020-03-01 01:46:02 +08:00
parent 1ff02eb411
commit 5a26be4d86
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adapters/outbound/shadowsocks.go
View file

@ -4,6 +4,7 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"net" "net"
"strconv" "strconv"
@ -209,7 +210,12 @@ func (spc *ssPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
if e != nil { if e != nil {
return 0, nil, e return 0, nil, e
} }
addr := socks5.SplitAddr(b[:n]) addr := socks5.SplitAddr(b[:n])
if addr == nil {
return 0, nil, errors.New("parse addr error")
}
copy(b, b[len(addr):]) copy(b, b[len(addr):])
return n - len(addr), addr.UDPAddr(), e return n - len(addr), addr.UDPAddr(), e
} }

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) { 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 { if e != nil {
return 0, nil, e return 0, nil, e
} }
@ -170,9 +170,8 @@ func (uc *socksPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
return 0, nil, err return 0, nil, err
} }
// due to DecodeUDPPacket is mutable, record addr length // due to DecodeUDPPacket is mutable, record addr length
addrLength := len(addr)
copy(b, payload) copy(b, payload)
return n - addrLength - 3, a, nil return n - len(addr) - 3, addr.UDPAddr(), nil
} }
func (uc *socksPacketConn) Close() error { func (uc *socksPacketConn) Close() error {