Merge branch 'XTLS:main' into main

omengye · Nov 16, 2023 · a6a6c89 · a6a6c89
2 parents f00dd90 + f1c8155
commit a6a6c89
Show file tree

Hide file tree

Showing 90 changed files with 1,079 additions and 612 deletions.
diff --git a/.github/build/friendly-filenames.json b/.github/build/friendly-filenames.json
@@ -2,7 +2,6 @@
   "android-arm64": { "friendlyName": "android-arm64-v8a" },
   "darwin-amd64": { "friendlyName": "macos-64" },
   "darwin-arm64": { "friendlyName": "macos-arm64-v8a" },
-  "dragonfly-amd64": { "friendlyName": "dragonfly-64" },
   "freebsd-386": { "friendlyName": "freebsd-32" },
   "freebsd-amd64": { "friendlyName": "freebsd-64" },
   "freebsd-arm64": { "friendlyName": "freebsd-arm64-v8a" },

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -70,12 +70,10 @@ jobs:
     strategy:
       matrix:
         # Include amd64 on all platforms.
-        goos: [windows, freebsd, openbsd, linux, dragonfly, darwin]
+        goos: [windows, freebsd, openbsd, linux, darwin]
         goarch: [amd64, 386]
         exclude:
-          # Exclude i386 on darwin and dragonfly.
-          - goarch: 386
-            goos: dragonfly
+          # Exclude i386 on darwin
           - goarch: 386
             goos: darwin
         include:

diff --git a/app/commander/config.pb.go b/app/commander/config.pb.go
diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go
diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go
diff --git a/app/dns/fakedns/fakedns.pb.go b/app/dns/fakedns/fakedns.pb.go
diff --git a/app/log/command/config.pb.go b/app/log/command/config.pb.go
diff --git a/app/log/config.pb.go b/app/log/config.pb.go
diff --git a/app/metrics/config.pb.go b/app/metrics/config.pb.go
diff --git a/app/observatory/command/command.pb.go b/app/observatory/command/command.pb.go
diff --git a/app/observatory/config.pb.go b/app/observatory/config.pb.go
diff --git a/app/policy/config.pb.go b/app/policy/config.pb.go
diff --git a/app/proxyman/command/command.pb.go b/app/proxyman/command/command.pb.go
diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go
diff --git a/app/reverse/config.pb.go b/app/reverse/config.pb.go
diff --git a/app/router/command/command.pb.go b/app/router/command/command.pb.go
diff --git a/app/router/config.pb.go b/app/router/config.pb.go
diff --git a/app/stats/command/command.pb.go b/app/stats/command/command.pb.go
diff --git a/app/stats/config.pb.go b/app/stats/config.pb.go
diff --git a/common/log/log.pb.go b/common/log/log.pb.go
diff --git a/common/net/address.pb.go b/common/net/address.pb.go
diff --git a/common/net/destination.pb.go b/common/net/destination.pb.go
diff --git a/common/net/network.pb.go b/common/net/network.pb.go
diff --git a/common/net/port.pb.go b/common/net/port.pb.go
diff --git a/common/protocol/headers.pb.go b/common/protocol/headers.pb.go
diff --git a/common/protocol/server_spec.pb.go b/common/protocol/server_spec.pb.go
diff --git a/common/protocol/user.pb.go b/common/protocol/user.pb.go
diff --git a/common/serial/typed_message.pb.go b/common/serial/typed_message.pb.go
diff --git a/core/config.pb.go b/core/config.pb.go
diff --git a/core/core.go b/core/core.go
@@ -21,7 +21,7 @@ import (
 var (
 	Version_x byte = 1
 	Version_y byte = 8
-	Version_z byte = 4
+	Version_z byte = 5
 )
 
 var (

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/xtls/xray-core
 
-go 1.21
+go 1.21.4
 
 require (
 	github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344
@@ -14,48 +14,50 @@ require (
 	github.com/refraction-networking/utls v1.5.4
 	github.com/sagernet/sing v0.2.17
 	github.com/sagernet/sing-shadowsocks v0.2.5
-	github.com/sagernet/wireguard-go v0.0.0-20221116151939-c99467f53f2c
 	github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb
 	github.com/stretchr/testify v1.8.4
 	github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e
-	github.com/xtls/reality v0.0.0-20230828171259-e426190d57f6
+	github.com/vishvananda/netlink v1.2.1-beta.2.0.20230316163032-ced5aaba43e3
+	github.com/xtls/reality v0.0.0-20231112171332-de1173cf2b19
 	go4.org/netipx v0.0.0-20230824141953-6213f710f925
-	golang.org/x/crypto v0.14.0
-	golang.org/x/net v0.17.0
+	golang.org/x/crypto v0.15.0
+	golang.org/x/net v0.18.0
 	golang.org/x/sync v0.5.0
 	golang.org/x/sys v0.14.0
+	golang.zx2c4.com/wireguard v0.0.0-20231022001213-2e0774f246fb
 	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
-	gvisor.dev/gvisor v0.0.0-20230822212503-5bf4e5f98744
 	h12.io/socks v1.0.3
 	lukechampine.com/blake3 v1.2.1
 )
 
 require (
-	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/cloudflare/circl v1.3.3 // indirect
+	github.com/andybalholm/brotli v1.0.6 // indirect
+	github.com/cloudflare/circl v1.3.6 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
-	github.com/klauspost/compress v1.17.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
-	github.com/onsi/ginkgo/v2 v2.12.1 // indirect
+	github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
+	github.com/klauspost/compress v1.17.2 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/onsi/ginkgo/v2 v2.13.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
 	go.uber.org/mock v0.3.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.13.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.4.0 // indirect
+	golang.org/x/tools v0.15.0 // indirect
+	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gvisor.dev/gvisor v0.0.0-20231104011432-48a6d7d5bd0b // indirect
 )