WireGuard config: Replace kernelMode with noKernelTun

#3871 (comment)
XTLS · Oct 18, 2024 · 0c9c81c · 0c9c81c
1 parent b0272c1
commit 0c9c81c
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 49 deletions.
diff --git a/infra/conf/wireguard.go b/infra/conf/wireguard.go
@@ -1,10 +1,8 @@
 package conf
 
 import (
-	"context"
 	"encoding/base64"
 	"encoding/hex"
-	"fmt"
 	"strings"
 
 	"github.com/xtls/xray-core/common/errors"
@@ -53,8 +51,7 @@ func (c *WireGuardPeerConfig) Build() (proto.Message, error) {
 type WireGuardConfig struct {
 	IsClient bool `json:""`
 
-	KernelTun      *bool                  `json:"kernelTun"`
-	KernelMode     *bool                  `json:"kernelMode"`
+	NoKernelTun    bool                   `json:"noKernelTun"`
 	SecretKey      string                 `json:"secretKey"`
 	Address        []string               `json:"address"`
 	Peers          []*WireGuardPeerConfig `json:"peers"`
@@ -121,26 +118,7 @@ func (c *WireGuardConfig) Build() (proto.Message, error) {
 	}
 
 	config.IsClient = c.IsClient
-	kernelTunSupported, err := wireguard.KernelTunSupported()
-	if err != nil {
-		errors.LogWarning(context.Background(), fmt.Sprintf("Failed to check kernel TUN support: %v. This may indicate that your OS doesn't support kernel TUN or you lack the necessary permissions. Please ensure you have the required privileges.", err))
-		config.KernelMode = false
-		return config, nil
-	}
-	if c.KernelMode == nil {
-		c.KernelMode = c.KernelTun
-	}
-	if c.KernelMode != nil {
-		config.KernelMode = *c.KernelMode
-		if config.KernelMode && !kernelTunSupported {
-			errors.LogWarning(context.Background(), "kernel TUN is not supported on your OS or permission is insufficient")
-		}
-	} else {
-		config.KernelMode = kernelTunSupported
-		if config.KernelMode {
-			errors.LogDebug(context.Background(), "kernel TUN is enabled as it's supported and permission is sufficient")
-		}
-	}
+	config.NoKernelTun = c.NoKernelTun
 
 	return config, nil
 }

diff --git a/infra/conf/wireguard_test.go b/infra/conf/wireguard_test.go
@@ -26,7 +26,7 @@ func TestWireGuardConfig(t *testing.T) {
 				"mtu": 1300,
 				"workers": 2,
 				"domainStrategy": "ForceIPv6v4",
-				"kernelMode": false
+				"noKernelTun": false
 			}`,
 			Parser: loadJSON(creator),
 			Output: &wireguard.DeviceConfig{
@@ -45,7 +45,7 @@ func TestWireGuardConfig(t *testing.T) {
 				Mtu:            1300,
 				NumWorkers:     2,
 				DomainStrategy: wireguard.DeviceConfig_FORCE_IP64,
-				KernelMode:     false,
+				NoKernelTun:    false,
 			},
 		},
 	})

diff --git a/proxy/wireguard/config.go b/proxy/wireguard/config.go
@@ -1,5 +1,11 @@
 package wireguard
 
+import (
+	"context"
+
+	"github.com/xtls/xray-core/common/errors"
+)
+
 func (c *DeviceConfig) preferIP4() bool {
 	return c.DomainStrategy == DeviceConfig_FORCE_IP ||
 		c.DomainStrategy == DeviceConfig_FORCE_IP4 ||
@@ -25,8 +31,17 @@ func (c *DeviceConfig) fallbackIP6() bool {
 }
 
 func (c *DeviceConfig) createTun() tunCreator {
-	if c.KernelMode {
-		return createKernelTun
+	if c.NoKernelTun {
+		return createGVisorTun
+	}
+	kernelTunSupported, err := KernelTunSupported()
+	if err != nil {
+		errors.LogWarning(context.Background(), "Using gVisor TUN. Failed to check kernel TUN support:", err)
+		return createGVisorTun
+	}
+	if !kernelTunSupported {
+		errors.LogWarning(context.Background(), "Using gVisor TUN. Kernel TUN is not supported on your OS, or your permission is insufficient.)")
+		return createGVisorTun
 	}
-	return createGVisorTun
+	return createKernelTun
 }
diff --git a/proxy/wireguard/config.pb.go b/proxy/wireguard/config.pb.go
diff --git a/proxy/wireguard/config.proto b/proxy/wireguard/config.proto
@@ -30,5 +30,5 @@ message DeviceConfig {
   bytes reserved = 6;
   DomainStrategy domain_strategy = 7;
   bool is_client = 8;
-  bool kernel_mode = 9;
+  bool no_kernel_tun = 9;
 }