unified tproxy option

hitlite · Sep 17, 2018 · 383b84e · 383b84e
1 parent 7f69766
commit 383b84e
Show file tree

Hide file tree

Showing 66 changed files with 503 additions and 335 deletions.
diff --git a/app/commander/config.pb.go b/app/commander/config.pb.go
@@ -1,9 +1,11 @@
 package commander
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import serial "v2ray.com/core/common/serial"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+	serial "v2ray.com/core/common/serial"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go
@@ -1,8 +1,10 @@
 package dispatcher
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go
@@ -1,9 +1,11 @@
 package dns
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import net "v2ray.com/core/common/net"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+	net "v2ray.com/core/common/net"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/app/log/command/config.pb.go b/app/log/command/config.pb.go
@@ -1,8 +1,11 @@
 package command
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 import (
 	"context"

diff --git a/app/log/config.pb.go b/app/log/config.pb.go
@@ -1,9 +1,11 @@
 package log
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import log "v2ray.com/core/common/log"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+	log "v2ray.com/core/common/log"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/app/policy/config.pb.go b/app/policy/config.pb.go
@@ -1,8 +1,10 @@
 package policy
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/app/proxyman/command/command.pb.go b/app/proxyman/command/command.pb.go
@@ -1,11 +1,14 @@
 package command
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import core "v2ray.com/core"
-import protocol "v2ray.com/core/common/protocol"
-import serial "v2ray.com/core/common/serial"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+	core "v2ray.com/core"
+	protocol "v2ray.com/core/common/protocol"
+	serial "v2ray.com/core/common/serial"
+)
 
 import (
 	"context"

diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go
@@ -1,11 +1,13 @@
 package proxyman
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import net "v2ray.com/core/common/net"
-import serial "v2ray.com/core/common/serial"
-import internet "v2ray.com/core/transport/internet"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+	net "v2ray.com/core/common/net"
+	serial "v2ray.com/core/common/serial"
+	internet "v2ray.com/core/transport/internet"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/app/proxyman/inbound/always.go b/app/proxyman/inbound/always.go
@@ -69,13 +69,25 @@ func NewAlwaysOnInboundHandler(ctx context.Context, tag string, receiverConfig *
 	if address == nil {
 		address = net.AnyIP
 	}
+
+	mss, err := internet.ToMemoryStreamConfig(receiverConfig.StreamSettings)
+	if err != nil {
+		return nil, newError("failed to parse stream config").Base(err).AtWarning()
+	}
+
+	if receiverConfig.ReceiveOriginalDestination {
+		if mss.SocketSettings == nil {
+			mss.SocketSettings = &internet.SocketConfig{}
+		}
+		if mss.SocketSettings.Tproxy == internet.SocketConfig_Off {
+			mss.SocketSettings.Tproxy = internet.SocketConfig_Redirect
+		}
+		mss.SocketSettings.ReceiveOriginalDestAddress = true
+	}
+
 	for port := pr.From; port <= pr.To; port++ {
 		if nl.HasNetwork(net.Network_TCP) {
 			newError("creating stream worker on ", address, ":", port).AtDebug().WriteToLog()
-			mss, err := internet.ToMemoryStreamConfig(receiverConfig.StreamSettings)
-			if err != nil {
-				return nil, newError("failed to parse stream config").Base(err).AtWarning()
-			}
 
 			worker := &tcpWorker{
 				address:         address,
@@ -98,10 +110,10 @@ func NewAlwaysOnInboundHandler(ctx context.Context, tag string, receiverConfig *
 				proxy:           p,
 				address:         address,
 				port:            net.Port(port),
-				recvOrigDest:    receiverConfig.ReceiveOriginalDestination,
 				dispatcher:      h.mux,
 				uplinkCounter:   uplinkCounter,
 				downlinkCounter: downlinkCounter,
+				stream:          mss,
 			}
 			h.workers = append(h.workers, worker)
 		}

diff --git a/app/proxyman/inbound/dynamic.go b/app/proxyman/inbound/dynamic.go
@@ -45,6 +45,15 @@ func NewDynamicInboundHandler(ctx context.Context, tag string, receiverConfig *p
 	if err != nil {
 		return nil, newError("failed to parse stream settings").Base(err).AtWarning()
 	}
+	if receiverConfig.ReceiveOriginalDestination {
+		if mss.SocketSettings == nil {
+			mss.SocketSettings = &internet.SocketConfig{}
+		}
+		if mss.SocketSettings.Tproxy == internet.SocketConfig_Off {
+			mss.SocketSettings.Tproxy = internet.SocketConfig_Redirect
+		}
+		mss.SocketSettings.ReceiveOriginalDestAddress = true
+	}
 
 	h.streamSettings = mss
 
@@ -139,10 +148,10 @@ func (h *DynamicInboundHandler) refresh() error {
 				proxy:           p,
 				address:         address,
 				port:            port,
-				recvOrigDest:    h.receiverConfig.ReceiveOriginalDestination,
 				dispatcher:      h.mux,
 				uplinkCounter:   uplinkCounter,
 				downlinkCounter: downlinkCounter,
+				stream:          h.streamSettings,
 			}
 			if err := worker.Start(); err != nil {
 				newError("failed to create UDP worker").Base(err).AtWarning().WriteToLog()

diff --git a/app/proxyman/inbound/worker.go b/app/proxyman/inbound/worker.go
@@ -204,8 +204,8 @@ type udpWorker struct {
 	hub             *udp.Hub
 	address         net.Address
 	port            net.Port
-	recvOrigDest    bool
 	tag             string
+	stream          *internet.MemoryStreamConfig
 	dispatcher      core.Dispatcher
 	uplinkCounter   core.StatCounter
 	downlinkCounter core.StatCounter
@@ -322,7 +322,8 @@ func (w *udpWorker) clean() error {
 
 func (w *udpWorker) Start() error {
 	w.activeConn = make(map[connID]*udpConn, 16)
-	h, err := udp.ListenUDP(w.address, w.port, udp.HubReceiveOriginalDestination(w.recvOrigDest), udp.HubCapacity(256))
+	ctx := internet.ContextWithStreamSettings(context.Background(), w.stream)
+	h, err := udp.ListenUDP(ctx, w.address, w.port, udp.HubCapacity(256))
 	if err != nil {
 		return err
 	}

diff --git a/app/router/config.pb.go b/app/router/config.pb.go
@@ -1,9 +1,11 @@
 package router
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import net "v2ray.com/core/common/net"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+	net "v2ray.com/core/common/net"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/app/stats/command/command.pb.go b/app/stats/command/command.pb.go
@@ -1,8 +1,11 @@
 package command
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	math "math"
+
+	proto "github.com/golang/protobuf/proto"
+)
 
 import (
 	"context"

diff --git a/app/stats/config.pb.go b/app/stats/config.pb.go
@@ -1,8 +1,10 @@
 package stats
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/common/log/log.pb.go b/common/log/log.pb.go
@@ -1,8 +1,10 @@
 package log
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/common/net/address.pb.go b/common/net/address.pb.go
@@ -1,8 +1,10 @@
 package net
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/common/net/destination.pb.go b/common/net/destination.pb.go
@@ -1,8 +1,10 @@
 package net
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/common/net/network.pb.go b/common/net/network.pb.go
@@ -1,8 +1,10 @@
 package net
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/common/net/port.pb.go b/common/net/port.pb.go
@@ -1,8 +1,10 @@
 package net
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/common/protocol/command.pb.go b/common/protocol/command.pb.go
@@ -1,10 +1,12 @@
 package protocol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import serial "v2ray.com/core/common/serial"
-import internet "v2ray.com/core/transport/internet"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+	serial "v2ray.com/core/common/serial"
+	internet "v2ray.com/core/transport/internet"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/common/protocol/headers.pb.go b/common/protocol/headers.pb.go
@@ -1,8 +1,10 @@
 package protocol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

diff --git a/common/protocol/server_spec.pb.go b/common/protocol/server_spec.pb.go
@@ -1,9 +1,11 @@
 package protocol
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import net "v2ray.com/core/common/net"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+	net "v2ray.com/core/common/net"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal