lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 01:57:12 -05:00
Code Issues Releases Wiki Activity

fix(tproxy): the problem that cannot find ipv6 destination in redirect mode of tproxy (#815)

Browse Source 
* fix(tproxy): the problem that cannot find ipv6 destination in redirect mode of tproxy

* chore(lint): reformat the code

* chore(lint): Codacy Static Code Analysis
This commit is contained in:
mzz 2021-03-25 16:42:58 +08:00 committed by GitHub
parent ad09269791
commit 5f851c05b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,18 @@ 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) {
var remoteIP net.IP
switch addr := conn.RemoteAddr().(type) {
case *net.TCPAddr:
remoteIP = addr.IP
case *net.UDPAddr:
remoteIP = addr.IP
default:
newError("failed to call getsockopt").WriteToLog()
return
}
if remoteIP.To4() != nil {
// ipv4
addr, err := syscall.GetsockoptIPv6Mreq(int(fd), syscall.IPPROTO_IP, SO_ORIGINAL_DST) addr, err := syscall.GetsockoptIPv6Mreq(int(fd), syscall.IPPROTO_IP, 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()
@ -31,6 +43,17 @@ func GetOriginalDestination(conn internet.Connection) (net.Destination, error) {
ip := net.IPAddress(addr.Multiaddr[4:8]) ip := net.IPAddress(addr.Multiaddr[4:8])
port := uint16(addr.Multiaddr[2])<<8 + uint16(addr.Multiaddr[3]) port := uint16(addr.Multiaddr[2])<<8 + uint16(addr.Multiaddr[3])
dest = net.TCPDestination(ip, net.Port(port)) dest = net.TCPDestination(ip, net.Port(port))
} else {
// ipv6
addr, err := syscall.GetsockoptIPv6MTUInfo(int(fd), syscall.IPPROTO_IPV6, SO_ORIGINAL_DST)
if err != nil {
newError("failed to call getsockopt").Base(err).WriteToLog()
return
}
ip := net.IPAddress(addr.Addr.Addr[:])
port := net.PortFromBytes([]byte{byte(addr.Addr.Port), byte(addr.Addr.Port >> 8)})
dest = net.TCPDestination(ip, 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)