lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-28 06:46:14 -04:00
Code Issues Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Darien Raymond 2017-10-26 21:07:33 +02:00
parent 1a8ed61b9b
commit 12a0d6e0b9
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proxy/dokodemo/dokodemo.go
View File

@ -7,8 +7,6 @@ import (
"runtime"
"time"
gonet "net"
"v2ray.com/core/app"
"v2ray.com/core/app/dispatcher"
"v2ray.com/core/app/log"
@ -95,14 +93,13 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn in
if !d.config.FollowRedirect {
writer = buf.NewSequentialWriter(conn)
} else {
srca := gonet.UDPAddr{IP: dest.Address.IP(), Port: int(dest.Port.Value())}
srca := net.UDPAddr{IP: dest.Address.IP(), Port: int(dest.Port.Value())}
origsend, err := udp.TransmitSocket(&srca, conn.RemoteAddr())
if err != nil {
return err
}
writer = buf.NewSequentialWriter(origsend)
}
}
if err := buf.Copy(inboundRay.InboundOutput(), writer, buf.UpdateActivity(timer)); err != nil {

12
transport/internet/udp/sourceForgeSender_bad.go
View File

@ -1,12 +0,0 @@
// +build !linux
package udp
import (
"errors"
"net"
)
func TransmitionSocket(src net.Addr, dst net.Addr) (net.Conn, error) {
return nil, errors.New("Using an Linux only functionality on an non-Linux OS.")
}

11
transport/internet/udp/source_forging.go Normal file
View File

@ -0,0 +1,11 @@
// +build !linux
package udp
import (
"net"
)
func TransmitSocket(src net.Addr, dst net.Addr) (net.Conn, error) {
return nil, newError("forging source address is not supported on non-Linux platform.").AtWarning()
}

12
transport/internet/udp/sourceForgeSender.go → transport/internet/udp/source_forging_linux.go
View File

@ -14,16 +14,16 @@ func TransmitSocket(src net.Addr, dst net.Addr) (net.Conn, error) {
var err error
fd, err = syscall.Socket(syscall.AF_INET, syscall.SOCK_DGRAM, 0)
if err != nil {
return nil, err
return nil, newError("failed to create fd").Base(err).AtWarning()
}
err = syscall.SetsockoptInt(fd, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1)
if err != nil {
return nil, err
return nil, newError("failed to set resuse_addr").Base(err).AtWarning()
}
err = syscall.SetsockoptInt(fd, syscall.SOL_IP, syscall.IP_TRANSPARENT, 1)
if err != nil {
return nil, err
return nil, newError("failed to set transparent").Base(err).AtWarning()
}
ip := src.(*net.UDPAddr).IP.To4()
@ -34,7 +34,7 @@ func TransmitSocket(src net.Addr, dst net.Addr) (net.Conn, error) {
srcaddr.Port = src.(*net.UDPAddr).Port
err = syscall.Bind(fd, &srcaddr)
if err != nil {
return nil, err
return nil, newError("failed to bind source address").Base(err).AtWarning()
}
ipd := dst.(*net.UDPAddr).IP.To4()
var ip2d [4]byte
@ -44,12 +44,12 @@ func TransmitSocket(src net.Addr, dst net.Addr) (net.Conn, error) {
dstaddr.Port = dst.(*net.UDPAddr).Port
err = syscall.Connect(fd, &dstaddr)
if err != nil {
return nil, err
return nil, newError("failed to connect to source address").Base(err).AtWarning()
}
fdf := os.NewFile(uintptr(fd), "/dev/udp/")
c, err := net.FileConn(fdf)
if err != nil {
return nil, err
return nil, newError("failed to create file conn").Base(err).AtWarning()
}
return c, nil
}