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

fix: Disable XUDP global ID if source address invalid

Browse source
This commit is contained in:
gVisor bot 2023-06-08 15:57:51 +08:00
parent 65cff13bd8
commit b183183fbc
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adapter/outbound/vless.go
View file

@ -374,9 +374,13 @@ func (v *Vless) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metada
} }
if v.option.XUDP { if v.option.XUDP {
var globalID [8]byte
if metadata.SourceValid() {
globalID = utils.GlobalID(metadata.SourceAddress())
}
return newPacketConn(N.NewThreadSafePacketConn( return newPacketConn(N.NewThreadSafePacketConn(
vmessSing.NewXUDPConn(c, vmessSing.NewXUDPConn(c,
utils.GlobalID(metadata.SourceAddress()), globalID,
M.SocksaddrFromNet(metadata.UDPAddr())), M.SocksaddrFromNet(metadata.UDPAddr())),
), v), nil ), v), nil
} else if v.option.PacketAddr { } else if v.option.PacketAddr {

8
adapter/outbound/vmess.go
View file

@ -224,13 +224,17 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
func (v *Vmess) streamConn(c net.Conn, metadata *C.Metadata) (conn net.Conn, err error) { func (v *Vmess) streamConn(c net.Conn, metadata *C.Metadata) (conn net.Conn, err error) {
if metadata.NetWork == C.UDP { if metadata.NetWork == C.UDP {
if v.option.XUDP { if v.option.XUDP {
var globalID [8]byte
if metadata.SourceValid() {
globalID = utils.GlobalID(metadata.SourceAddress())
}
if N.NeedHandshake(c) { if N.NeedHandshake(c) {
conn = v.client.DialEarlyXUDPPacketConn(c, conn = v.client.DialEarlyXUDPPacketConn(c,
utils.GlobalID(metadata.SourceAddress()), globalID,
M.SocksaddrFromNet(metadata.UDPAddr())) M.SocksaddrFromNet(metadata.UDPAddr()))
} else { } else {
conn, err = v.client.DialXUDPPacketConn(c, conn, err = v.client.DialXUDPPacketConn(c,
utils.GlobalID(metadata.SourceAddress()), globalID,
M.SocksaddrFromNet(metadata.UDPAddr())) M.SocksaddrFromNet(metadata.UDPAddr()))
} }
} else if v.option.PacketAddr { } else if v.option.PacketAddr {

4
constant/metadata.go
View file

@ -171,6 +171,10 @@ func (m *Metadata) SourceDetail() string {
} }
} }
func (m *Metadata) SourceValid() bool {
return m.SrcPort != "" && m.SrcIP.IsValid()
}
func (m *Metadata) AddrType() int { func (m *Metadata) AddrType() int {
switch true { switch true {
case m.Host != "" || !m.DstIP.IsValid(): case m.Host != "" || !m.DstIP.IsValid():