Skip to content

Commit

Permalink
Xray-core v24.11.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@SaeedDev94
SaeedDev94 committed Nov 5, 2024
1 parent 32a76c5 commit 962e189
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.iml
.idea
.kotlin
.gradle
/local.properties
/.idea/caches
Expand Down
2 changes: 1 addition & 1 deletion XrayCore/Xray-core
Submodule Xray-core updated 51 files
+12 −0 app/dispatcher/default.go
+1 −1 app/dns/dnscommon_test.go
+1 −0 app/policy/config.go
+150 −42 app/policy/config.pb.go
+1 −0 app/policy/config.proto
+41 −0 app/proxyman/command/command.go
+310 −131 app/proxyman/command/command.pb.go
+17 −0 app/proxyman/command/command.proto
+82 −6 app/proxyman/command/command_grpc.pb.go
+2 −1 app/proxyman/inbound/worker.go
+14 −0 app/stats/command/command.go
+130 −123 app/stats/command/command.pb.go
+1 −0 app/stats/command/command.proto
+44 −6 app/stats/command/command_grpc.pb.go
+80 −0 app/stats/online_map.go
+45 −6 app/stats/stats.go
+6 −4 common/net/destination.go
+3 −0 common/protocol/account.go
+15 −1 common/protocol/user.go
+2 −2 core/core.go
+2 −2 core/proto.go
+3 −0 features/policy/policy.go
+44 −0 features/stats/stats.go
+2 −0 infra/conf/policy.go
+7 −3 infra/conf/shadowsocks.go
+3 −0 main/commands/all/api/api.go
+50 −0 main/commands/all/api/inbound_user.go
+45 −0 main/commands/all/api/inbound_user_count.go
+47 −0 main/commands/all/api/stats_online.go
+6 −0 proxy/http/config.go
+9 −0 proxy/proxy.go
+15 −2 proxy/shadowsocks/config.go
+15 −0 proxy/shadowsocks/server.go
+34 −0 proxy/shadowsocks/validator.go
+9 −5 proxy/shadowsocks_2022/config.go
+82 −98 proxy/shadowsocks_2022/config.pb.go
+3 −4 proxy/shadowsocks_2022/config.proto
+60 −32 proxy/shadowsocks_2022/inbound_multi.go
+9 −1 proxy/socks/config.go
+8 −1 proxy/trojan/config.go
+15 −0 proxy/trojan/server.go
+30 −0 proxy/trojan/validator.go
+10 −0 proxy/vless/account.go
+15 −0 proxy/vless/inbound/inbound.go
+32 −0 proxy/vless/validator.go
+16 −0 proxy/vmess/account.go
+23 −4 proxy/vmess/inbound/inbound.go
+14 −0 proxy/vmess/validator.go
+6 −1 proxy/wireguard/config.go
+11 −0 transport/internet/memory_settings.go
+19 −12 transport/internet/splithttp/dialer.go
4 changes: 2 additions & 2 deletions XrayCore/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ require (
golang.org/x/mobile v0.0.0-20241016134751-7ff83004ec2c // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.26.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
12 changes: 10 additions & 2 deletions XrayCore/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc h1:O9NuF4s+E/PvMIy+9IUZB9znF
golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
golang.org/x/mobile v0.0.0-20241016134751-7ff83004ec2c h1:zuNS/LWsEpPTLfrmBkis6Xofw3nieAqB4hYLn8+uswk=
golang.org/x/mobile v0.0.0-20241016134751-7ff83004ec2c/go.mod h1:snk1Mn2ZpdKCt90JPEsDh4sL3ReK520U2t0d7RHBnSU=
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
Expand All @@ -93,14 +95,20 @@ golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 h1:KJjNNclfpIkVqrZlTWcgOOaVQ00LdBnoEaRfkUx760s=
google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:mt9/MofW7AWQ+Gy179ChOnvmJatV8YHUmrcedo9CIFI=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
Expand Down
2 changes: 1 addition & 1 deletion XrayCore/libXray
Submodule libXray updated 3 files
+2 −2 build/app/build.py
+4 −7 go.mod
+6 −22 go.sum
1 change: 1 addition & 0 deletions buildXrayCore.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ prepare_go() {
# go mod edit -replace github.com/xtls/libxray=./libXray
# go mod tidy
# go get golang.org/x/mobile
# go get google.golang.org/genproto
go install golang.org/x/mobile/cmd/[email protected]
go mod download
}
Expand Down

0 comments on commit 962e189

Please sign in to comment.