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

Fix: fakeip udp should not replace with another ip

Browse Source
This commit is contained in:
Dreamacro
2022-07-05 21:09:29 +08:00
committed by MetaCubeX
parent 133bb2319f
commit d71a2ce61e
3 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tunnel/connection.go
View File

@ -3,26 +3,17 @@ package tunnel
import (
"errors"
"net"
"net/netip"
"time"
N "github.com/Dreamacro/clash/common/net"
"github.com/Dreamacro/clash/common/pool"
"github.com/Dreamacro/clash/component/resolver"
C "github.com/Dreamacro/clash/constant"
)
func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) error {
defer packet.Drop()
// local resolve UDP dns
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return err
}
metadata.DstIP = ip
}
addr := metadata.UDPAddr()
if addr == nil {
return errors.New("udp addr invalid")
@ -32,29 +23,36 @@ func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata
return err
}
// reset timeout
pc.SetReadDeadline(time.Now().Add(udpTimeout))
_ = pc.SetReadDeadline(time.Now().Add(udpTimeout))
return nil
}
func handleUDPToLocal(packet C.UDPPacket, pc net.PacketConn, key string, fAddr net.Addr) {
func handleUDPToLocal(packet C.UDPPacket, pc net.PacketConn, key string, oAddr, fAddr netip.Addr) {
buf := pool.Get(pool.UDPBufferSize)
defer pool.Put(buf)
defer natTable.Delete(key)
defer pc.Close()
defer func() {
_ = pc.Close()
natTable.Delete(key)
_ = pool.Put(buf)
}()
for {
pc.SetReadDeadline(time.Now().Add(udpTimeout))
_ = pc.SetReadDeadline(time.Now().Add(udpTimeout))
n, from, err := pc.ReadFrom(buf)
if err != nil {
return
}
if fAddr != nil {
from = fAddr
fromUDPAddr := from.(*net.UDPAddr)
if fAddr.IsValid() {
fromAddr, _ := netip.AddrFromSlice(fromUDPAddr.IP)
fromAddr.Unmap()
if oAddr == fromAddr {
fromUDPAddr.IP = fAddr.AsSlice()
}
}
_, err = packet.WriteBack(buf[:n], from)
_, err = packet.WriteBack(buf[:n], fromUDPAddr)
if err != nil {
return
}