Merge branch 'master' into pt

.github/workflows/build-master.yml

@@ -25,7 +25,7 @@ jobs:
         id: current-time
 
       - name: Build
-        uses: crazy-max/ghaction-xgo@v1.8.0
+        uses: crazy-max/ghaction-xgo@v2.0.0
         env:
           TIME: "${{ steps.current-time.outputs.time }}"
         with:

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
         id: current-time
 
       - name: Build (tun)
-        uses: crazy-max/ghaction-xgo@v1.8.0
+        uses: crazy-max/ghaction-xgo@v2.0.0
         env:
           TIME: "${{ steps.current-time.outputs.time }}"
         with:

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.5
+
+- `bind_outbound` server option for binding outbound connections to a specific address or interface
+- TCP Redirect mode (for Linux)
+
 ## 1.0.4
 
 - ~10% CPU usage reduction

README.md

@@ -18,27 +18,30 @@
 
 [8]: https://github.com/HyNetwork/hysteria/discussions
 
-Hysteria is a feature-packed network utility optimized for networks of poor quality (e.g. satellite connections,
-congested public Wi-Fi, connecting from China to servers abroad) powered by a custom version of QUIC protocol. It
-currently has the following features: (still growing!)
+Hysteria is a feature-packed proxy & relay utility optimized for lossy, unstable connections (e.g. satellite networks,
+congested public Wi-Fi, connecting from China to servers abroad) powered by a customized QUIC protocol.
 
 - SOCKS5 proxy (TCP & UDP)
 - HTTP/HTTPS proxy
 - TCP/UDP relay
-- TCP/UDP TPROXY (Linux only)
+- TCP/UDP TPROXY (Linux)
+- TCP REDIRECT (Linux)
 - TUN (TAP on Windows)
+- Still growing...
 
 **[Documentation has now been moved to our wiki](https://github.com/HyNetwork/hysteria/wiki)**
 
 ----------
 
-Hysteria 是一个功能丰富的，专为恶劣网络环境进行优化的网络工具（双边加速），比如卫星网络、拥挤的公共 Wi-Fi、在中国连接国外服务器等。 基于修改版的 QUIC 协议。目前有以下模式：（仍在增加中）
+Hysteria 是一个功能丰富的，专为恶劣网络环境进行优化的网络工具（双边加速），比如卫星网络、拥挤的公共 Wi-Fi、在中国连接国外服务器等。 基于修改版的 QUIC 协议。
 
 - SOCKS5 代理 (TCP & UDP)
 - HTTP/HTTPS 代理
 - TCP/UDP 转发
 - TCP/UDP TPROXY 透明代理 (Linux)
+- TCP REDIRECT 透明代理 (Linux)
 - TUN (Windows 下为 TAP)
+- 仍在增加中...
 
 **[文档现已移动到 wiki](https://github.com/HyNetwork/hysteria/wiki/%E9%A6%96%E9%A1%B5)**
 

Taskfile.yaml

@@ -0,0 +1,156 @@
+version: '3'
+
+tasks:
+  clean:
+    cmds:
+      - rm -rf dist
+      - mkdir -p dist
+  build-hysteria:
+    label: build-{{.TASK}}
+    vars:
+      BUILD_COMMIT:
+        sh: git rev-parse HEAD
+      BUILD_DATE:
+        sh: date "+%Y%m%d%H%M%S"
+    dir: ./cmd
+    cmds:
+      - |
+        GOOS={{.GOOS}} GOARCH={{.GOARCH}} GOARM={{.GOARM}} GOMIPS={{.GOMIPS}} \
+        go build -trimpath -o ../dist/hysteria-{{.TASK}} -ldflags \
+        "-w -s -X main.appCommit={{.BUILD_COMMIT}} -X main.appDate={{.BUILD_DATE}}"
+  linux-386:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: 386
+        }
+  linux-amd64:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: amd64
+        }
+  linux-amd64-v3:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: amd64,
+          GOAMD64: v3
+        }
+  linux-armv5:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: arm,
+          GOARM: 5
+        }
+  linux-armv6:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: arm,
+          GOARM: 6
+        }
+  linux-armv7:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: arm,
+          GOARM: 7
+        }
+  linux-armv8:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: arm64
+        }
+  linux-mips-hardfloat:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: mips,
+          GOMIPS: hardfloat
+        }
+  linux-mipsle-softfloat:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: mipsle,
+          GOMIPS: softfloat
+        }
+  linux-mipsle-hardfloat:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: mipsle,
+          GOMIPS: hardfloat
+        }
+  linux-mips64:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: mips64
+        }
+  linux-mips64le:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: linux,
+          GOARCH: mips64le
+        }
+  darwin-amd64:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: darwin,
+          GOARCH: amd64
+        }
+  darwin-arm64:
+    cmds:
+      - task: build-hysteria
+        vars: {
+          TASK: "{{.TASK}}",
+          GOOS: darwin,
+          GOARCH: arm64
+        }
+  default:
+    cmds:
+      - task: clean
+      - task: linux-386
+      - task: linux-amd64
+      - task: linux-amd64-v3
+      - task: linux-armv5
+      - task: linux-armv6
+      - task: linux-armv7
+      - task: linux-armv8
+      - task: linux-mips-hardfloat
+      - task: linux-mipsle-softfloat
+      - task: linux-mipsle-hardfloat
+      - task: linux-mips64
+      - task: linux-mips64le
+      - task: darwin-amd64
+      - task: darwin-arm64

cmd/client.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"github.com/oschwald/geoip2-golang"
 	"github.com/tobyxdd/hysteria/pkg/pmtud_fix"
+	"github.com/tobyxdd/hysteria/pkg/redirect"
 	"github.com/yosuke-furukawa/json5/encoding/json5"
 	"io"
 	"io/ioutil"
@@ -435,6 +436,38 @@ func client(config *clientConfig) {
 		}()
 	}
 
+	if len(config.TCPRedirect.Listen) > 0 {
+		go func() {
+			rl, err := redirect.NewTCPRedirect(client, config.TCPRedirect.Listen,
+				time.Duration(config.TCPRedirect.Timeout)*time.Second,
+				func(addr, reqAddr net.Addr) {
+					logrus.WithFields(logrus.Fields{
+						"src": addr.String(),
+						"dst": reqAddr.String(),
+					}).Debug("TCP Redirect request")
+				},
+				func(addr, reqAddr net.Addr, err error) {
+					if err != io.EOF {
+						logrus.WithFields(logrus.Fields{
+							"error": err,
+							"src":   addr.String(),
+							"dst":   reqAddr.String(),
+						}).Info("TCP Redirect error")
+					} else {
+						logrus.WithFields(logrus.Fields{
+							"src": addr.String(),
+							"dst": reqAddr.String(),
+						}).Debug("TCP Redirect EOF")
+					}
+				})
+			if err != nil {
+				logrus.WithField("error", err).Fatal("Failed to initialize TCP Redirect")
+			}
+			logrus.WithField("addr", config.TCPRedirect.Listen).Info("TCP Redirect up and running")
+			errChan <- rl.ListenAndServe()
+		}()
+	}
+
 	err := <-errChan
 	logrus.WithField("error", err).Fatal("Client shutdown")
 }

cmd/config.go

@@ -63,6 +63,10 @@ type serverConfig struct {
 		User     string `json:"user"`
 		Password string `json:"password"`
 	} `json:"socks5_outbound"`
+	BindOutbound struct {
+		Address string `json:"address"`
+		Device  string `json:"device"`
+	} `json:"bind_outbound"`
 }
 
 func (c *serverConfig) Speed() (uint64, uint64, error) {
@@ -175,6 +179,10 @@ type clientConfig struct {
 		Listen  string `json:"listen"`
 		Timeout int    `json:"timeout"`
 	} `json:"tproxy_udp"`
+	TCPRedirect struct {
+		Listen  string `json:"listen"`
+		Timeout int    `json:"timeout"`
+	} `json:"redirect_tcp"`
 	ACL                 string `json:"acl"`
 	MMDB                string `json:"mmdb"`
 	Obfs                string `json:"obfs"`
@@ -216,7 +224,8 @@ func (c *clientConfig) Check() error {
 	if len(c.SOCKS5.Listen) == 0 && len(c.HTTP.Listen) == 0 && len(c.TUN.Name) == 0 &&
 		len(c.TCPRelay.Listen) == 0 && len(c.UDPRelay.Listen) == 0 &&
 		len(c.TCPRelays) == 0 && len(c.UDPRelays) == 0 &&
-		len(c.TCPTProxy.Listen) == 0 && len(c.UDPTProxy.Listen) == 0 {
+		len(c.TCPTProxy.Listen) == 0 && len(c.UDPTProxy.Listen) == 0 &&
+		len(c.TCPRedirect.Listen) == 0 {
 		return errors.New("please enable at least one mode")
 	}
 	if c.SOCKS5.Timeout != 0 && c.SOCKS5.Timeout <= 4 {
@@ -256,6 +265,9 @@ func (c *clientConfig) Check() error {
 	if c.UDPTProxy.Timeout != 0 && c.UDPTProxy.Timeout <= 4 {
 		return errors.New("invalid UDP TProxy timeout")
 	}
+	if c.TCPRedirect.Timeout != 0 && c.TCPRedirect.Timeout <= 4 {
+		return errors.New("invalid TCP Redirect timeout")
+	}
 	if len(c.Server) == 0 {
 		return errors.New("no server address")
 	}

cmd/server.go

@@ -15,6 +15,7 @@ import (
 	"github.com/tobyxdd/hysteria/pkg/core"
 	"github.com/tobyxdd/hysteria/pkg/obfs"
 	"github.com/tobyxdd/hysteria/pkg/pmtud_fix"
+	"github.com/tobyxdd/hysteria/pkg/sockopt"
 	"github.com/tobyxdd/hysteria/pkg/transport"
 	"github.com/yosuke-furukawa/json5/encoding/json5"
 	"io"
@@ -163,6 +164,27 @@ func server(config *serverConfig) {
 		}
 		transport.DefaultServerTransport.SOCKS5Client = ob
 	}
+	// Bind outbound
+	if config.BindOutbound.Device != "" {
+		iface, err := net.InterfaceByName(config.BindOutbound.Device)
+		if err != nil {
+			logrus.WithFields(logrus.Fields{
+				"error": err,
+			}).Fatal("Failed to find the interface")
+		}
+		transport.DefaultServerTransport.LocalUDPIntf = iface
+		sockopt.BindDialer(transport.DefaultServerTransport.Dialer, iface)
+	}
+	if config.BindOutbound.Address != "" {
+		ip := net.ParseIP(config.BindOutbound.Address)
+		if ip == nil {
+			logrus.WithFields(logrus.Fields{
+				"error": err,
+			}).Fatal("Failed to parse the address")
+		}
+		transport.DefaultServerTransport.Dialer.LocalAddr = &net.TCPAddr{IP: ip}
+		transport.DefaultServerTransport.LocalUDPAddr = &net.UDPAddr{IP: ip}
+	}
 	// ACL
 	var aclEngine *acl.Engine
 	if len(config.ACL) > 0 {