lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-07-03 12:35:24 +00:00
Code Issues Releases Wiki Activity

fix test break

Browse Source
This commit is contained in:
Darien Raymond 2017-08-25 23:17:18 +02:00
parent 2b9d9e1ae3
commit 5ef1a201f5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ package tcp
import ( import (
"syscall" "syscall"
"v2ray.com/core/app/log"
v2net "v2ray.com/core/common/net" v2net "v2ray.com/core/common/net"
"v2ray.com/core/transport/internet" "v2ray.com/core/transport/internet"
) )
@ -21,14 +22,14 @@ func GetOriginalDestination(conn internet.Connection) (v2net.Destination, error)
return v2net.Destination{}, newError("failed to get sys fd").Base(err) return v2net.Destination{}, newError("failed to get sys fd").Base(err)
} }
var dest v2net.Destination var dest v2net.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) addr, err := syscall.GetsockoptIPv6Mreq(int(fd), syscall.IPPROTO_IP, SO_ORIGINAL_DST)
if err != nil { if err != nil {
return v2net.Destination{}, newError("failed to call getsockopt").Base(err) log.Trace(newError("failed to call getsockopt").Base(err))
} }
ip := v2net.IPAddress(addr.Multiaddr[4:8]) ip := v2net.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])
addr = v2net.TCPDestination(ip, v2net.Port(port)) dest = v2net.TCPDestination(ip, v2net.Port(port))
}) })
if err != nil { if err != nil {
return v2net.Destination{}, newError("failed to get original destination").Base(err) return v2net.Destination{}, newError("failed to get original destination").Base(err)