Merge pull request #4753 from fatedier/dev

bump version

.github/workflows/golangci-lint.yml

@@ -20,10 +20,10 @@ jobs:
         go-version: '1.23'
         cache: false
     - name: golangci-lint
-      uses: golangci/golangci-lint-action@v8
+      uses: golangci/golangci-lint-action@v4
       with:
         # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-        version: v2.1
+        version: v1.61
 
         # Optional: golangci-lint command line arguments.
         # args: --issues-exit-code=0
@@ -34,3 +34,9 @@ jobs:
         # Optional: if set to true then the all caching functionality will be complete disabled,
         #           takes precedence over all other caching options.
         # skip-cache: true
+
+        # Optional: if set to true then the action don't cache or restore ~/go/pkg.
+        # skip-pkg-cache: true
+
+        # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
+        # skip-build-cache: true

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-name: "Close stale issues and PRs"
+name: "Close stale issues"
 on:
   schedule:
   - cron: "20 0 * * *"

.golangci.yml

@@ -1,111 +1,139 @@
-version: "2"
+service:
+  golangci-lint-version: 1.61.x # use the fixed version to not introduce new linters unexpectedly
+
 run:
   concurrency: 4
+  # timeout for analysis, e.g. 30s, 5m, default is 1m
+  timeout: 20m
   build-tags:
   - integ
   - integfuzz
+
 linters:
-  default: none
+  disable-all: true
   enable:
-  - asciicheck
-  - copyloopvar
+  - unused
   - errcheck
+  - copyloopvar
   - gocritic
-  - gosec
+  - gofumpt
+  - goimports
+  - revive
+  - gosimple
   - govet
   - ineffassign
   - lll
-  - makezero
   - misspell
-  - prealloc
-  - predeclared
-  - revive
   - staticcheck
+  - stylecheck
+  - typecheck
   - unconvert
   - unparam
-  - unused
-  settings:
-    errcheck:
-      check-type-assertions: false
-      check-blank: false
-    gocritic:
-      disabled-checks:
-      - exitAfterDefer
-    gosec:
-      excludes:
-      - G401
-      - G402
-      - G404
-      - G501
-      - G115
-      severity: low
-      confidence: low
-    govet:
-      disable:
-      - shadow
-    lll:
-      line-length: 160
-      tab-width: 1
-    misspell:
-      locale: US
-      ignore-rules:
-      - cancelled
-      - marshalled
-    unparam:
-      check-exported: false
-  exclusions:
-    generated: lax
-    presets:
-    - comments
-    - common-false-positives
-    - legacy
-    - std-error-handling
-    rules:
-    - linters:
-      - errcheck
-      - maligned
-      path: _test\.go$|^tests/|^samples/
-    - linters:
-      - revive
-      - staticcheck
-      text: use underscores in Go names
-    - linters:
-      - revive
-      text: unused-parameter
-    - linters:
-      - unparam
-      text: is always false
-    paths:
-    - .*\.pb\.go
-    - .*\.gen\.go
-    - genfiles$
-    - vendor$
-    - bin$
-    - third_party$
-    - builtin$
-    - examples$
-formatters:
-  enable:
   - gci
-  - gofumpt
-  - goimports
-  settings:
-    gci:
-      sections:
-      - standard
-      - default
-      - prefix(github.com/fatedier/frp/)
-  exclusions:
-    generated: lax
-    paths:
-    - .*\.pb\.go
-    - .*\.gen\.go
-    - genfiles$
-    - vendor$
-    - bin$
-    - third_party$
-    - builtin$
-    - examples$
+  - gosec
+  - asciicheck
+  - prealloc
+  - predeclared
+  - makezero
+  fast: false
+
+linters-settings:
+  errcheck:
+    # report about not checking of errors in type assetions: `a := b.(MyStruct)`;
+    # default is false: such cases aren't reported by default.
+    check-type-assertions: false
+
+    # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
+    # default is false: such cases aren't reported by default.
+    check-blank: false
+  govet:
+    # report about shadowed variables
+    disable:
+    - shadow
+  maligned:
+    # print struct with more effective memory layout or not, false by default
+    suggest-new: true
+  misspell:
+    # Correct spellings using locale preferences for US or UK.
+    # Default is to use a neutral variety of English.
+    # Setting locale to US will correct the British spelling of 'colour' to 'color'.
+    locale: US
+    ignore-words:
+    - cancelled
+    - marshalled
+  lll:
+    # max line length, lines longer will be reported. Default is 120.
+    # '\t' is counted as 1 character by default, and can be changed with the tab-width option
+    line-length: 160
+    # tab width in spaces. Default to 1.
+    tab-width: 1
+  gocritic:
+    disabled-checks:
+    - exitAfterDefer
+  unused:
+    check-exported: false
+  unparam:
+    # Inspect exported functions, default is false. Set to true if no external program/library imports your code.
+    # XXX: if you enable this setting, unparam will report a lot of false-positives in text editors:
+    # if it's called for subdir of a project it can't find external interfaces. All text editor integrations
+    # with golangci-lint call it on a directory with the changed file.
+    check-exported: false
+  gci:
+    sections:
+    - standard
+    - default
+    - prefix(github.com/fatedier/frp/)
+  gosec:
+    severity: "low"
+    confidence: "low"
+    excludes:
+    - G401
+    - G402
+    - G404
+    - G501
+    - G115 # integer overflow conversion
+
 issues:
-  max-issues-per-linter: 0
+  # List of regexps of issue texts to exclude, empty list by default.
+  # But independently from this option we use default exclude patterns,
+  # it can be disabled by `exclude-use-default: false`. To list all
+  # excluded by default patterns execute `golangci-lint run --help`
+  # exclude:
+  #  - composite literal uses unkeyed fields
+
+  exclude-rules:
+  # Exclude some linters from running on test files.
+  - path: _test\.go$|^tests/|^samples/
+    linters:
+    - errcheck
+    - maligned
+  - linters:
+    - revive
+    - stylecheck
+    text: "use underscores in Go names"
+  - linters:
+    - revive
+    text: "unused-parameter"
+  - linters:
+    - unparam
+    text: "is always false"
+
+  exclude-dirs:
+  - genfiles$
+  - vendor$
+  - bin$
+  exclude-files:
+  - ".*\\.pb\\.go"
+  - ".*\\.gen\\.go"
+
+  # Independently from option `exclude` we use default exclude patterns,
+  # it can be disabled by this option. To list all
+  # excluded by default patterns execute `golangci-lint run --help`.
+  # Default value for this option is true.
+  exclude-use-default: true
+
+  # Maximum issues count per one linter. Set to 0 to disable. Default is 50.
+  max-per-linter: 0
+
+  # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
   max-same-issues: 0

Makefile.cross-compiles

@@ -2,7 +2,7 @@ export PATH := $(PATH):`go env GOPATH`/bin
 export GO111MODULE=on
 LDFLAGS := -s -w
 
-os-archs=darwin:amd64 darwin:arm64 freebsd:amd64 openbsd:amd64 linux:amd64 linux:arm:7 linux:arm:5 linux:arm64 windows:amd64 windows:arm64 linux:mips64 linux:mips64le linux:mips:softfloat linux:mipsle:softfloat linux:riscv64 linux:loong64 android:arm64
+os-archs=darwin:amd64 darwin:arm64 freebsd:amd64 linux:amd64 linux:arm:7 linux:arm:5 linux:arm64 windows:amd64 windows:arm64 linux:mips64 linux:mips64le linux:mips:softfloat linux:mipsle:softfloat linux:riscv64 linux:loong64 android:arm64
 
 all: build
 

README.md

@@ -1025,7 +1025,7 @@ You can get user's real IP from HTTP request headers `X-Forwarded-For`.
 
 #### Proxy Protocol
 
-frp supports Proxy Protocol to send user's real IP to local services.
+frp supports Proxy Protocol to send user's real IP to local services. It support all types except UDP.
 
 Here is an example for https service:
 
@@ -1283,7 +1283,9 @@ frp supports feature gates to enable or disable experimental features. This allo
 To enable an experimental feature, add the feature gate to your configuration:
 
 ```toml
-featureGates = { VirtualNet = true }
+featureGates = {
+  VirtualNet = true
+}
 ```
 
 ### Feature Lifecycle

Release.md

@@ -1,4 +1,8 @@
-## Features
+### Notes
 
-* Support for YAML merge functionality (anchors and references with dot-prefixed fields) in strict configuration mode without requiring `--strict-config=false` parameter.
-* Support for proxy protocol in UDP proxies to preserve real client IP addresses.
+*   **Feature Gates Introduced:** This version introduces a new experimental mechanism called Feature Gates. This allows users to enable or disable specific experimental features before they become generally available. Feature gates can be configured in the `featureGates` map within the configuration file.
+*   **VirtualNet Feature Gate:** The first available feature gate is `VirtualNet`, which enables the experimental Virtual Network functionality (currently in Alpha stage).
+
+### Features
+
+*   **Virtual Network (VirtualNet):** Introduce experimental virtual network capabilities (Alpha). This allows creating a TUN device managed by frp, enabling Layer 3 connectivity between different clients within the frp network. Requires root/admin privileges and is currently supported on Linux and macOS. Configuration is done via the `virtualNet` section and the `virtual_net` plugin. Enable with feature gate `VirtualNet`. **Note: As an Alpha feature, configuration details may change in future releases.**

client/admin_api.go

@@ -165,9 +165,9 @@ func (svr *Service) apiStatus(w http.ResponseWriter, _ *http.Request) {
 		res StatusResp = make(map[string][]ProxyStatusResp)
 	)
 
-	log.Infof("http request [/api/status]")
+	log.Infof("Http request [/api/status]")
 	defer func() {
-		log.Infof("http response [/api/status]")
+		log.Infof("Http response [/api/status]")
 		buf, _ = json.Marshal(&res)
 		_, _ = w.Write(buf)
 	}()
@@ -198,9 +198,9 @@ func (svr *Service) apiStatus(w http.ResponseWriter, _ *http.Request) {
 func (svr *Service) apiGetConfig(w http.ResponseWriter, _ *http.Request) {
 	res := GeneralResponse{Code: 200}
 
-	log.Infof("http get request [/api/config]")
+	log.Infof("Http get request [/api/config]")
 	defer func() {
-		log.Infof("http get response [/api/config], code [%d]", res.Code)
+		log.Infof("Http get response [/api/config], code [%d]", res.Code)
 		w.WriteHeader(res.Code)
 		if len(res.Msg) > 0 {
 			_, _ = w.Write([]byte(res.Msg))
@@ -228,9 +228,9 @@ func (svr *Service) apiGetConfig(w http.ResponseWriter, _ *http.Request) {
 func (svr *Service) apiPutConfig(w http.ResponseWriter, r *http.Request) {
 	res := GeneralResponse{Code: 200}
 
-	log.Infof("http put request [/api/config]")
+	log.Infof("Http put request [/api/config]")
 	defer func() {
-		log.Infof("http put response [/api/config], code [%d]", res.Code)
+		log.Infof("Http put response [/api/config], code [%d]", res.Code)
 		w.WriteHeader(res.Code)
 		if len(res.Msg) > 0 {
 			_, _ = w.Write([]byte(res.Msg))

client/control.go

@@ -189,7 +189,7 @@ func (ctl *Control) handlePong(m msg.Message) {
 	inMsg := m.(*msg.Pong)
 
 	if inMsg.Error != "" {
-		xl.Errorf("pong message contains error: %s", inMsg.Error)
+		xl.Errorf("Pong message contains error: %s", inMsg.Error)
 		ctl.closeSession()
 		return
 	}

client/proxy/proxy.go

@@ -20,11 +20,13 @@ import (
 	"net"
 	"reflect"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
 	libio "github.com/fatedier/golib/io"
 	libnet "github.com/fatedier/golib/net"
+	pp "github.com/pires/go-proxyproto"
 	"golang.org/x/time/rate"
 
 	"github.com/fatedier/frp/pkg/config/types"
@@ -33,7 +35,6 @@ import (
 	plugin "github.com/fatedier/frp/pkg/plugin/client"
 	"github.com/fatedier/frp/pkg/transport"
 	"github.com/fatedier/frp/pkg/util/limit"
-	netpkg "github.com/fatedier/frp/pkg/util/net"
 	"github.com/fatedier/frp/pkg/util/xlog"
 	"github.com/fatedier/frp/pkg/vnet"
 )
@@ -175,9 +176,24 @@ func (pxy *BaseProxy) HandleTCPWorkConnection(workConn net.Conn, m *msg.StartWor
 	}
 
 	if baseCfg.Transport.ProxyProtocolVersion != "" && m.SrcAddr != "" && m.SrcPort != 0 {
-		// Use the common proxy protocol builder function
-		header := netpkg.BuildProxyProtocolHeaderStruct(connInfo.SrcAddr, connInfo.DstAddr, baseCfg.Transport.ProxyProtocolVersion)
-		connInfo.ProxyProtocolHeader = header
+		h := &pp.Header{
+			Command:         pp.PROXY,
+			SourceAddr:      connInfo.SrcAddr,
+			DestinationAddr: connInfo.DstAddr,
+		}
+
+		if strings.Contains(m.SrcAddr, ".") {
+			h.TransportProtocol = pp.TCPv4
+		} else {
+			h.TransportProtocol = pp.TCPv6
+		}
+
+		if baseCfg.Transport.ProxyProtocolVersion == "v1" {
+			h.Version = 1
+		} else if baseCfg.Transport.ProxyProtocolVersion == "v2" {
+			h.Version = 2
+		}
+		connInfo.ProxyProtocolHeader = h
 	}
 	connInfo.Conn = remote
 	connInfo.UnderlyingConn = workConn

client/proxy/sudp.go

@@ -205,5 +205,5 @@ func (pxy *SUDPProxy) InWorkConn(conn net.Conn, _ *msg.StartWorkConn) {
 	go workConnReaderFn(workConn, readCh)
 	go heartbeatFn(sendCh)
 
-	udp.Forwarder(pxy.localAddr, readCh, sendCh, int(pxy.clientCfg.UDPPacketSize), pxy.cfg.Transport.ProxyProtocolVersion)
+	udp.Forwarder(pxy.localAddr, readCh, sendCh, int(pxy.clientCfg.UDPPacketSize))
 }

client/proxy/udp.go

@@ -171,7 +171,5 @@ func (pxy *UDPProxy) InWorkConn(conn net.Conn, _ *msg.StartWorkConn) {
 	go workConnSenderFn(pxy.workConn, pxy.sendCh)
 	go workConnReaderFn(pxy.workConn, pxy.readCh)
 	go heartbeatFn(pxy.sendCh)
-
-	// Call Forwarder with proxy protocol version (empty string means no proxy protocol)
-	udp.Forwarder(pxy.localAddr, pxy.readCh, pxy.sendCh, int(pxy.clientCfg.UDPPacketSize), pxy.cfg.Transport.ProxyProtocolVersion)
+	udp.Forwarder(pxy.localAddr, pxy.readCh, pxy.sendCh, int(pxy.clientCfg.UDPPacketSize))
 }

client/service.go

@@ -325,9 +325,10 @@ func (svr *Service) loopLoginUntilSuccess(maxInterval time.Duration, firstLoginE
 		proxyCfgs := svr.proxyCfgs
 		visitorCfgs := svr.visitorCfgs
 		svr.cfgMu.RUnlock()
-
-		connEncrypted := svr.clientSpec == nil || svr.clientSpec.Type != "ssh-tunnel"
-
+		connEncrypted := true
+		if svr.clientSpec != nil && svr.clientSpec.Type == "ssh-tunnel" {
+			connEncrypted = false
+		}
 		sessionCtx := &SessionContext{
 			Common:         svr.common,
 			RunID:          svr.runID,
@@ -340,7 +341,7 @@ func (svr *Service) loopLoginUntilSuccess(maxInterval time.Duration, firstLoginE
 		ctl, err := NewControl(svr.ctx, sessionCtx)
 		if err != nil {
 			conn.Close()
-			xl.Errorf("new control error: %v", err)
+			xl.Errorf("NewControl error: %v", err)
 			return false, err
 		}
 		ctl.SetInWorkConnCallback(svr.handleWorkConnCb)

doc/server_plugin.md

@@ -121,7 +121,7 @@ Create new proxy
         // http and https only
         "custom_domains": []<string>,
         "subdomain": <string>,
-        "locations": []<string>,
+        "locations": <string>,
         "http_user": <string>,
         "http_pwd": <string>,
         "host_header_rewrite": <string>,

doc/virtual_net.md

@@ -49,7 +49,9 @@ type = "virtual_net"
 # frpc.toml (client side)
 serverAddr = "x.x.x.x"
 serverPort = 7000
-featureGates = { VirtualNet = true }
+featureGates = {
+  VirtualNet = true
+}
 
 # Configure the virtual network interface
 virtualNet.address = "100.86.0.2/24"

go.mod

@@ -10,8 +10,8 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/gorilla/websocket v1.5.0
 	github.com/hashicorp/yamux v0.1.1
-	github.com/onsi/ginkgo/v2 v2.23.4
-	github.com/onsi/gomega v1.36.3
+	github.com/onsi/ginkgo/v2 v2.22.0
+	github.com/onsi/gomega v1.34.2
 	github.com/pelletier/go-toml/v2 v2.2.0
 	github.com/pion/stun/v2 v2.0.0
 	github.com/pires/go-proxyproto v0.7.0
@@ -46,11 +46,12 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/pprof v0.0.0-20241206021119-61a79c692802 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
 	github.com/klauspost/reedsolomon v1.12.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/pion/dtls/v2 v2.2.7 // indirect
 	github.com/pion/logging v0.2.2 // indirect
 	github.com/pion/transport/v2 v2.2.1 // indirect
@@ -66,15 +67,14 @@ require (
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
-	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/mock v0.5.0 // indirect
 	golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect
-	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
 	golang.org/x/sys v0.32.0 // indirect
 	golang.org/x/text v0.24.0 // indirect
-	golang.org/x/tools v0.31.0 // indirect
+	golang.org/x/tools v0.28.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect

go.sum

@@ -14,6 +14,7 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
 github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk=
 github.com/coreos/go-oidc/v3 v3.14.1/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -49,11 +50,10 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
+github.com/google/pprof v0.0.0-20241206021119-61a79c692802 h1:US08AXzP0bLurpzFUV3Poa9ZijrRdd1zAIOVtoHEiS8=
+github.com/google/pprof v0.0.0-20241206021119-61a79c692802/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
@@ -72,10 +72,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus=
-github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
-github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU=
-github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
+github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
+github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
+github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
 github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo=
 github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8=
@@ -94,8 +94,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
 github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -154,8 +152,6 @@ github.com/xtaci/kcp-go/v5 v5.6.13/go.mod h1:75S1AKYYzNUSXIv30h+jPKJYZUwqpfvLshu
 github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 h1:EWU6Pktpas0n8lLQwDsRyZfmkPeRbdgPtW609es+/9E=
 github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37/go.mod h1:HpMP7DB2CyokmAh4lp0EQnnWhmycP/TvwBGzvuie+H0=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
-go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
 go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -174,8 +170,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -243,8 +239,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
-golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
+golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
+golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
@@ -265,8 +261,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
+google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

hack/run-e2e.sh

@@ -3,10 +3,10 @@
 SCRIPT=$(readlink -f "$0")
 ROOT=$(unset CDPATH && cd "$(dirname "$SCRIPT")/.." && pwd)
 
-# Check if ginkgo is available
-if ! command -v ginkgo >/dev/null 2>&1; then
+ginkgo_command=$(which ginkgo 2>/dev/null)
+if [ -z "$ginkgo_command" ]; then
     echo "ginkgo not found, try to install..."
-    go install github.com/onsi/ginkgo/v2/ginkgo@v2.23.4
+    go install github.com/onsi/ginkgo/v2/ginkgo@v2.17.1
 fi
 
 debug=false

package.sh

@@ -17,7 +17,7 @@ make -f ./Makefile.cross-compiles
 rm -rf ./release/packages
 mkdir -p ./release/packages
 
-os_all='linux windows darwin freebsd openbsd android'
+os_all='linux windows darwin freebsd android'
 arch_all='386 amd64 arm arm64 mips64 mips64le mips mipsle riscv64 loong64'
 extra_all='_ hf'
 

pkg/config/legacy/client.go

@@ -194,7 +194,7 @@ func UnmarshalClientConfFromIni(source any) (ClientCommonConf, error) {
 	}
 
 	common.Metas = GetMapWithoutPrefix(s.KeysHash(), "meta_")
-	common.OidcAdditionalEndpointParams = GetMapWithoutPrefix(s.KeysHash(), "oidc_additional_")
+	common.ClientConfig.OidcAdditionalEndpointParams = GetMapWithoutPrefix(s.KeysHash(), "oidc_additional_")
 
 	return common, nil
 }
@@ -229,7 +229,10 @@ func LoadAllProxyConfsFromIni(
 		startProxy[s] = struct{}{}
 	}
 
-	startAll := len(startProxy) == 0
+	startAll := true
+	if len(startProxy) > 0 {
+		startAll = false
+	}
 
 	// Build template sections from range section And append to ini.File.
 	rangeSections := make([]*ini.Section, 0)

pkg/config/legacy/conversion.go

@@ -26,20 +26,20 @@ import (
 func Convert_ClientCommonConf_To_v1(conf *ClientCommonConf) *v1.ClientCommonConfig {
 	out := &v1.ClientCommonConfig{}
 	out.User = conf.User
-	out.Auth.Method = v1.AuthMethod(conf.AuthenticationMethod)
-	out.Auth.Token = conf.Token
-	if conf.AuthenticateHeartBeats {
+	out.Auth.Method = v1.AuthMethod(conf.ClientConfig.AuthenticationMethod)
+	out.Auth.Token = conf.ClientConfig.Token
+	if conf.ClientConfig.AuthenticateHeartBeats {
 		out.Auth.AdditionalScopes = append(out.Auth.AdditionalScopes, v1.AuthScopeHeartBeats)
 	}
-	if conf.AuthenticateNewWorkConns {
+	if conf.ClientConfig.AuthenticateNewWorkConns {
 		out.Auth.AdditionalScopes = append(out.Auth.AdditionalScopes, v1.AuthScopeNewWorkConns)
 	}
-	out.Auth.OIDC.ClientID = conf.OidcClientID
-	out.Auth.OIDC.ClientSecret = conf.OidcClientSecret
-	out.Auth.OIDC.Audience = conf.OidcAudience
-	out.Auth.OIDC.Scope = conf.OidcScope
-	out.Auth.OIDC.TokenEndpointURL = conf.OidcTokenEndpointURL
-	out.Auth.OIDC.AdditionalEndpointParams = conf.OidcAdditionalEndpointParams
+	out.Auth.OIDC.ClientID = conf.ClientConfig.OidcClientID
+	out.Auth.OIDC.ClientSecret = conf.ClientConfig.OidcClientSecret
+	out.Auth.OIDC.Audience = conf.ClientConfig.OidcAudience
+	out.Auth.OIDC.Scope = conf.ClientConfig.OidcScope
+	out.Auth.OIDC.TokenEndpointURL = conf.ClientConfig.OidcTokenEndpointURL
+	out.Auth.OIDC.AdditionalEndpointParams = conf.ClientConfig.OidcAdditionalEndpointParams
 
 	out.ServerAddr = conf.ServerAddr
 	out.ServerPort = conf.ServerPort
@@ -59,10 +59,10 @@ func Convert_ClientCommonConf_To_v1(conf *ClientCommonConf) *v1.ClientCommonConf
 	out.Transport.QUIC.MaxIncomingStreams = conf.QUICMaxIncomingStreams
 	out.Transport.TLS.Enable = lo.ToPtr(conf.TLSEnable)
 	out.Transport.TLS.DisableCustomTLSFirstByte = lo.ToPtr(conf.DisableCustomTLSFirstByte)
-	out.Transport.TLS.CertFile = conf.TLSCertFile
-	out.Transport.TLS.KeyFile = conf.TLSKeyFile
-	out.Transport.TLS.TrustedCaFile = conf.TLSTrustedCaFile
-	out.Transport.TLS.ServerName = conf.TLSServerName
+	out.Transport.TLS.TLSConfig.CertFile = conf.TLSCertFile
+	out.Transport.TLS.TLSConfig.KeyFile = conf.TLSKeyFile
+	out.Transport.TLS.TLSConfig.TrustedCaFile = conf.TLSTrustedCaFile
+	out.Transport.TLS.TLSConfig.ServerName = conf.TLSServerName
 
 	out.Log.To = conf.LogFile
 	out.Log.Level = conf.LogLevel
@@ -87,18 +87,18 @@ func Convert_ClientCommonConf_To_v1(conf *ClientCommonConf) *v1.ClientCommonConf
 
 func Convert_ServerCommonConf_To_v1(conf *ServerCommonConf) *v1.ServerConfig {
 	out := &v1.ServerConfig{}
-	out.Auth.Method = v1.AuthMethod(conf.AuthenticationMethod)
-	out.Auth.Token = conf.Token
-	if conf.AuthenticateHeartBeats {
+	out.Auth.Method = v1.AuthMethod(conf.ServerConfig.AuthenticationMethod)
+	out.Auth.Token = conf.ServerConfig.Token
+	if conf.ServerConfig.AuthenticateHeartBeats {
 		out.Auth.AdditionalScopes = append(out.Auth.AdditionalScopes, v1.AuthScopeHeartBeats)
 	}
-	if conf.AuthenticateNewWorkConns {
+	if conf.ServerConfig.AuthenticateNewWorkConns {
 		out.Auth.AdditionalScopes = append(out.Auth.AdditionalScopes, v1.AuthScopeNewWorkConns)
 	}
-	out.Auth.OIDC.Audience = conf.OidcAudience
-	out.Auth.OIDC.Issuer = conf.OidcIssuer
-	out.Auth.OIDC.SkipExpiryCheck = conf.OidcSkipExpiryCheck
-	out.Auth.OIDC.SkipIssuerCheck = conf.OidcSkipIssuerCheck
+	out.Auth.OIDC.Audience = conf.ServerConfig.OidcAudience
+	out.Auth.OIDC.Issuer = conf.ServerConfig.OidcIssuer
+	out.Auth.OIDC.SkipExpiryCheck = conf.ServerConfig.OidcSkipExpiryCheck
+	out.Auth.OIDC.SkipIssuerCheck = conf.ServerConfig.OidcSkipIssuerCheck
 
 	out.BindAddr = conf.BindAddr
 	out.BindPort = conf.BindPort

pkg/config/legacy/proxy.go

@@ -206,7 +206,7 @@ func (cfg *BaseProxyConf) decorate(_ string, name string, section *ini.Section)
 	}
 
 	// plugin_xxx
-	cfg.PluginParams = GetMapByPrefix(section.KeysHash(), "plugin_")
+	cfg.LocalSvrConf.PluginParams = GetMapByPrefix(section.KeysHash(), "plugin_")
 	return nil
 }
 

pkg/config/load.go

@@ -111,33 +111,6 @@ func LoadConfigureFromFile(path string, c any, strict bool) error {
 	return LoadConfigure(content, c, strict)
 }
 
-// parseYAMLWithDotFieldsHandling parses YAML with dot-prefixed fields handling
-// This function handles both cases efficiently: with or without dot fields
-func parseYAMLWithDotFieldsHandling(content []byte, target any) error {
-	var temp any
-	if err := yaml.Unmarshal(content, &temp); err != nil {
-		return err
-	}
-
-	// Remove dot fields if it's a map
-	if tempMap, ok := temp.(map[string]any); ok {
-		for key := range tempMap {
-			if strings.HasPrefix(key, ".") {
-				delete(tempMap, key)
-			}
-		}
-	}
-
-	// Convert to JSON and decode with strict validation
-	jsonBytes, err := json.Marshal(temp)
-	if err != nil {
-		return err
-	}
-	decoder := json.NewDecoder(bytes.NewReader(jsonBytes))
-	decoder.DisallowUnknownFields()
-	return decoder.Decode(target)
-}
-
 // LoadConfigure loads configuration from bytes and unmarshal into c.
 // Now it supports json, yaml and toml format.
 func LoadConfigure(b []byte, c any, strict bool) error {
@@ -161,13 +134,10 @@ func LoadConfigure(b []byte, c any, strict bool) error {
 		}
 		return decoder.Decode(c)
 	}
-
-	// Handle YAML content
+	// It wasn't JSON. Unmarshal as YAML.
 	if strict {
-		// In strict mode, always use our custom handler to support YAML merge
-		return parseYAMLWithDotFieldsHandling(b, c)
+		return yaml.UnmarshalStrict(b, c)
 	}
-	// Non-strict mode, parse normally
 	return yaml.Unmarshal(b, c)
 }
 

pkg/config/load_test.go

@@ -187,122 +187,3 @@ unixPath = "/tmp/uds.sock"
 	err = LoadConfigure([]byte(pluginStr), &clientCfg, true)
 	require.Error(err)
 }
-
-// TestYAMLMergeInStrictMode tests that YAML merge functionality works
-// even in strict mode by properly handling dot-prefixed fields
-func TestYAMLMergeInStrictMode(t *testing.T) {
-	require := require.New(t)
-
-	yamlContent := `
-serverAddr: "127.0.0.1"
-serverPort: 7000
-
-.common: &common
-  type: stcp
-  secretKey: "test-secret"
-  localIP: 127.0.0.1
-  transport:
-    useEncryption: true
-    useCompression: true
-
-proxies:
-- name: ssh
-  localPort: 22
-  <<: *common
-- name: web
-  localPort: 80
-  <<: *common
-`
-
-	clientCfg := v1.ClientConfig{}
-	// This should work in strict mode
-	err := LoadConfigure([]byte(yamlContent), &clientCfg, true)
-	require.NoError(err)
-
-	// Verify the merge worked correctly
-	require.Equal("127.0.0.1", clientCfg.ServerAddr)
-	require.Equal(7000, clientCfg.ServerPort)
-	require.Len(clientCfg.Proxies, 2)
-
-	// Check first proxy
-	sshProxy := clientCfg.Proxies[0].ProxyConfigurer
-	require.Equal("ssh", sshProxy.GetBaseConfig().Name)
-	require.Equal("stcp", sshProxy.GetBaseConfig().Type)
-
-	// Check second proxy
-	webProxy := clientCfg.Proxies[1].ProxyConfigurer
-	require.Equal("web", webProxy.GetBaseConfig().Name)
-	require.Equal("stcp", webProxy.GetBaseConfig().Type)
-}
-
-// TestOptimizedYAMLProcessing tests the optimization logic for YAML processing
-func TestOptimizedYAMLProcessing(t *testing.T) {
-	require := require.New(t)
-
-	yamlWithDotFields := []byte(`
-serverAddr: "127.0.0.1"
-.common: &common
-  type: stcp
-proxies:
-- name: test
-  <<: *common
-`)
-
-	yamlWithoutDotFields := []byte(`
-serverAddr: "127.0.0.1"
-proxies:
-- name: test
-  type: tcp
-  localPort: 22
-`)
-
-	// Test that YAML without dot fields works in strict mode
-	clientCfg := v1.ClientConfig{}
-	err := LoadConfigure(yamlWithoutDotFields, &clientCfg, true)
-	require.NoError(err)
-	require.Equal("127.0.0.1", clientCfg.ServerAddr)
-	require.Len(clientCfg.Proxies, 1)
-	require.Equal("test", clientCfg.Proxies[0].ProxyConfigurer.GetBaseConfig().Name)
-
-	// Test that YAML with dot fields still works in strict mode
-	err = LoadConfigure(yamlWithDotFields, &clientCfg, true)
-	require.NoError(err)
-	require.Equal("127.0.0.1", clientCfg.ServerAddr)
-	require.Len(clientCfg.Proxies, 1)
-	require.Equal("test", clientCfg.Proxies[0].ProxyConfigurer.GetBaseConfig().Name)
-	require.Equal("stcp", clientCfg.Proxies[0].ProxyConfigurer.GetBaseConfig().Type)
-}
-
-// TestYAMLEdgeCases tests edge cases for YAML parsing, including non-map types
-func TestYAMLEdgeCases(t *testing.T) {
-	require := require.New(t)
-
-	// Test array at root (should fail for frp config)
-	arrayYAML := []byte(`
-- item1
-- item2
-`)
-	clientCfg := v1.ClientConfig{}
-	err := LoadConfigure(arrayYAML, &clientCfg, true)
-	require.Error(err) // Should fail because ClientConfig expects an object
-
-	// Test scalar at root (should fail for frp config)
-	scalarYAML := []byte(`"just a string"`)
-	err = LoadConfigure(scalarYAML, &clientCfg, true)
-	require.Error(err) // Should fail because ClientConfig expects an object
-
-	// Test empty object (should work)
-	emptyYAML := []byte(`{}`)
-	err = LoadConfigure(emptyYAML, &clientCfg, true)
-	require.NoError(err)
-
-	// Test nested structure without dots (should work)
-	nestedYAML := []byte(`
-serverAddr: "127.0.0.1"
-serverPort: 7000
-`)
-	err = LoadConfigure(nestedYAML, &clientCfg, true)
-	require.NoError(err)
-	require.Equal("127.0.0.1", clientCfg.ServerAddr)
-	require.Equal(7000, clientCfg.ServerPort)
-}

pkg/config/v1/proxy.go

@@ -129,7 +129,7 @@ func (c *ProxyBaseConfig) Complete(namePrefix string) {
 	c.Transport.BandwidthLimitMode = util.EmptyOr(c.Transport.BandwidthLimitMode, types.BandwidthLimitModeClient)
 
 	if c.Plugin.ClientPluginOptions != nil {
-		c.Plugin.Complete()
+		c.Plugin.ClientPluginOptions.Complete()
 	}
 }
 

pkg/metrics/mem/server.go

@@ -109,7 +109,7 @@ func (m *serverMetrics) NewProxy(name string, proxyType string) {
 	m.info.ProxyTypeCounts[proxyType] = counter
 
 	proxyStats, ok := m.info.ProxyStatistics[name]
-	if !ok || proxyStats.ProxyType != proxyType {
+	if !(ok && proxyStats.ProxyType == proxyType) {
 		proxyStats = &ProxyStatistics{
 			Name:       name,
 			ProxyType:  proxyType,

pkg/plugin/client/virtual_net.go

@@ -18,10 +18,9 @@ package client
 
 import (
 	"context"
-	"io"
-	"sync"
 
 	v1 "github.com/fatedier/frp/pkg/config/v1"
+	"github.com/fatedier/frp/pkg/util/xlog"
 )
 
 func init() {
@@ -31,8 +30,6 @@ func init() {
 type VirtualNetPlugin struct {
 	pluginCtx PluginContext
 	opts      *v1.VirtualNetPluginOptions
-	mu        sync.Mutex
-	conns     map[io.ReadWriteCloser]struct{}
 }
 
 func NewVirtualNetPlugin(pluginCtx PluginContext, options v1.ClientPluginOptions) (Plugin, error) {
@@ -46,32 +43,19 @@ func NewVirtualNetPlugin(pluginCtx PluginContext, options v1.ClientPluginOptions
 }
 
 func (p *VirtualNetPlugin) Handle(ctx context.Context, connInfo *ConnectionInfo) {
+	xl := xlog.FromContextSafe(ctx)
+
 	// Verify if virtual network controller is available
 	if p.pluginCtx.VnetController == nil {
 		return
 	}
 
-	// Add the connection before starting the read loop to avoid race condition
-	// where RemoveConn might be called before the connection is added.
-	p.mu.Lock()
-	if p.conns == nil {
-		p.conns = make(map[io.ReadWriteCloser]struct{})
-	}
-	p.conns[connInfo.Conn] = struct{}{}
-	p.mu.Unlock()
-
-	// Register the connection with the controller and pass the cleanup function
-	p.pluginCtx.VnetController.StartServerConnReadLoop(ctx, connInfo.Conn, func() {
-		p.RemoveConn(connInfo.Conn)
-	})
-}
-
-func (p *VirtualNetPlugin) RemoveConn(conn io.ReadWriteCloser) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	// Check if the map exists, as Close might have set it to nil concurrently
-	if p.conns != nil {
-		delete(p.conns, conn)
+	// Register the connection with the controller
+	routeName := p.pluginCtx.Name
+	err := p.pluginCtx.VnetController.RegisterServerConn(ctx, routeName, connInfo.Conn)
+	if err != nil {
+		xl.Errorf("virtual net failed to register server connection: %v", err)
+		return
 	}
 }
 
@@ -80,13 +64,8 @@ func (p *VirtualNetPlugin) Name() string {
 }
 
 func (p *VirtualNetPlugin) Close() error {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	// Close any remaining connections
-	for conn := range p.conns {
-		_ = conn.Close()
+	if p.pluginCtx.VnetController != nil {
+		p.pluginCtx.VnetController.UnregisterServerConn(p.pluginCtx.Name)
 	}
-	p.conns = nil
 	return nil
 }

pkg/plugin/visitor/virtual_net.go

@@ -60,7 +60,7 @@ func NewVirtualNetPlugin(pluginCtx PluginContext, options v1.VisitorPluginOption
 		return nil, errors.New("destinationIP is required")
 	}
 
-	// Parse DestinationIP and create a host route.
+	// Parse DestinationIP as a single IP and create a host route
 	ip := net.ParseIP(opts.DestinationIP)
 	if ip == nil {
 		return nil, fmt.Errorf("invalid destination IP address [%s]", opts.DestinationIP)
@@ -91,7 +91,7 @@ func (p *VirtualNetPlugin) Start() {
 	if len(p.routes) > 0 {
 		routeStr = p.routes[0].String()
 	}
-	xl.Infof("starting VirtualNetPlugin for visitor [%s], attempting to register routes for %s", p.pluginCtx.Name, routeStr)
+	xl.Infof("Starting VirtualNetPlugin for visitor [%s], attempting to register routes for %s", p.pluginCtx.Name, routeStr)
 
 	go p.run()
 }
@@ -101,8 +101,10 @@ func (p *VirtualNetPlugin) run() {
 	reconnectDelay := 10 * time.Second
 
 	for {
+		// Create a signal channel for this connection attempt
 		currentCloseSignal := make(chan struct{})
 
+		// Store the signal channel under lock
 		p.mu.Lock()
 		p.closeSignal = currentCloseSignal
 		p.mu.Unlock()
@@ -110,6 +112,7 @@ func (p *VirtualNetPlugin) run() {
 		select {
 		case <-p.ctx.Done():
 			xl.Infof("VirtualNetPlugin run loop for visitor [%s] stopping (context cancelled before pipe creation).", p.pluginCtx.Name)
+			// Ensure controllerConn from previous loop is cleaned up if necessary
 			p.cleanupControllerConn(xl)
 			return
 		default:
@@ -117,43 +120,65 @@ func (p *VirtualNetPlugin) run() {
 
 		controllerConn, pluginConn := net.Pipe()
 
+		// Store controllerConn under lock for cleanup purposes
 		p.mu.Lock()
 		p.controllerConn = controllerConn
 		p.mu.Unlock()
 
+		// Wrap pluginConn using CloseNotifyConn
 		pluginNotifyConn := netutil.WrapCloseNotifyConn(pluginConn, func() {
-			close(currentCloseSignal) // Signal the run loop on close.
+			close(currentCloseSignal) // Signal the run loop
 		})
 
-		xl.Infof("attempting to register client route for visitor [%s]", p.pluginCtx.Name)
-		p.pluginCtx.VnetController.RegisterClientRoute(p.ctx, p.pluginCtx.Name, p.routes, controllerConn)
-		xl.Infof("successfully registered client route for visitor [%s]. Starting connection handler with CloseNotifyConn.", p.pluginCtx.Name)
+		xl.Infof("Attempting to register client route for visitor [%s]", p.pluginCtx.Name)
+		err := p.pluginCtx.VnetController.RegisterClientRoute(p.ctx, p.pluginCtx.Name, p.routes, controllerConn)
+		if err != nil {
+			xl.Errorf("Failed to register client route for visitor [%s]: %v. Retrying after %v", p.pluginCtx.Name, err, reconnectDelay)
+			p.cleanupPipePair(xl, controllerConn, pluginConn) // Close both ends on registration failure
+
+			// Wait before retrying registration, unless context is cancelled
+			select {
+			case <-time.After(reconnectDelay):
+				continue // Retry the loop
+			case <-p.ctx.Done():
+				xl.Infof("VirtualNetPlugin registration retry wait interrupted for visitor [%s]", p.pluginCtx.Name)
+				return // Exit loop if context is cancelled during wait
+			}
+		}
+
+		xl.Infof("Successfully registered client route for visitor [%s]. Starting connection handler with CloseNotifyConn.", p.pluginCtx.Name)
 
 		// Pass the CloseNotifyConn to HandleConn.
 		// HandleConn is responsible for calling Close() on pluginNotifyConn.
 		p.pluginCtx.HandleConn(pluginNotifyConn)
 
-		// Wait for context cancellation or connection close.
+		// Wait for either the plugin context to be cancelled or the wrapper's Close() to be called via the signal channel.
 		select {
 		case <-p.ctx.Done():
 			xl.Infof("VirtualNetPlugin run loop stopping for visitor [%s] (context cancelled while waiting).", p.pluginCtx.Name)
+			// Context cancelled, ensure controller side is closed if HandleConn didn't close its side yet.
 			p.cleanupControllerConn(xl)
 			return
 		case <-currentCloseSignal:
-			xl.Infof("detected connection closed via CloseNotifyConn for visitor [%s].", p.pluginCtx.Name)
-			// HandleConn closed the plugin side. Close the controller side.
+			xl.Infof("Detected connection closed via CloseNotifyConn for visitor [%s].", p.pluginCtx.Name)
+			// HandleConn closed the plugin side (pluginNotifyConn). The closeFn was called, closing currentCloseSignal.
+			// We still need to close the controller side.
 			p.cleanupControllerConn(xl)
 
-			xl.Infof("waiting %v before attempting reconnection for visitor [%s]...", reconnectDelay, p.pluginCtx.Name)
+			// Add a delay before attempting to reconnect, respecting context cancellation.
+			xl.Infof("Waiting %v before attempting reconnection for visitor [%s]...", reconnectDelay, p.pluginCtx.Name)
 			select {
 			case <-time.After(reconnectDelay):
+				// Delay completed, loop will continue.
 			case <-p.ctx.Done():
 				xl.Infof("VirtualNetPlugin reconnection delay interrupted for visitor [%s]", p.pluginCtx.Name)
-				return
+				return // Exit loop if context is cancelled during wait
 			}
+			// Loop will continue to reconnect.
 		}
 
-		xl.Infof("re-establishing virtual connection for visitor [%s]...", p.pluginCtx.Name)
+		// Loop will restart, context check at the beginning of the loop is sufficient.
+		xl.Infof("Re-establishing virtual connection for visitor [%s]...", p.pluginCtx.Name)
 	}
 }
 
@@ -162,31 +187,46 @@ func (p *VirtualNetPlugin) cleanupControllerConn(xl *xlog.Logger) {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 	if p.controllerConn != nil {
-		xl.Debugf("cleaning up controllerConn for visitor [%s]", p.pluginCtx.Name)
+		xl.Debugf("Cleaning up controllerConn for visitor [%s]", p.pluginCtx.Name)
 		p.controllerConn.Close()
 		p.controllerConn = nil
 	}
+	// Also clear the closeSignal reference for the completed/cancelled connection attempt
 	p.closeSignal = nil
 }
 
+// cleanupPipePair closes both ends of a pipe, used typically when registration fails.
+func (p *VirtualNetPlugin) cleanupPipePair(xl *xlog.Logger, controllerConn, pluginConn net.Conn) {
+	xl.Debugf("Cleaning up pipe pair for visitor [%s] after registration failure", p.pluginCtx.Name)
+	controllerConn.Close()
+	pluginConn.Close()
+	p.mu.Lock()
+	p.controllerConn = nil // Ensure field is nil if it was briefly set
+	p.closeSignal = nil    // Ensure field is nil if it was briefly set
+	p.mu.Unlock()
+}
+
 // Close initiates the plugin shutdown.
 func (p *VirtualNetPlugin) Close() error {
-	xl := xlog.FromContextSafe(p.pluginCtx.Ctx)
-	xl.Infof("closing VirtualNetPlugin for visitor [%s]", p.pluginCtx.Name)
+	xl := xlog.FromContextSafe(p.pluginCtx.Ctx) // Use base context for close logging
+	xl.Infof("Closing VirtualNetPlugin for visitor [%s]", p.pluginCtx.Name)
 
-	// Signal the run loop goroutine to stop.
+	// 1. Signal the run loop goroutine to stop via context cancellation.
 	p.cancel()
 
-	// Unregister the route from the controller.
+	// 2. Unregister the route from the controller.
+	// This might implicitly cause the VnetController to close its end of the pipe (controllerConn).
 	if p.pluginCtx.VnetController != nil {
 		p.pluginCtx.VnetController.UnregisterClientRoute(p.pluginCtx.Name)
-		xl.Infof("unregistered client route for visitor [%s]", p.pluginCtx.Name)
+		xl.Infof("Unregistered client route for visitor [%s]", p.pluginCtx.Name)
+	} else {
+		xl.Warnf("VnetController is nil during close for visitor [%s], cannot unregister route", p.pluginCtx.Name)
 	}
 
-	// Explicitly close the controller side of the pipe.
+	// 3. Explicitly close the controller side of the pipe managed by this plugin.
 	// This ensures the pipe is broken even if the run loop is stuck or HandleConn hasn't closed its end.
 	p.cleanupControllerConn(xl)
-	xl.Infof("finished cleaning up connections during close for visitor [%s]", p.pluginCtx.Name)
+	xl.Infof("Finished cleaning up connections during close for visitor [%s]", p.pluginCtx.Name)
 
 	return nil
 }

pkg/proto/udp/udp.go

@@ -24,7 +24,6 @@ import (
 	"github.com/fatedier/golib/pool"
 
 	"github.com/fatedier/frp/pkg/msg"
-	netpkg "github.com/fatedier/frp/pkg/util/net"
 )
 
 func NewUDPPacket(buf []byte, laddr, raddr *net.UDPAddr) *msg.UDPPacket {
@@ -70,7 +69,7 @@ func ForwardUserConn(udpConn *net.UDPConn, readCh <-chan *msg.UDPPacket, sendCh
 	}
 }
 
-func Forwarder(dstAddr *net.UDPAddr, readCh <-chan *msg.UDPPacket, sendCh chan<- msg.Message, bufSize int, proxyProtocolVersion string) {
+func Forwarder(dstAddr *net.UDPAddr, readCh <-chan *msg.UDPPacket, sendCh chan<- msg.Message, bufSize int) {
 	var mu sync.RWMutex
 	udpConnMap := make(map[string]*net.UDPConn)
 
@@ -111,7 +110,6 @@ func Forwarder(dstAddr *net.UDPAddr, readCh <-chan *msg.UDPPacket, sendCh chan<-
 			if err != nil {
 				continue
 			}
-
 			mu.Lock()
 			udpConn, ok := udpConnMap[udpMsg.RemoteAddr.String()]
 			if !ok {
@@ -124,18 +122,6 @@ func Forwarder(dstAddr *net.UDPAddr, readCh <-chan *msg.UDPPacket, sendCh chan<-
 			}
 			mu.Unlock()
 
-			// Add proxy protocol header if configured
-			if proxyProtocolVersion != "" && udpMsg.RemoteAddr != nil {
-				ppBuf, err := netpkg.BuildProxyProtocolHeader(udpMsg.RemoteAddr, dstAddr, proxyProtocolVersion)
-				if err == nil {
-					// Prepend proxy protocol header to the UDP payload
-					finalBuf := make([]byte, len(ppBuf)+len(buf))
-					copy(finalBuf, ppBuf)
-					copy(finalBuf[len(ppBuf):], buf)
-					buf = finalBuf
-				}
-			}
-
 			_, err = udpConn.Write(buf)
 			if err != nil {
 				udpConn.Close()

pkg/proto/udp/udp_test.go

@@ -3,16 +3,16 @@ package udp
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestUdpPacket(t *testing.T) {
-	require := require.New(t)
+	assert := assert.New(t)
 
 	buf := []byte("hello world")
 	udpMsg := NewUDPPacket(buf, nil, nil)
 
 	newBuf, err := GetContent(udpMsg)
-	require.NoError(err)
-	require.EqualValues(buf, newBuf)
+	assert.NoError(err)
+	assert.EqualValues(buf, newBuf)
 }

pkg/util/metric/counter_test.go

@@ -3,21 +3,21 @@ package metric
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCounter(t *testing.T) {
-	require := require.New(t)
+	assert := assert.New(t)
 	c := NewCounter()
 	c.Inc(10)
-	require.EqualValues(10, c.Count())
+	assert.EqualValues(10, c.Count())
 
 	c.Dec(5)
-	require.EqualValues(5, c.Count())
+	assert.EqualValues(5, c.Count())
 
 	cTmp := c.Snapshot()
-	require.EqualValues(5, cTmp.Count())
+	assert.EqualValues(5, cTmp.Count())
 
 	c.Clear()
-	require.EqualValues(0, c.Count())
+	assert.EqualValues(0, c.Count())
 }

pkg/util/metric/date_counter_test.go

@@ -3,25 +3,25 @@ package metric
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDateCounter(t *testing.T) {
-	require := require.New(t)
+	assert := assert.New(t)
 
 	dc := NewDateCounter(3)
 	dc.Inc(10)
-	require.EqualValues(10, dc.TodayCount())
+	assert.EqualValues(10, dc.TodayCount())
 
 	dc.Dec(5)
-	require.EqualValues(5, dc.TodayCount())
+	assert.EqualValues(5, dc.TodayCount())
 
 	counts := dc.GetLastDaysCount(3)
-	require.EqualValues(3, len(counts))
-	require.EqualValues(5, counts[0])
-	require.EqualValues(0, counts[1])
-	require.EqualValues(0, counts[2])
+	assert.EqualValues(3, len(counts))
+	assert.EqualValues(5, counts[0])
+	assert.EqualValues(0, counts[1])
+	assert.EqualValues(0, counts[2])
 
 	dcTmp := dc.Snapshot()
-	require.EqualValues(5, dcTmp.TodayCount())
+	assert.EqualValues(5, dcTmp.TodayCount())
 }

pkg/util/net/conn.go

@@ -223,7 +223,7 @@ func (conn *wrapQuicStream) RemoteAddr() net.Addr {
 }
 
 func (conn *wrapQuicStream) Close() error {
-	conn.CancelRead(0)
+	conn.Stream.CancelRead(0)
 	return conn.Stream.Close()
 }
 

pkg/util/net/proxyprotocol.go

@@ -1,45 +0,0 @@
-// Copyright 2025 The frp Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package net
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-
-	pp "github.com/pires/go-proxyproto"
-)
-
-func BuildProxyProtocolHeaderStruct(srcAddr, dstAddr net.Addr, version string) *pp.Header {
-	var versionByte byte
-	if version == "v1" {
-		versionByte = 1
-	} else {
-		versionByte = 2 // default to v2
-	}
-	return pp.HeaderProxyFromAddrs(versionByte, srcAddr, dstAddr)
-}
-
-func BuildProxyProtocolHeader(srcAddr, dstAddr net.Addr, version string) ([]byte, error) {
-	h := BuildProxyProtocolHeaderStruct(srcAddr, dstAddr, version)
-
-	// Convert header to bytes using a buffer
-	var buf bytes.Buffer
-	_, err := h.WriteTo(&buf)
-	if err != nil {
-		return nil, fmt.Errorf("failed to write proxy protocol header: %v", err)
-	}
-	return buf.Bytes(), nil
-}

pkg/util/net/proxyprotocol_test.go

@@ -1,178 +0,0 @@
-package net
-
-import (
-	"net"
-	"testing"
-
-	pp "github.com/pires/go-proxyproto"
-	"github.com/stretchr/testify/require"
-)
-
-func TestBuildProxyProtocolHeader(t *testing.T) {
-	require := require.New(t)
-
-	tests := []struct {
-		name        string
-		srcAddr     net.Addr
-		dstAddr     net.Addr
-		version     string
-		expectError bool
-	}{
-		{
-			name:        "UDP IPv4 v2",
-			srcAddr:     &net.UDPAddr{IP: net.ParseIP("192.168.1.100"), Port: 12345},
-			dstAddr:     &net.UDPAddr{IP: net.ParseIP("10.0.0.1"), Port: 3306},
-			version:     "v2",
-			expectError: false,
-		},
-		{
-			name:        "TCP IPv4 v1",
-			srcAddr:     &net.TCPAddr{IP: net.ParseIP("192.168.1.100"), Port: 12345},
-			dstAddr:     &net.TCPAddr{IP: net.ParseIP("10.0.0.1"), Port: 80},
-			version:     "v1",
-			expectError: false,
-		},
-		{
-			name:        "UDP IPv6 v2",
-			srcAddr:     &net.UDPAddr{IP: net.ParseIP("2001:db8::1"), Port: 12345},
-			dstAddr:     &net.UDPAddr{IP: net.ParseIP("::1"), Port: 3306},
-			version:     "v2",
-			expectError: false,
-		},
-		{
-			name:        "TCP IPv6 v1",
-			srcAddr:     &net.TCPAddr{IP: net.ParseIP("::1"), Port: 12345},
-			dstAddr:     &net.TCPAddr{IP: net.ParseIP("2001:db8::1"), Port: 80},
-			version:     "v1",
-			expectError: false,
-		},
-		{
-			name:        "nil source address",
-			srcAddr:     nil,
-			dstAddr:     &net.UDPAddr{IP: net.ParseIP("10.0.0.1"), Port: 3306},
-			version:     "v2",
-			expectError: false,
-		},
-		{
-			name:        "nil destination address",
-			srcAddr:     &net.TCPAddr{IP: net.ParseIP("192.168.1.100"), Port: 12345},
-			dstAddr:     nil,
-			version:     "v2",
-			expectError: false,
-		},
-		{
-			name:        "unsupported address type",
-			srcAddr:     &net.UnixAddr{Name: "/tmp/test.sock", Net: "unix"},
-			dstAddr:     &net.UDPAddr{IP: net.ParseIP("10.0.0.1"), Port: 3306},
-			version:     "v2",
-			expectError: false,
-		},
-	}
-
-	for _, tt := range tests {
-		header, err := BuildProxyProtocolHeader(tt.srcAddr, tt.dstAddr, tt.version)
-
-		if tt.expectError {
-			require.Error(err, "test case: %s", tt.name)
-			continue
-		}
-
-		require.NoError(err, "test case: %s", tt.name)
-		require.NotEmpty(header, "test case: %s", tt.name)
-	}
-}
-
-func TestBuildProxyProtocolHeaderStruct(t *testing.T) {
-	require := require.New(t)
-
-	tests := []struct {
-		name               string
-		srcAddr            net.Addr
-		dstAddr            net.Addr
-		version            string
-		expectedProtocol   pp.AddressFamilyAndProtocol
-		expectedVersion    byte
-		expectedCommand    pp.ProtocolVersionAndCommand
-		expectedSourceAddr net.Addr
-		expectedDestAddr   net.Addr
-	}{
-		{
-			name:               "TCP IPv4 v2",
-			srcAddr:            &net.TCPAddr{IP: net.ParseIP("192.168.1.100"), Port: 12345},
-			dstAddr:            &net.TCPAddr{IP: net.ParseIP("10.0.0.1"), Port: 80},
-			version:            "v2",
-			expectedProtocol:   pp.TCPv4,
-			expectedVersion:    2,
-			expectedCommand:    pp.PROXY,
-			expectedSourceAddr: &net.TCPAddr{IP: net.ParseIP("192.168.1.100"), Port: 12345},
-			expectedDestAddr:   &net.TCPAddr{IP: net.ParseIP("10.0.0.1"), Port: 80},
-		},
-		{
-			name:               "UDP IPv6 v1",
-			srcAddr:            &net.UDPAddr{IP: net.ParseIP("2001:db8::1"), Port: 12345},
-			dstAddr:            &net.UDPAddr{IP: net.ParseIP("::1"), Port: 3306},
-			version:            "v1",
-			expectedProtocol:   pp.UDPv6,
-			expectedVersion:    1,
-			expectedCommand:    pp.PROXY,
-			expectedSourceAddr: &net.UDPAddr{IP: net.ParseIP("2001:db8::1"), Port: 12345},
-			expectedDestAddr:   &net.UDPAddr{IP: net.ParseIP("::1"), Port: 3306},
-		},
-		{
-			name:               "TCP IPv6 default version",
-			srcAddr:            &net.TCPAddr{IP: net.ParseIP("::1"), Port: 12345},
-			dstAddr:            &net.TCPAddr{IP: net.ParseIP("2001:db8::1"), Port: 80},
-			version:            "",
-			expectedProtocol:   pp.TCPv6,
-			expectedVersion:    2, // default to v2
-			expectedCommand:    pp.PROXY,
-			expectedSourceAddr: &net.TCPAddr{IP: net.ParseIP("::1"), Port: 12345},
-			expectedDestAddr:   &net.TCPAddr{IP: net.ParseIP("2001:db8::1"), Port: 80},
-		},
-		{
-			name:               "nil source address",
-			srcAddr:            nil,
-			dstAddr:            &net.UDPAddr{IP: net.ParseIP("10.0.0.1"), Port: 3306},
-			version:            "v2",
-			expectedProtocol:   pp.UNSPEC,
-			expectedVersion:    2,
-			expectedCommand:    pp.LOCAL,
-			expectedSourceAddr: nil, // go-proxyproto sets both to nil when srcAddr is nil
-			expectedDestAddr:   nil,
-		},
-		{
-			name:               "nil destination address",
-			srcAddr:            &net.TCPAddr{IP: net.ParseIP("192.168.1.100"), Port: 12345},
-			dstAddr:            nil,
-			version:            "v2",
-			expectedProtocol:   pp.UNSPEC,
-			expectedVersion:    2,
-			expectedCommand:    pp.LOCAL,
-			expectedSourceAddr: nil, // go-proxyproto sets both to nil when dstAddr is nil
-			expectedDestAddr:   nil,
-		},
-		{
-			name:               "unsupported address type",
-			srcAddr:            &net.UnixAddr{Name: "/tmp/test.sock", Net: "unix"},
-			dstAddr:            &net.UDPAddr{IP: net.ParseIP("10.0.0.1"), Port: 3306},
-			version:            "v2",
-			expectedProtocol:   pp.UNSPEC,
-			expectedVersion:    2,
-			expectedCommand:    pp.LOCAL,
-			expectedSourceAddr: nil, // go-proxyproto sets both to nil for unsupported types
-			expectedDestAddr:   nil,
-		},
-	}
-
-	for _, tt := range tests {
-		header := BuildProxyProtocolHeaderStruct(tt.srcAddr, tt.dstAddr, tt.version)
-
-		require.NotNil(header, "test case: %s", tt.name)
-
-		require.Equal(tt.expectedCommand, header.Command, "test case: %s", tt.name)
-		require.Equal(tt.expectedSourceAddr, header.SourceAddr, "test case: %s", tt.name)
-		require.Equal(tt.expectedDestAddr, header.DestinationAddr, "test case: %s", tt.name)
-		require.Equal(tt.expectedProtocol, header.TransportProtocol, "test case: %s", tt.name)
-		require.Equal(tt.expectedVersion, header.Version, "test case: %s", tt.name)
-	}
-}

pkg/util/util/util_test.go

@@ -3,41 +3,45 @@ package util
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestRandId(t *testing.T) {
-	require := require.New(t)
+	assert := assert.New(t)
 	id, err := RandID()
-	require.NoError(err)
+	assert.NoError(err)
 	t.Log(id)
-	require.Equal(16, len(id))
+	assert.Equal(16, len(id))
 }
 
 func TestGetAuthKey(t *testing.T) {
-	require := require.New(t)
+	assert := assert.New(t)
 	key := GetAuthKey("1234", 1488720000)
-	require.Equal("6df41a43725f0c770fd56379e12acf8c", key)
+	assert.Equal("6df41a43725f0c770fd56379e12acf8c", key)
 }
 
 func TestParseRangeNumbers(t *testing.T) {
-	require := require.New(t)
+	assert := assert.New(t)
 	numbers, err := ParseRangeNumbers("2-5")
-	require.NoError(err)
-	require.Equal([]int64{2, 3, 4, 5}, numbers)
+	if assert.NoError(err) {
+		assert.Equal([]int64{2, 3, 4, 5}, numbers)
+	}
 
 	numbers, err = ParseRangeNumbers("1")
-	require.NoError(err)
-	require.Equal([]int64{1}, numbers)
+	if assert.NoError(err) {
+		assert.Equal([]int64{1}, numbers)
+	}
 
 	numbers, err = ParseRangeNumbers("3-5,8")
-	require.NoError(err)
-	require.Equal([]int64{3, 4, 5, 8}, numbers)
+	if assert.NoError(err) {
+		assert.Equal([]int64{3, 4, 5, 8}, numbers)
+	}
 
 	numbers, err = ParseRangeNumbers(" 3-5,8, 10-12 ")
-	require.NoError(err)
-	require.Equal([]int64{3, 4, 5, 8, 10, 11, 12}, numbers)
+	if assert.NoError(err) {
+		assert.Equal([]int64{3, 4, 5, 8, 10, 11, 12}, numbers)
+	}
 
 	_, err = ParseRangeNumbers("3-a")
-	require.Error(err)
+	assert.Error(err)
 }

pkg/util/version/version.go

@@ -14,7 +14,7 @@
 
 package version
 
-var version = "0.63.0"
+var version = "0.62.0"
 
 func Full() string {
 	return version

pkg/util/vhost/http.go

@@ -162,7 +162,7 @@ func (rp *HTTPReverseProxy) UnRegister(routeCfg RouteConfig) {
 func (rp *HTTPReverseProxy) GetRouteConfig(domain, location, routeByHTTPUser string) *RouteConfig {
 	vr, ok := rp.getVhost(domain, location, routeByHTTPUser)
 	if ok {
-		log.Debugf("get new http request host [%s] path [%s] httpuser [%s]", domain, location, routeByHTTPUser)
+		log.Debugf("get new HTTP request host [%s] path [%s] httpuser [%s]", domain, location, routeByHTTPUser)
 		return vr.payload.(*RouteConfig)
 	}
 	return nil
@@ -225,7 +225,11 @@ func (rp *HTTPReverseProxy) getVhost(domain, location, routeByHTTPUser string) (
 	// *.example.com
 	// *.com
 	domainSplit := strings.Split(domain, ".")
-	for len(domainSplit) >= 3 {
+	for {
+		if len(domainSplit) < 3 {
+			break
+		}
+
 		domainSplit[0] = "*"
 		domain = strings.Join(domainSplit, ".")
 		vr, ok = findRouter(domain, location, routeByHTTPUser)

pkg/util/vhost/vhost.go

@@ -169,7 +169,11 @@ func (v *Muxer) getListener(name, path, httpUser string) (*Listener, bool) {
 	}
 
 	domainSplit := strings.Split(name, ".")
-	for len(domainSplit) >= 3 {
+	for {
+		if len(domainSplit) < 3 {
+			break
+		}
+
 		domainSplit[0] = "*"
 		name = strings.Join(domainSplit, ".")
 
@@ -271,7 +275,7 @@ func (l *Listener) Accept() (net.Conn, error) {
 	xl := xlog.FromContextSafe(l.ctx)
 	conn, ok := <-l.accept
 	if !ok {
-		return nil, fmt.Errorf("listener closed")
+		return nil, fmt.Errorf("Listener closed")
 	}
 
 	// if rewriteHost func is exist

pkg/vnet/controller.go

@@ -87,7 +87,7 @@ func (c *Controller) handlePacket(buf []byte) {
 	case waterutil.IsIPv4(buf):
 		header, err := ipv4.ParseHeader(buf)
 		if err != nil {
-			log.Warnf("parse ipv4 header error: %v", err)
+			log.Warnf("parse ipv4 header error:", err)
 			return
 		}
 		src = header.Src
@@ -98,7 +98,7 @@ func (c *Controller) handlePacket(buf []byte) {
 	case waterutil.IsIPv6(buf):
 		header, err := ipv6.ParseHeader(buf)
 		if err != nil {
-			log.Warnf("parse ipv6 header error: %v", err)
+			log.Warnf("parse ipv6 header error:", err)
 			return
 		}
 		src = header.Src
@@ -137,12 +137,6 @@ func (c *Controller) Stop() error {
 // Client connection read loop
 func (c *Controller) readLoopClient(ctx context.Context, conn io.ReadWriteCloser) {
 	xl := xlog.FromContextSafe(ctx)
-	defer func() {
-		// Remove the route when read loop ends (connection closed)
-		c.clientRouter.removeConnRoute(conn)
-		conn.Close()
-	}()
-
 	for {
 		data, err := ReadMessage(conn)
 		if err != nil {
@@ -187,18 +181,8 @@ func (c *Controller) readLoopClient(ctx context.Context, conn io.ReadWriteCloser
 }
 
 // Server connection read loop
-func (c *Controller) readLoopServer(ctx context.Context, conn io.ReadWriteCloser, onClose func()) {
+func (c *Controller) readLoopServer(ctx context.Context, conn io.ReadWriteCloser) {
 	xl := xlog.FromContextSafe(ctx)
-	defer func() {
-		// Clean up all IP mappings associated with this connection when it closes
-		c.serverRouter.cleanupConnIPs(conn)
-		// Call the provided callback upon closure
-		if onClose != nil {
-			onClose()
-		}
-		conn.Close()
-	}()
-
 	for {
 		data, err := ReadMessage(conn)
 		if err != nil {
@@ -236,11 +220,27 @@ func (c *Controller) readLoopServer(ctx context.Context, conn io.ReadWriteCloser
 	}
 }
 
-// RegisterClientRoute registers a client route (based on destination IP CIDR)
-// and starts the read loop
-func (c *Controller) RegisterClientRoute(ctx context.Context, name string, routes []net.IPNet, conn io.ReadWriteCloser) {
-	c.clientRouter.addRoute(name, routes, conn)
+// RegisterClientRoute Register client route (based on destination IP CIDR)
+func (c *Controller) RegisterClientRoute(ctx context.Context, name string, routes []net.IPNet, conn io.ReadWriteCloser) error {
+	if err := c.clientRouter.addRoute(name, routes, conn); err != nil {
+		return err
+	}
 	go c.readLoopClient(ctx, conn)
+	return nil
+}
+
+// RegisterServerConn Register server connection (dynamically associates with source IPs)
+func (c *Controller) RegisterServerConn(ctx context.Context, name string, conn io.ReadWriteCloser) error {
+	if err := c.serverRouter.addConn(name, conn); err != nil {
+		return err
+	}
+	go c.readLoopServer(ctx, conn)
+	return nil
+}
+
+// UnregisterServerConn Remove server connection from routing table
+func (c *Controller) UnregisterServerConn(name string) {
+	c.serverRouter.delConn(name)
 }
 
 // UnregisterClientRoute Remove client route from routing table
@@ -248,12 +248,6 @@ func (c *Controller) UnregisterClientRoute(name string) {
 	c.clientRouter.delRoute(name)
 }
 
-// StartServerConnReadLoop starts the read loop for a server connection
-// (dynamically associates with source IPs)
-func (c *Controller) StartServerConnReadLoop(ctx context.Context, conn io.ReadWriteCloser, onClose func()) {
-	go c.readLoopServer(ctx, conn, onClose)
-}
-
 // ParseRoutes Convert route strings to IPNet objects
 func ParseRoutes(routeStrings []string) ([]net.IPNet, error) {
 	routes := make([]net.IPNet, 0, len(routeStrings))
@@ -279,7 +273,7 @@ func newClientRouter() *clientRouter {
 	}
 }
 
-func (r *clientRouter) addRoute(name string, routes []net.IPNet, conn io.ReadWriteCloser) {
+func (r *clientRouter) addRoute(name string, routes []net.IPNet, conn io.ReadWriteCloser) error {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	r.routes[name] = &routeElement{
@@ -287,6 +281,7 @@ func (r *clientRouter) addRoute(name string, routes []net.IPNet, conn io.ReadWri
 		routes: routes,
 		conn:   conn,
 	}
+	return nil
 }
 
 func (r *clientRouter) findConn(dst net.IP) (io.Writer, error) {
@@ -308,29 +303,32 @@ func (r *clientRouter) delRoute(name string) {
 	delete(r.routes, name)
 }
 
-func (r *clientRouter) removeConnRoute(conn io.Writer) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	for name, re := range r.routes {
-		if re.conn == conn {
-			delete(r.routes, name)
-			return
-		}
-	}
-}
-
-// Server router (based solely on source IP routing)
+// Server router (based on source IP routing)
 type serverRouter struct {
-	srcIPConns map[string]io.Writer // Source IP string to connection mapping
+	namedConns map[string]io.ReadWriteCloser // Name to connection mapping
+	srcIPConns map[string]io.Writer          // Source IP string to connection mapping
 	mu         sync.RWMutex
 }
 
 func newServerRouter() *serverRouter {
 	return &serverRouter{
+		namedConns: make(map[string]io.ReadWriteCloser),
 		srcIPConns: make(map[string]io.Writer),
 	}
 }
 
+func (r *serverRouter) addConn(name string, conn io.ReadWriteCloser) error {
+	r.mu.Lock()
+	original, ok := r.namedConns[name]
+	r.namedConns[name] = conn
+	r.mu.Unlock()
+	if ok {
+		// Close the original connection if it exists
+		_ = original.Close()
+	}
+	return nil
+}
+
 func (r *serverRouter) findConnBySrc(src net.IP) (io.Writer, error) {
 	r.mu.RLock()
 	defer r.mu.RUnlock()
@@ -342,41 +340,17 @@ func (r *serverRouter) findConnBySrc(src net.IP) (io.Writer, error) {
 }
 
 func (r *serverRouter) registerSrcIP(src net.IP, conn io.Writer) {
-	key := src.String()
-
-	r.mu.RLock()
-	existingConn, ok := r.srcIPConns[key]
-	r.mu.RUnlock()
-
-	// If the entry exists and the connection is the same, no need to do anything.
-	if ok && existingConn == conn {
-		return
-	}
-
-	// Acquire write lock to update the map.
 	r.mu.Lock()
 	defer r.mu.Unlock()
-
-	// Double-check after acquiring the write lock to handle potential race conditions.
-	existingConn, ok = r.srcIPConns[key]
-	if ok && existingConn == conn {
-		return
-	}
-
-	r.srcIPConns[key] = conn
+	r.srcIPConns[src.String()] = conn
 }
 
-// cleanupConnIPs removes all IP mappings associated with the specified connection
-func (r *serverRouter) cleanupConnIPs(conn io.Writer) {
+func (r *serverRouter) delConn(name string) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
-
-	// Find and delete all IP mappings pointing to this connection
-	for ip, mappedConn := range r.srcIPConns {
-		if mappedConn == conn {
-			delete(r.srcIPConns, ip)
-		}
-	}
+	delete(r.namedConns, name)
+	// Note: We don't delete mappings from srcIPConns because we don't know which source IPs are associated with this connection
+	// This might cause dangling references, but they will be overwritten on new connections or restart
 }
 
 type routeElement struct {

pkg/vnet/message.go

@@ -33,7 +33,7 @@ func ReadMessage(r io.Reader) ([]byte, error) {
 	var length uint32
 	err := binary.Read(r, binary.LittleEndian, &length)
 	if err != nil {
-		return nil, fmt.Errorf("read message length error: %w", err)
+		return nil, fmt.Errorf("read message length error: %v", err)
 	}
 
 	// Check length to prevent DoS
@@ -48,7 +48,7 @@ func ReadMessage(r io.Reader) ([]byte, error) {
 	data := make([]byte, length)
 	_, err = io.ReadFull(r, data)
 	if err != nil {
-		return nil, fmt.Errorf("read message data error: %w", err)
+		return nil, fmt.Errorf("read message data error: %v", err)
 	}
 
 	return data, nil
@@ -68,13 +68,13 @@ func WriteMessage(w io.Writer, data []byte) error {
 	// Write length
 	err := binary.Write(w, binary.LittleEndian, length)
 	if err != nil {
-		return fmt.Errorf("write message length error: %w", err)
+		return fmt.Errorf("write message length error: %v", err)
 	}
 
 	// Write message data
 	_, err = w.Write(data)
 	if err != nil {
-		return fmt.Errorf("write message data error: %w", err)
+		return fmt.Errorf("write message data error: %v", err)
 	}
 
 	return nil

pkg/vnet/tun.go

@@ -23,8 +23,7 @@ import (
 )
 
 const (
-	offset            = 16
-	defaultPacketSize = 1420
+	offset = 16
 )
 
 type TunDevice interface {
@@ -36,45 +35,20 @@ func OpenTun(ctx context.Context, addr string) (TunDevice, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	mtu, err := td.MTU()
-	if err != nil {
-		mtu = defaultPacketSize
-	}
-
-	bufferSize := max(mtu, defaultPacketSize)
-	batchSize := td.BatchSize()
-
-	device := &tunDeviceWrapper{
-		dev:         td,
-		bufferSize:  bufferSize,
-		readBuffers: make([][]byte, batchSize),
-		sizeBuffer:  make([]int, batchSize),
-	}
-
-	for i := range device.readBuffers {
-		device.readBuffers[i] = make([]byte, offset+bufferSize)
-	}
-
-	return device, nil
+	return &tunDeviceWrapper{dev: td}, nil
 }
 
 type tunDeviceWrapper struct {
-	dev           tun.Device
-	bufferSize    int
-	readBuffers   [][]byte
-	packetBuffers [][]byte
-	sizeBuffer    []int
+	dev tun.Device
 }
 
 func (d *tunDeviceWrapper) Read(p []byte) (int, error) {
-	if len(d.packetBuffers) > 0 {
-		n := copy(p, d.packetBuffers[0])
-		d.packetBuffers = d.packetBuffers[1:]
-		return n, nil
-	}
+	buf := pool.GetBuf(len(p) + offset)
+	defer pool.PutBuf(buf)
 
-	n, err := d.dev.Read(d.readBuffers, d.sizeBuffer, offset)
+	sz := make([]int, 1)
+
+	n, err := d.dev.Read([][]byte{buf}, sz, offset)
 	if err != nil {
 		return 0, err
 	}
@@ -82,26 +56,20 @@ func (d *tunDeviceWrapper) Read(p []byte) (int, error) {
 		return 0, io.EOF
 	}
 
-	for i := range n {
-		if d.sizeBuffer[i] <= 0 {
-			continue
-		}
-		d.packetBuffers = append(d.packetBuffers, d.readBuffers[i][offset:offset+d.sizeBuffer[i]])
+	dataSize := sz[0]
+	if dataSize > len(p) {
+		dataSize = len(p)
 	}
-
-	dataSize := copy(p, d.packetBuffers[0])
-	d.packetBuffers = d.packetBuffers[1:]
-
+	copy(p, buf[offset:offset+dataSize])
 	return dataSize, nil
 }
 
 func (d *tunDeviceWrapper) Write(p []byte) (int, error) {
-	buf := pool.GetBuf(offset + d.bufferSize)
+	buf := pool.GetBuf(len(p) + offset)
 	defer pool.PutBuf(buf)
 
-	n := copy(buf[offset:], p)
-	_, err := d.dev.Write([][]byte{buf[:offset+n]}, offset)
-	return n, err
+	copy(buf[offset:], p)
+	return d.dev.Write([][]byte{buf}, offset)
 }
 
 func (d *tunDeviceWrapper) Close() error {

pkg/vnet/tun_linux.go

@@ -16,44 +16,35 @@ package vnet
 
 import (
 	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"fmt"
 	"net"
-	"strconv"
-	"strings"
 
 	"github.com/vishvananda/netlink"
 	"golang.zx2c4.com/wireguard/tun"
 )
 
 const (
-	baseTunName = "utun"
-	defaultMTU  = 1420
+	defaultTunName = "utun"
+	defaultMTU     = 1420
 )
 
 func openTun(_ context.Context, addr string) (tun.Device, error) {
-	name, err := findNextTunName(baseTunName)
-	if err != nil {
-		name = getFallbackTunName(baseTunName, addr)
-	}
-
-	tunDevice, err := tun.CreateTUN(name, defaultMTU)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create TUN device '%s': %w", name, err)
-	}
-
-	actualName, err := tunDevice.Name()
+	dev, err := tun.CreateTUN(defaultTunName, defaultMTU)
 	if err != nil {
 		return nil, err
 	}
 
-	ifn, err := net.InterfaceByName(actualName)
+	name, err := dev.Name()
 	if err != nil {
 		return nil, err
 	}
 
-	link, err := netlink.LinkByName(actualName)
+	ifn, err := net.InterfaceByName(name)
+	if err != nil {
+		return nil, err
+	}
+
+	link, err := netlink.LinkByName(name)
 	if err != nil {
 		return nil, err
 	}
@@ -78,34 +69,7 @@ func openTun(_ context.Context, addr string) (tun.Device, error) {
 	if err = addRoutes(ifn, cidr); err != nil {
 		return nil, err
 	}
-	return tunDevice, nil
-}
-
-func findNextTunName(basename string) (string, error) {
-	interfaces, err := net.Interfaces()
-	if err != nil {
-		return "", fmt.Errorf("failed to get network interfaces: %w", err)
-	}
-	maxSuffix := -1
-
-	for _, iface := range interfaces {
-		name := iface.Name
-		if strings.HasPrefix(name, basename) {
-			suffix := name[len(basename):]
-			if suffix == "" {
-				continue
-			}
-
-			numSuffix, err := strconv.Atoi(suffix)
-			if err == nil && numSuffix > maxSuffix {
-				maxSuffix = numSuffix
-			}
-		}
-	}
-
-	nextSuffix := maxSuffix + 1
-	name := fmt.Sprintf("%s%d", basename, nextSuffix)
-	return name, nil
+	return dev, nil
 }
 
 func addRoutes(ifn *net.Interface, cidr *net.IPNet) error {
@@ -118,14 +82,3 @@ func addRoutes(ifn *net.Interface, cidr *net.IPNet) error {
 	}
 	return nil
 }
-
-// getFallbackTunName generates a deterministic fallback TUN device name
-// based on the base name and the provided address string using a hash.
-func getFallbackTunName(baseName, addr string) string {
-	hasher := sha256.New()
-	hasher.Write([]byte(addr))
-	hashBytes := hasher.Sum(nil)
-	// Use first 4 bytes -> 8 hex chars for brevity, respecting IFNAMSIZ limit.
-	shortHash := hex.EncodeToString(hashBytes[:4])
-	return fmt.Sprintf("%s%s", baseName, shortHash)
-}

server/control.go

@@ -224,7 +224,7 @@ func (ctl *Control) Close() error {
 
 func (ctl *Control) Replaced(newCtl *Control) {
 	xl := ctl.xl
-	xl.Infof("replaced by client [%s]", newCtl.runID)
+	xl.Infof("Replaced by client [%s]", newCtl.runID)
 	ctl.runID = ""
 	ctl.conn.Close()
 }

server/dashboard_api.go

@@ -97,14 +97,14 @@ func (svr *Service) healthz(w http.ResponseWriter, _ *http.Request) {
 func (svr *Service) apiServerInfo(w http.ResponseWriter, r *http.Request) {
 	res := GeneralResponse{Code: 200}
 	defer func() {
-		log.Infof("http response [%s]: code [%d]", r.URL.Path, res.Code)
+		log.Infof("Http response [%s]: code [%d]", r.URL.Path, res.Code)
 		w.WriteHeader(res.Code)
 		if len(res.Msg) > 0 {
 			_, _ = w.Write([]byte(res.Msg))
 		}
 	}()
 
-	log.Infof("http request: [%s]", r.URL.Path)
+	log.Infof("Http request: [%s]", r.URL.Path)
 	serverStats := mem.StatsCollector.GetServer()
 	svrResp := serverInfoResp{
 		Version:               version.Full(),
@@ -218,13 +218,13 @@ func (svr *Service) apiProxyByType(w http.ResponseWriter, r *http.Request) {
 	proxyType := params["type"]
 
 	defer func() {
-		log.Infof("http response [%s]: code [%d]", r.URL.Path, res.Code)
+		log.Infof("Http response [%s]: code [%d]", r.URL.Path, res.Code)
 		w.WriteHeader(res.Code)
 		if len(res.Msg) > 0 {
 			_, _ = w.Write([]byte(res.Msg))
 		}
 	}()
-	log.Infof("http request: [%s]", r.URL.Path)
+	log.Infof("Http request: [%s]", r.URL.Path)
 
 	proxyInfoResp := GetProxyInfoResp{}
 	proxyInfoResp.Proxies = svr.getProxyStatsByType(proxyType)
@@ -290,13 +290,13 @@ func (svr *Service) apiProxyByTypeAndName(w http.ResponseWriter, r *http.Request
 	name := params["name"]
 
 	defer func() {
-		log.Infof("http response [%s]: code [%d]", r.URL.Path, res.Code)
+		log.Infof("Http response [%s]: code [%d]", r.URL.Path, res.Code)
 		w.WriteHeader(res.Code)
 		if len(res.Msg) > 0 {
 			_, _ = w.Write([]byte(res.Msg))
 		}
 	}()
-	log.Infof("http request: [%s]", r.URL.Path)
+	log.Infof("Http request: [%s]", r.URL.Path)
 
 	var proxyStatsResp GetProxyStatsResp
 	proxyStatsResp, res.Code, res.Msg = svr.getProxyStatsByTypeAndName(proxyType, name)
@@ -358,13 +358,13 @@ func (svr *Service) apiProxyTraffic(w http.ResponseWriter, r *http.Request) {
 	name := params["name"]
 
 	defer func() {
-		log.Infof("http response [%s]: code [%d]", r.URL.Path, res.Code)
+		log.Infof("Http response [%s]: code [%d]", r.URL.Path, res.Code)
 		w.WriteHeader(res.Code)
 		if len(res.Msg) > 0 {
 			_, _ = w.Write([]byte(res.Msg))
 		}
 	}()
-	log.Infof("http request: [%s]", r.URL.Path)
+	log.Infof("Http request: [%s]", r.URL.Path)
 
 	trafficResp := GetProxyTrafficResp{}
 	trafficResp.Name = name
@@ -386,9 +386,9 @@ func (svr *Service) apiProxyTraffic(w http.ResponseWriter, r *http.Request) {
 func (svr *Service) deleteProxies(w http.ResponseWriter, r *http.Request) {
 	res := GeneralResponse{Code: 200}
 
-	log.Infof("http request: [%s]", r.URL.Path)
+	log.Infof("Http request: [%s]", r.URL.Path)
 	defer func() {
-		log.Infof("http response [%s]: code [%d]", r.URL.Path, res.Code)
+		log.Infof("Http response [%s]: code [%d]", r.URL.Path, res.Code)
 		w.WriteHeader(res.Code)
 		if len(res.Msg) > 0 {
 			_, _ = w.Write([]byte(res.Msg))

server/service.go

@@ -427,7 +427,7 @@ func (svr *Service) handleConnection(ctx context.Context, conn net.Conn, interna
 
 	_ = conn.SetReadDeadline(time.Now().Add(connReadTimeout))
 	if rawMsg, err = msg.ReadMsg(conn); err != nil {
-		log.Tracef("failed to read message: %v", err)
+		log.Tracef("Failed to read message: %v", err)
 		conn.Close()
 		return
 	}
@@ -475,7 +475,7 @@ func (svr *Service) handleConnection(ctx context.Context, conn net.Conn, interna
 			})
 		}
 	default:
-		log.Warnf("error message type for the new connection [%s]", conn.RemoteAddr().String())
+		log.Warnf("Error message type for the new connection [%s]", conn.RemoteAddr().String())
 		conn.Close()
 	}
 }
@@ -488,7 +488,7 @@ func (svr *Service) HandleListener(l net.Listener, internal bool) {
 	for {
 		c, err := l.Accept()
 		if err != nil {
-			log.Warnf("listener for incoming connections from client closed")
+			log.Warnf("Listener for incoming connections from client closed")
 			return
 		}
 		// inject xlog object into net.Conn context
@@ -504,7 +504,7 @@ func (svr *Service) HandleListener(l net.Listener, internal bool) {
 			var isTLS, custom bool
 			c, isTLS, custom, err = netpkg.CheckAndEnableTLSServerConnWithTimeout(c, svr.tlsConfig, forceTLS, connReadTimeout)
 			if err != nil {
-				log.Warnf("checkAndEnableTLSServerConnWithTimeout error: %v", err)
+				log.Warnf("CheckAndEnableTLSServerConnWithTimeout error: %v", err)
 				originConn.Close()
 				continue
 			}
@@ -520,7 +520,7 @@ func (svr *Service) HandleListener(l net.Listener, internal bool) {
 				fmuxCfg.MaxStreamWindowSize = 6 * 1024 * 1024
 				session, err := fmux.Server(frpConn, fmuxCfg)
 				if err != nil {
-					log.Warnf("failed to create mux connection: %v", err)
+					log.Warnf("Failed to create mux connection: %v", err)
 					frpConn.Close()
 					return
 				}
@@ -528,7 +528,7 @@ func (svr *Service) HandleListener(l net.Listener, internal bool) {
 				for {
 					stream, err := session.AcceptStream()
 					if err != nil {
-						log.Debugf("accept new mux stream error: %v", err)
+						log.Debugf("Accept new mux stream error: %v", err)
 						session.Close()
 						return
 					}
@@ -546,7 +546,7 @@ func (svr *Service) HandleQUICListener(l *quic.Listener) {
 	for {
 		c, err := l.Accept(context.Background())
 		if err != nil {
-			log.Warnf("quic listener for incoming connections from client closed")
+			log.Warnf("QUICListener for incoming connections from client closed")
 			return
 		}
 		// Start a new goroutine to handle connection.
@@ -554,7 +554,7 @@ func (svr *Service) HandleQUICListener(l *quic.Listener) {
 			for {
 				stream, err := frpConn.AcceptStream(context.Background())
 				if err != nil {
-					log.Debugf("accept new quic mux stream error: %v", err)
+					log.Debugf("Accept new quic mux stream error: %v", err)
 					_ = frpConn.CloseWithError(0, "")
 					return
 				}
@@ -620,7 +620,7 @@ func (svr *Service) RegisterWorkConn(workConn net.Conn, newMsg *msg.NewWorkConn)
 	xl := netpkg.NewLogFromConn(workConn)
 	ctl, exist := svr.ctlManager.GetByID(newMsg.RunID)
 	if !exist {
-		xl.Warnf("no client control found for run id [%s]", newMsg.RunID)
+		xl.Warnf("No client control found for run id [%s]", newMsg.RunID)
 		return fmt.Errorf("no client control found for run id [%s]", newMsg.RunID)
 	}
 	// server plugin hook

test/e2e/e2e.go

@@ -38,7 +38,7 @@ func RunE2ETests(t *testing.T) {
 	// Randomize specs as well as suites
 	suiteConfig.RandomizeAllSpecs = true
 
-	log.Infof("starting e2e run %q on Ginkgo node %d of total %d",
+	log.Infof("Starting e2e run %q on Ginkgo node %d of total %d",
 		framework.RunID, suiteConfig.ParallelProcess, suiteConfig.ParallelTotal)
 	ginkgo.RunSpecs(t, "frp e2e suite", suiteConfig, reporterConfig)
 }

test/e2e/framework/request.go

@@ -20,7 +20,7 @@ func ExpectResponseCode(code int) EnsureFunc {
 		if resp.Code == code {
 			return true
 		}
-		flog.Warnf("expect code %d, but got %d", code, resp.Code)
+		flog.Warnf("Expect code %d, but got %d", code, resp.Code)
 		return false
 	}
 }
@@ -111,14 +111,14 @@ func (e *RequestExpect) Ensure(fns ...EnsureFunc) {
 
 	if len(fns) == 0 {
 		if !bytes.Equal(e.expectResp, ret.Content) {
-			flog.Tracef("response info: %+v", ret)
+			flog.Tracef("Response info: %+v", ret)
 		}
 		ExpectEqualValuesWithOffset(1, string(ret.Content), string(e.expectResp), e.explain...)
 	} else {
 		for _, fn := range fns {
 			ok := fn(ret)
 			if !ok {
-				flog.Tracef("response info: %+v", ret)
+				flog.Tracef("Response info: %+v", ret)
 			}
 			ExpectTrueWithOffset(1, ok, e.explain...)
 		}

test/e2e/legacy/basic/client_server.go

@@ -24,14 +24,12 @@ type generalTestConfigures struct {
 }
 
 func renderBindPortConfig(protocol string) string {
-	switch protocol {
-	case "kcp":
+	if protocol == "kcp" {
 		return fmt.Sprintf(`kcp_bind_port = {{ .%s }}`, consts.PortServerName)
-	case "quic":
+	} else if protocol == "quic" {
 		return fmt.Sprintf(`quic_bind_port = {{ .%s }}`, consts.PortServerName)
-	default:
-		return ""
 	}
+	return ""
 }
 
 func runClientServerTest(f *framework.Framework, configures *generalTestConfigures) {

test/e2e/legacy/features/real_ip.go

@@ -93,7 +93,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 			f.RunProcesses([]string{serverConf}, []string{clientConf})
 
 			framework.NewRequestExpect(f).Port(remotePort).Ensure(func(resp *request.Response) bool {
-				log.Tracef("proxy protocol get SourceAddr: %s", string(resp.Content))
+				log.Tracef("ProxyProtocol get SourceAddr: %s", string(resp.Content))
 				addr, err := net.ResolveTCPAddr("tcp", string(resp.Content))
 				if err != nil {
 					return false
@@ -142,7 +142,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 				r.HTTP().HTTPHost("normal.example.com")
 			}).Ensure(framework.ExpectResponseCode(404))
 
-			log.Tracef("proxy protocol get SourceAddr: %s", srcAddrRecord)
+			log.Tracef("ProxyProtocol get SourceAddr: %s", srcAddrRecord)
 			addr, err := net.ResolveTCPAddr("tcp", srcAddrRecord)
 			framework.ExpectNoError(err, srcAddrRecord)
 			framework.ExpectEqualValues("127.0.0.1", addr.IP.String())

test/e2e/legacy/plugin/server.go

@@ -223,7 +223,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			handler := func(req *plugin.Request) *plugin.Response {
 				var ret plugin.Response
 				content := req.Content.(*plugin.PingContent)
-				record = content.PrivilegeKey
+				record = content.Ping.PrivilegeKey
 				ret.Unchange = true
 				return &ret
 			}
@@ -273,7 +273,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			handler := func(req *plugin.Request) *plugin.Response {
 				var ret plugin.Response
 				content := req.Content.(*plugin.NewWorkConnContent)
-				record = content.RunID
+				record = content.NewWorkConn.RunID
 				ret.Unchange = true
 				return &ret
 			}

test/e2e/v1/basic/client_server.go

@@ -24,14 +24,12 @@ type generalTestConfigures struct {
 }
 
 func renderBindPortConfig(protocol string) string {
-	switch protocol {
-	case "kcp":
+	if protocol == "kcp" {
 		return fmt.Sprintf(`kcpBindPort = {{ .%s }}`, consts.PortServerName)
-	case "quic":
+	} else if protocol == "quic" {
 		return fmt.Sprintf(`quicBindPort = {{ .%s }}`, consts.PortServerName)
-	default:
-		return ""
 	}
+	return ""
 }
 
 func runClientServerTest(f *framework.Framework, configures *generalTestConfigures) {

test/e2e/v1/features/real_ip.go

@@ -215,7 +215,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 			f.RunProcesses([]string{serverConf}, []string{clientConf})
 
 			framework.NewRequestExpect(f).Port(remotePort).Ensure(func(resp *request.Response) bool {
-				log.Tracef("proxy protocol get SourceAddr: %s", string(resp.Content))
+				log.Tracef("ProxyProtocol get SourceAddr: %s", string(resp.Content))
 				addr, err := net.ResolveTCPAddr("tcp", string(resp.Content))
 				if err != nil {
 					return false
@@ -227,56 +227,6 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 			})
 		})
 
-		ginkgo.It("UDP", func() {
-			serverConf := consts.DefaultServerConfig
-			clientConf := consts.DefaultClientConfig
-
-			localPort := f.AllocPort()
-			localServer := streamserver.New(streamserver.UDP, streamserver.WithBindPort(localPort),
-				streamserver.WithCustomHandler(func(c net.Conn) {
-					defer c.Close()
-					rd := bufio.NewReader(c)
-					ppHeader, err := pp.Read(rd)
-					if err != nil {
-						log.Errorf("read proxy protocol error: %v", err)
-						return
-					}
-
-					// Read the actual UDP content after proxy protocol header
-					if _, err := rpc.ReadBytes(rd); err != nil {
-						return
-					}
-
-					buf := []byte(ppHeader.SourceAddr.String())
-					_, _ = rpc.WriteBytes(c, buf)
-				}))
-			f.RunServer("", localServer)
-
-			remotePort := f.AllocPort()
-			clientConf += fmt.Sprintf(`
-			[[proxies]]
-			name = "udp"
-			type = "udp"
-			localPort = %d
-			remotePort = %d
-			transport.proxyProtocolVersion = "v2"
-			`, localPort, remotePort)
-
-			f.RunProcesses([]string{serverConf}, []string{clientConf})
-
-			framework.NewRequestExpect(f).Protocol("udp").Port(remotePort).Ensure(func(resp *request.Response) bool {
-				log.Tracef("udp proxy protocol get SourceAddr: %s", string(resp.Content))
-				addr, err := net.ResolveUDPAddr("udp", string(resp.Content))
-				if err != nil {
-					return false
-				}
-				if addr.IP.String() != "127.0.0.1" {
-					return false
-				}
-				return true
-			})
-		})
-
 		ginkgo.It("HTTP", func() {
 			vhostHTTPPort := f.AllocPort()
 			serverConf := consts.DefaultServerConfig + fmt.Sprintf(`
@@ -315,7 +265,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 				r.HTTP().HTTPHost("normal.example.com")
 			}).Ensure(framework.ExpectResponseCode(404))
 
-			log.Tracef("proxy protocol get SourceAddr: %s", srcAddrRecord)
+			log.Tracef("ProxyProtocol get SourceAddr: %s", srcAddrRecord)
 			addr, err := net.ResolveTCPAddr("tcp", srcAddrRecord)
 			framework.ExpectNoError(err, srcAddrRecord)
 			framework.ExpectEqualValues("127.0.0.1", addr.IP.String())

test/e2e/v1/plugin/server.go

@@ -232,7 +232,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			handler := func(req *plugin.Request) *plugin.Response {
 				var ret plugin.Response
 				content := req.Content.(*plugin.PingContent)
-				record = content.PrivilegeKey
+				record = content.Ping.PrivilegeKey
 				ret.Unchange = true
 				return &ret
 			}
@@ -284,7 +284,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			handler := func(req *plugin.Request) *plugin.Response {
 				var ret plugin.Response
 				content := req.Content.(*plugin.NewWorkConnContent)
-				record = content.RunID
+				record = content.NewWorkConn.RunID
 				ret.Unchange = true
 				return &ret
 			}