lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-05 00:47:51 -05:00
Code Issues Releases Wiki Activity

update fd logic for golang 1.9

Browse Source
This commit is contained in:
Darien Raymond 2017-08-25 21:42:07 +02:00
parent c83a7b8311
commit 896bff2195
2 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
transport/internet/internal/sysfd.go
View File

@ -1,25 +0,0 @@
package internal
import (
"net"
"reflect"
)
var (
errInvalidConn = newError("not a net.Conn")
)
// GetSysFd returns the underlying fd of a connection.
func GetSysFd(conn net.Conn) (int, error) {
cv := reflect.ValueOf(conn)
switch ce := cv.Elem(); ce.Kind() {
case reflect.Struct:
netfd := ce.FieldByName("conn").FieldByName("fd")
switch fe := netfd.Elem(); fe.Kind() {
case reflect.Struct:
fd := fe.FieldByName("sysfd")
return int(fd.Int()), nil
}
}
return 0, errInvalidConn
}

11
transport/internet/udp/hub.go
View File

@ -8,7 +8,6 @@ import (
"v2ray.com/core/common/buf" "v2ray.com/core/common/buf"
"v2ray.com/core/common/dice" "v2ray.com/core/common/dice"
v2net "v2ray.com/core/common/net" v2net "v2ray.com/core/common/net"
"v2ray.com/core/transport/internet/internal"
) )
// Payload represents a single UDP payload. // Payload represents a single UDP payload.
@ -94,13 +93,17 @@ func ListenUDP(address v2net.Address, port v2net.Port, option ListenOption) (*Hu
} }
log.Trace(newError("listening UDP on ", address, ":", port)) log.Trace(newError("listening UDP on ", address, ":", port))
if option.ReceiveOriginalDest { if option.ReceiveOriginalDest {
fd, err := internal.GetSysFd(udpConn) rawConn, err := udpConn.SyscallConn()
if err != nil { if err != nil {
return nil, newError("failed to get fd").Base(err) return nil, newError("failed to get fd").Base(err)
} }
err = SetOriginalDestOptions(fd) err = rawConn.Control(func(fd uintptr) {
if err := SetOriginalDestOptions(int(fd)); err != nil {
log.Trace(newError("failed to set socket options").Base(err))
}
})
if err != nil { if err != nil {
return nil, newError("failed to set socket options").Base(err) return nil, newError("failed to control socket").Base(err)
} }
} }
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())