github
/
Xray-core
mirror of https://github.com/XTLS/Xray-core
1
0
Fork 0
Code Issues Releases Wiki Activity
1,206 Commits
22 Branches
76 Tags
14 MiB
Commit Graph

133 Commits (c8b17ad18d71b1cc38751e4f00131ddba07b9c10)

Author SHA1 Message Date
nobody 44bb83033f
Add sub-command "-dump" to "run". (#2854) 
* Add MarshalToJson().

* Add cmd arg -dump for printing out merged multiple json configs.

---------

Co-authored-by: nobody <nobody@nowhere.mars>
 2023-12-29 11:16:48 -05:00
yuhan6665 2570855cd7 Update v1.8.6 2023-11-17 20:11:40 -05:00
yuhan6665 ac52a226d1 v1.8.5 2023-11-12 16:57:15 -05:00
yuhan6665 d9fd3f8eb1
Freedom xdomain strategy (#2719) 
* 统一 `domainStrategy` 行为.

* aliases NG.

* 化简.

* 调整.

* Let it crash.

* Update proto

---------

Co-authored-by: rui0572 <125641819+rui0572@users.noreply.github.com>
 2023-11-12 16:27:39 -05:00
yuhan6665 4f05e0ac2b Unify environment var readers 2023-10-29 15:16:57 -04:00
RPRX f7c20b85dc
v1.8.4 2023-08-29 07:20:10 +00:00
hax0r31337 f67167bb3b refactor(deps): replace github.com/golang/protobuf with google.golang.org/protobuf 2023-08-10 10:43:27 -04:00
冬花ice 017b56adf5
Recognize .jsonc files automatically (#2398) 
Closes https://github.com/XTLS/Xray-core/issues/2399
 2023-08-06 06:47:31 +00:00
RPRX 6f9df63c70
v1.8.3 2023-06-19 00:35:46 +00:00
RPRX 72bbc5ae0e
v1.8.2 2023-06-18 20:43:20 +00:00
yuhan6665 d11d72be6c Update proto file and fix protoc version parsing 
The new protoc cli return version v23.1,
so we parse the file version v4.23.1 without "4."
 2023-06-11 13:36:06 -04:00
RPRX d3060c28f8
v1.8.1 2023-04-17 23:22:12 +00:00
RPRX d6801ab031
v1.8.0 2023-03-09 13:55:09 +00:00
RPRX 4d2e2b24d3
THE NEXT FUTURE becomes THE REALITY NOW 
Thank @yuhan6665 for testing
 2023-02-15 16:07:12 +00:00
RPRX 15999e5c2a
v1.7.5 2023-02-08 17:20:24 +08:00
RPRX f176ec54ee
v1.7.3 2023-02-02 05:50:21 +00:00
RPRX b70912799b
Generate *.pb.go files with protoc v3.21.12 
https://github.com/protocolbuffers/protobuf/releases/tag/v21.12
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
go run ./infra/vprotogen
 2023-01-30 04:35:30 +00:00
RPRX 1bf3a632ca
v1.7.2 2023-01-07 17:51:40 +00:00
yuhan6665 9bc1564b0a Update v1.7.1 and dependencies 2023-01-06 21:10:47 -05:00
yuhan6665 3db7d44fc2 Update v1.7.0 and denpendencies 2022-12-25 19:47:53 -05:00
yuhan6665 c4fbdf1b78 Run core/format.go 2022-12-25 19:47:53 -05:00
yuhan6665 f3104b8684 Update v1.6.6 and denpendencies 2022-12-11 10:03:33 -05:00
yuhan6665 79eda46c62 Update v1.6.5 and denpendencies 2022-11-27 18:28:38 -05:00
yuhan6665 aa846b8420 Update v1.6.4 and dependencies 2022-11-13 12:21:18 -05:00
yuhan6665 15d66974cc Update v1.6.3 and dependencies 2022-11-06 22:15:41 -05:00
yuhan6665 9b293013e6 Update v1.6.2 and dependencies 2022-10-29 00:57:00 -04:00
yuhan6665 2637970976 Update version 1.6.1 
Also update dependencies
 2022-10-21 21:13:17 -04:00
yuhan6665 8117b66949 Generate all protos 2022-10-10 13:17:32 -04:00
yuhan6665 6bb735d103 Update version 1.6.0 2022-09-18 10:46:21 -04:00
yuhan6665 35d5a7fe93 Update version 1.5.10 2022-08-27 22:57:35 -04:00
yuhan6665 05483cc729 Update version 1.5.9 2022-07-15 22:05:40 -04:00
yuhan6665 7d946562eb Update version 1.5.8 2022-06-19 19:14:53 -04:00
yuhan6665 cc67e83a8f Update version 1.5.7 2022-06-05 07:46:18 -04:00
yuhan6665 f0b58d9ee0 Update version 1.5.6 2022-05-28 12:07:11 -04:00
世界 f046feb9ca
Reformat code 2022-05-18 15:29:01 +08:00
世界 778992eeb9
Fix vformat 2022-05-18 15:27:55 +08:00
yuhan6665 5e18ae68b7 Update version 1.5.5 2022-04-23 19:38:50 -04:00
yuhan6665 3d3801fc25 Update version 1.5.4 2022-03-12 20:39:54 -05:00
yuhan6665 94c249a8c8
Fix some flaky tests related to pick port (#985) 
* Fix some tests to PickPort correctly

* Add retry logic for two socks tests

Two socks tests listen for both TCP and UDP with same port number, in some cases the port is not available
Add retry logic for server core, start server core and client core separately
Extract a common method

* Add retry logic for two dokodemo tests

Two dokodemo tests listen for 5 ports, in some cases they are not available
Add retry logic for client core, start server and client separately
 2022-03-12 11:56:40 -05:00
yuhan6665 496b2c02c5
Fix context api and document (#727) 
* Fix Dial function crash instance when there is no instance context in the ctx

* check ctx to fix. (#841)

* Feat: core.ToContext(ctx, v) for ctx initialization (#852)

* remove exported API: toContext

* Remove unnecessary API

* rework document for API

* fix: make sure the ctx is propagated to connections by detached connection

Co-authored-by: Shelikhoo <xiaokangwang@outlook.com>
Co-authored-by: rurirei <72071920+rurirei@users.noreply.github.com>
 2022-02-19 22:45:41 -05:00
yuhan6665 d51db9469e Update version 1.5.3 2022-01-28 18:13:15 -05:00
yuhan6665 980b35b3fe Update version 1.5.2 2021-12-24 09:19:17 -05:00
yuhan6665 b0a08d3ed3 Update version 1.5.1 2021-12-14 20:34:07 -05:00
lucifer9 d6ae4e9ba2 Make it easier to configure multiple listening ports 2021-11-17 23:13:15 -05:00
Arthur Morgan a58e20c811
v1.5.0 2021-10-20 14:55:23 +08:00
yuhan6665 e286cdcaa8
Style: format code by gofumpt (#761) 2021-10-20 00:57:14 +08:00
yuhan6665 3554886ce1
vformat supports multi-core processing (#757) 
* Feat: vformat supports multi-core processing (#996)

Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
 2021-10-12 15:29:22 +00:00
yuhan6665 1ef824c0b4
Fix go generate core/format.go (#725) 2021-09-27 13:45:02 +08:00
Arthur Morgan a149c78a4c
v1.4.5 2021-09-23 11:43:48 +08:00
hmol233 7033f7cf5f
Fix: protobuf file (#724) 2021-09-20 22:41:09 +08:00
Arthur Morgan ab927d2cca v1.4.4 2021-09-20 20:42:42 +08:00
yuhan6665 dbcbb519e3
Feat: format code in one-key (#719) 
Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
 2021-09-20 14:22:52 +08:00
yuhan6665 42d158bd85
vprotogen refine (#717) 
* Update all proto files with existing vprotogen
* Chore: remove protoc-gen-gofast
* Feat: vprotogen adds version detector to block generation code from old protobuf version
* Feat: vprotogen refine logic

Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
 2021-09-18 01:16:14 +08:00
Arthur Morgan 1dca3cb3dd v1.4.3 2021-09-08 01:38:12 +08:00
Jim Han f65c21337c
v1.4.2 2021-04-01 21:08:53 +08:00
Jim Han 95a68a6d73
v1.4.1 2021-03-31 16:00:16 +08:00
秋のかえで 6c936e2fd3
fix: set json to default format to stdin (#446) 2021-03-28 23:45:13 +08:00
秋のかえで b0e7ad9663
Fix: format flag not working (#410) 2021-03-21 09:13:51 +00:00
RPRX 9dec65e367
v1.4.0 2021-03-14 15:59:19 +00:00
JimhHan 9adce5a6c4
Fix: core/config.proto 2021-03-13 20:49:02 +08:00
Jim Han db32ce6fd9
Enhance DNS and Dialer (#341) 2021-03-06 16:29:17 +00:00
AkinoKaede d67cf3d598
v1.3.1 2021-03-02 22:59:27 +08:00
RPRX 573b7807c0
v1.3.0 2021-02-12 15:59:56 +00:00
Monsoon 1b87264c53
Support loading config from different formats (#228) 2021-02-12 14:12:58 +00:00
RPRX d170416219
Add environment variable XRAY_CONE_DISABLED option 2021-02-11 15:37:02 +00:00
RPRX 1174ff3090
Refactor: VLESS & VMess & Mux UDP FullCone NAT 
https://t.me/projectXray/242770
 2021-02-11 01:28:21 +00:00
RPRX 523c416bb5
v1.2.4 2021-01-31 11:56:39 +00:00
Jim Han 4cd343f2d5
Fix tests (#201) 
Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
 2021-01-30 13:01:20 +00:00
RPRX 7da97635b2
v1.2.3 2021-01-22 04:00:03 +00:00
RPRX 8eed8a0824
v1.2.2 2021-01-15 13:18:37 +00:00
RPRX e254424c43
v1.2.1 2021-01-10 07:58:53 +00:00
RPRX ee15cc253f
Improve configuration detector (cone or symmetric) 2021-01-10 07:50:21 +00:00
RPRX 8fc2d3b61f
v1.2.0 2021-01-01 12:30:16 +00:00
RPRX 6bcac6cb10 Move common/net/connection.go into cnc folder 2020-12-28 03:20:39 +08:00
RPRX 0203190a98
v1.1.5 2020-12-25 15:25:10 +00:00
RPRX 4140ed7ab0
v1.1.4 2020-12-18 13:12:41 +00:00
RPRX d71fa16e64
v1.1.3 2020-12-11 09:32:13 +00:00
RPRX f8faf3c8b8 Removal: confonly 2020-12-11 13:05:29 +08:00
JimhHan 9c0f0a0cd5
Fix: Code generator & API (#52) 2020-12-10 03:52:05 +00:00
RPRX bf9401ae7d
v1.1.2 2020-12-06 10:08:11 +00:00
RPRX d7ff78c688
v1.1.1 2020-12-04 03:29:36 +00:00
RPRX 16544c18ab v1.1.0 2020-12-04 09:36:16 +08:00
RPRX c7f7c08ead v1.0.0 2020-11-25 19:01:53 +08:00