mirrors
/
Xray-core
mirror of https://github.com/XTLS/Xray-core.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Refactor: Support TCP/IPv6 in REDIRECT mode 

十分感谢 @badO1a5A90 @LGA1150 协助测试

https://github.com/XTLS/Xray-core/issues/48#issuecomment-741509789

https://github.com/v2ray/v2ray-core/issues/1309#issuecomment-447432696
This commit is contained in:
RPRX 2020-12-09 12:16:38 +00:00 committed by GitHub
parent b3f3c5be81
commit f1eb5e3d08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
transport/internet/tcp/sockopt_linux.go
View File

@ -1,10 +1,10 @@
// +build linux // +build linux
// +build !confonly
package tcp package tcp
import ( import (
"syscall" "syscall"
"unsafe"
"github.com/xtls/xray-core/common/net" "github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/transport/internet" "github.com/xtls/xray-core/transport/internet"
@ -23,14 +23,21 @@ func GetOriginalDestination(conn internet.Connection) (net.Destination, error) {
} }
var dest net.Destination var dest net.Destination
err = rawConn.Control(func(fd uintptr) { err = rawConn.Control(func(fd uintptr) {
addr, err := syscall.GetsockoptIPv6Mreq(int(fd), syscall.IPPROTO_IP, SO_ORIGINAL_DST) level := syscall.IPPROTO_IP
if conn.RemoteAddr().String()[0] == '[' {
level = syscall.IPPROTO_IPV6
}
addr, err := syscall.GetsockoptIPv6MTUInfo(int(fd), level, SO_ORIGINAL_DST)
if err != nil { if err != nil {
newError("failed to call getsockopt").Base(err).WriteToLog() newError("failed to call getsockopt").Base(err).WriteToLog()
return return
} }
ip := net.IPAddress(addr.Multiaddr[4:8]) ip := (*[4]byte)(unsafe.Pointer(&addr.Addr.Flowinfo))[:4]
port := uint16(addr.Multiaddr[2])<<8 + uint16(addr.Multiaddr[3]) if level == syscall.IPPROTO_IPV6 {
dest = net.TCPDestination(ip, net.Port(port)) ip = addr.Addr.Addr[:]
}
port := (*[2]byte)(unsafe.Pointer(&addr.Addr.Port))[:2]
dest = net.TCPDestination(net.IPAddress(ip), net.PortFromBytes(port))
}) })
if err != nil { if err != nil {
return net.Destination{}, newError("failed to control connection").Base(err) return net.Destination{}, newError("failed to control connection").Base(err)