github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix tproxy udp "unable to get destination" in IPv6 environment

pull/2531/head
lucifer9 2020-02-25 11:58:49 +08:00 committed by kslr
parent 30b5f521c4
commit d055c0497d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
transport/internet/sockopt_linux.go
View File

@ -3,6 +3,7 @@ package internet
import ( import (
"net" "net"
"syscall" "syscall"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
@ -99,10 +100,12 @@ func applyInboundSocketOptions(network string, fd uintptr, config *SocketConfig)
} }
if config.ReceiveOriginalDestAddress && isUDPSocket(network) { if config.ReceiveOriginalDestAddress && isUDPSocket(network) {
if err := syscall.SetsockoptInt(int(fd), syscall.SOL_IPV6, unix.IPV6_RECVORIGDSTADDR, 1); err != nil {
if err := syscall.SetsockoptInt(int(fd), syscall.SOL_IP, syscall.IP_RECVORIGDSTADDR, 1); err != nil { if err := syscall.SetsockoptInt(int(fd), syscall.SOL_IP, syscall.IP_RECVORIGDSTADDR, 1); err != nil {
return err return err
} }
} }
}
if err := syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, unix.SO_REUSEPORT, 1); err != nil { if err := syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, unix.SO_REUSEPORT, 1); err != nil {
return newError("failed to set SO_REUSEPORT").Base(err).AtWarning() return newError("failed to set SO_REUSEPORT").Base(err).AtWarning()

3
transport/internet/udp/hub_linux.go
View File

@ -5,6 +5,7 @@ package udp
import ( import (
"syscall" "syscall"
"golang.org/x/sys/unix"
"v2ray.com/core/common/net" "v2ray.com/core/common/net"
) )
@ -18,7 +19,7 @@ func RetrieveOriginalDest(oob []byte) net.Destination {
ip := net.IPAddress(msg.Data[4:8]) ip := net.IPAddress(msg.Data[4:8])
port := net.PortFromBytes(msg.Data[2:4]) port := net.PortFromBytes(msg.Data[2:4])
return net.UDPDestination(ip, port) return net.UDPDestination(ip, port)
} else if msg.Header.Level == syscall.SOL_IPV6 && msg.Header.Type == syscall.IP_RECVORIGDSTADDR { } else if msg.Header.Level == syscall.SOL_IPV6 && msg.Header.Type == unix.IPV6_RECVORIGDSTADDR {
ip := net.IPAddress(msg.Data[8:24]) ip := net.IPAddress(msg.Data[8:24])
port := net.PortFromBytes(msg.Data[2:4]) port := net.PortFromBytes(msg.Data[2:4])
return net.UDPDestination(ip, port) return net.UDPDestination(ip, port)