|
|
@@ -6,7 +6,6 @@ import (
|
|
|
"net"
|
|
|
"syscall"
|
|
|
|
|
|
- "v2ray.com/core/app/log"
|
|
|
v2net "v2ray.com/core/common/net"
|
|
|
"v2ray.com/core/transport/internet"
|
|
|
"v2ray.com/core/transport/internet/internal"
|
|
|
@@ -14,19 +13,17 @@ import (
|
|
|
|
|
|
const SO_ORIGINAL_DST = 80
|
|
|
|
|
|
-func GetOriginalDestination(conn internet.Connection) v2net.Destination {
|
|
|
+func GetOriginalDestination(conn internet.Connection) (v2net.Destination, error) {
|
|
|
fd, err := internal.GetSysFd(conn.(net.Conn))
|
|
|
if err != nil {
|
|
|
- log.Trace(newError("failed to get original destination").Base(err))
|
|
|
- return v2net.Destination{}
|
|
|
+ return v2net.Destination{}, newError("failed to get original destination").Base(err)
|
|
|
}
|
|
|
|
|
|
addr, err := syscall.GetsockoptIPv6Mreq(fd, syscall.IPPROTO_IP, SO_ORIGINAL_DST)
|
|
|
if err != nil {
|
|
|
- log.Trace(newError("failed to call getsockopt").Base(err))
|
|
|
- return v2net.Destination{}
|
|
|
+ return v2net.Destination{}, newError("failed to call getsockopt").Base(err)
|
|
|
}
|
|
|
ip := v2net.IPAddress(addr.Multiaddr[4:8])
|
|
|
port := uint16(addr.Multiaddr[2])<<8 + uint16(addr.Multiaddr[3])
|
|
|
- return v2net.TCPDestination(ip, v2net.Port(port))
|
|
|
+ return v2net.TCPDestination(ip, v2net.Port(port)), nil
|
|
|
}
|