mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-04 20:19:19 +02:00
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:
parent
b3f3c5be81
commit
f1eb5e3d08
|
@ -1,10 +1,10 @@
|
|||
// +build linux
|
||||
// +build !confonly
|
||||
|
||||
package tcp
|
||||
|
||||
import (
|
||||
"syscall"
|
||||
"unsafe"
|
||||
|
||||
"github.com/xtls/xray-core/common/net"
|
||||
"github.com/xtls/xray-core/transport/internet"
|
||||
|
@ -23,14 +23,21 @@ func GetOriginalDestination(conn internet.Connection) (net.Destination, error) {
|
|||
}
|
||||
var dest net.Destination
|
||||
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 {
|
||||
newError("failed to call getsockopt").Base(err).WriteToLog()
|
||||
return
|
||||
}
|
||||
ip := net.IPAddress(addr.Multiaddr[4:8])
|
||||
port := uint16(addr.Multiaddr[2])<<8 + uint16(addr.Multiaddr[3])
|
||||
dest = net.TCPDestination(ip, net.Port(port))
|
||||
ip := (*[4]byte)(unsafe.Pointer(&addr.Addr.Flowinfo))[:4]
|
||||
if level == syscall.IPPROTO_IPV6 {
|
||||
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 {
|
||||
return net.Destination{}, newError("failed to control connection").Base(err)
|
||||
|
|
Loading…
Reference in New Issue