1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-23 02:26:49 -05:00
Commit Graph

156 Commits

Author SHA1 Message Date
young-zy
6d25d51519
Update protobuf version (#527)
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
2020-12-20 10:50:46 +08:00
loyalsoldier
e6bea0d112
Merge branch 'master' into v5 2020-12-18 17:37:01 +08:00
Loyalsoldier
7a020d2d71
DNS & Routing: refine rule parsing process (#528) 2020-12-18 08:36:34 +08:00
dyhkwong
291eff1aa3
Refine Android build (#525)
Co-authored-by: ghost <noreply@example.com>
2020-12-17 08:50:13 +08:00
loyalsoldier
c6c0030b89
Merge branch 'master' into v5 2020-12-16 12:38:16 +08:00
Loyalsoldier
166d1afee5
DNS: add clientip for specific nameserver (#504) 2020-12-12 07:15:29 +08:00
CalmLong
6858a7b0a7
Routing: consistent with domains key in DNS configuration (#502) 2020-12-11 21:16:52 +08:00
Jebbs
7c1ab06206
v5: Remove v2ctl & wv2ray (#488)
* remove v2ctl, wv2ray
* remove v2ctl, wv2ray build scripts
* remove infra/control/main
* remove !confonly flag
* remove ctlcmd package
* remove Confgi.Override func
* move commands package into main
2020-12-04 22:32:55 +08:00
Jebbs
9367e9b1f2
V5: YAML support (#475)
* yml support

* code optimize

* remove external conf loaders

* update yaml test
code optimize

* code optimize

* fix a typo

* update convert desc
2020-12-03 06:11:24 +08:00
loyalsoldier
9475e8df3c
Merge branch 'master' into v5 2020-11-30 20:59:04 +08:00
Loyalsoldier
7de5bca056
Remove Bazel (#469)
due to https://github.com/v2fly/v2ray-core/pull/468
2020-11-30 20:48:17 +08:00
kslr
aa24f9a638 remove mtproto 2020-11-28 22:28:14 +08:00
Jebbs
ff59bd37ce
v5: New multi-json loader (#451)
* scalable commands column

* new multi-json loader
For both internal & external json loader

This commit also:
* applies -confdir to other formats, e.g. "yaml" in the future
* multiple assign of -confdir is accepted
* add flag to load confdir recursively
* config loader can have alias name
* json loader also accepts .jsonc
* add merge command
* add help topics for json merge, format loader
* format loaders don't panic

* apply lint style

* add merge test

* merge same tag in array, solve v2fly/discussion#97

* apply lint style

* merge code optimize

* fix merge cmdarg.Arg

* update cmd description

* improve merge logic
* fix zero value overwrite
* fix "null" lost after array merge

* code optimize

* fix merged slices not sorted

* code optimize

* add package doc

* fix a typo
2020-11-28 22:06:03 +08:00
Jebbs
521120d196
go style commands, merge v2ctl commands, v5 oriented (#369)
* go style commands
merge v2ctl commandsw

* migrate go style commands to v2ctl

* fixes & code optimize

* sort the commands

* update commands description

* restore old proto
golang.org proto has removed UnmarshalText, without alternative

* add test command

* remove unused code

* code optimize and fix
* The commit simplifies the run and test commands code,
* Fixes a hidden issue that the format flag not applied in command "v2ray test -format=pb ..."

* fix default loader logic
2020-11-23 23:38:43 +08:00
Loyalsoldier
b68f943c78
Fix lint according to golangci-lint (#439) 2020-11-22 05:05:01 +08:00
Kslr
623cb24644
Remove XTLS (#431)
* remove xtls

* generate pb

* Update protoc

* Clean up go.mod & go.sum

* format code

* restore vless flow

* fix codacy

* do NOT interfere with pb.go files

Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
2020-11-20 15:53:10 +08:00
Chinsyo
231f5bf024
Add missing deprecation notice to deprecated code (#437) 2020-11-20 15:18:44 +08:00
Ye Zhihao
5b2a9e8769
API: Reflection Service Support (#435) 2020-11-20 01:57:31 +08:00
Xiaokang Wang
fb0aadeea9
Transfer VSign and related project to V2Fly and share under the same license as v2ray-core (#392)
* Move VSign to V2Fly

* Use transfered V2BuildAssist  project
2020-11-08 03:11:45 +08:00
RPRX
21739e6f38
32 -> 0 2020-11-02 11:00:08 +00:00
lucifer
770b994337
Refine unix domain socket (#367) 2020-10-29 07:30:38 +00:00
Loyalsoldier
f17063a08a
Update vprotogen (#366)
* Refine vprotogen
* Regenerate pb.go files
2020-10-29 09:27:05 +08:00
maskedeken
24f688cc20
Trojan Protocol Handler implements UserManager (#344)
* Trojan Protocol Handler implements UserManager

* Update validator.go

Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
2020-10-22 04:01:26 +00:00
RPRX
25c461e072
LookPath overwrites protoc 2020-10-21 02:30:16 +00:00
ekenchan
3fc985dd0e
Add trojan over xtls support (#334)
* Add trojan over xtls support

* Add comments

* improve PR quality

* improve PR quality

* add xtls-rprx-origin-udp443 and xtls-rprx-direct-udp443

Co-authored-by: Eken Chan <maskedeken@yahoo.com>
2020-10-20 10:44:31 +00:00
kslr
3c6e11673f revert: support yaml config 2020-10-20 14:01:16 +08:00
RPRX
2aedff1218
Command -> LookPath 2020-10-20 03:07:10 +00:00
RPRX
d03584425c
Remove .dev/protoc & Detect and show download link 2020-10-19 15:20:19 +00:00
RPRX
3d378fc280
Fix generate .pb.go under Windows 2020-10-19 14:39:51 +00:00
ayanamist
5230dfb71e
Support YAML config through JSON (#331) 2020-10-19 07:28:33 +08:00
loyalsoldier
784775f689
Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
lucifer
425b4b497d
Add padding to abstract unix domain socket in fallbacks (#277)
* fix fall back to abstract unix domain socket in vless and trojan

* Update trojan.go

* Update vless.go

* Update trojan.go

* Update vless.go

Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
2020-10-08 00:35:21 +00:00
Loyalsoldier
ba99e32b2d
Bazel: discard GOPATH (#278) 2020-10-07 18:35:21 +08:00
Loyalsoldier
6e4701b700
Build: do NOT rely on GOPATH & refine user-package.sh (#270)
* Build: do NOT rely on GOPATH

* Format pipelines
2020-10-07 14:29:07 +08:00
Kslr
359f84407a
compiler use gogcc, remove gcflags and asmflags (#269) 2020-10-07 10:02:40 +08:00
RPRX
bcc7b78ff7
Add XTLS support to mKCP (#267) 2020-10-06 16:25:02 +00:00
Kslr
03fb762169
removes all file system paths from the compiled executable, to improve build reproducibility 2020-10-06 13:17:30 +08:00
RPRX
b8a78038a2
VLESS PREVIEW 2.3 2020-10-04 10:51:29 +00:00
loyalsoldier
b181045b0c
Errorgen: support to run outside of GOPATH 2020-10-04 13:06:12 +08:00
loyalsoldier
9b249f912b
Make variables of vprotogen easier to find 2020-10-04 10:05:00 +08:00
RPRX
271532fc84
Add full VLESS fallbacks support to Trojan (#254)
* Add full VLESS fallbacks support to Trojan

* Adjustments according to linter

* Use common.Must2() for pro.Write()
2020-10-03 13:12:35 +00:00
RPRX
60909dad31
VLESS PREVIEW 2.2 2020-10-03 03:23:24 +00:00
Kslr
9f344fa1c9
remove shadowsosks ota (#238)
* remove shadowsosks ota

* remove unused buf.Reader
2020-10-02 16:13:31 +08:00
Loyalsoldier
dcf368bd93
Refine Azure Pipelines & Bazel: remove unnecessary steps (#246)
* Bazel: remove GPG sign
* Azure Pipelines: remove unnecessary steps
2020-10-02 16:09:33 +08:00
RPRX
cde63bfac1
Add XTLS support to DomainSocket (#241) 2020-09-30 08:40:08 +00:00
Loyalsoldier
dfed0dc03a
Refine: geofile reading errors (#236) 2020-09-29 14:01:12 +08:00
maskedeken
e445d21f4b
Add trojan protocol support (#181)
* Add trojan protocol support

Co-authored-by: Eken Chan <ekenchan@msn.com>
Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Co-authored-by: GitHub Action <action@github.com>
2020-09-26 23:31:24 +08:00
RPRX
648d4180aa
VLESS PREVIEW 2 2020-09-24 01:59:14 +00:00
RPRX
97eddc2374
Add XTLS support 2020-09-21 14:56:43 +00:00
RPRX
ee1e18df24
Schedulers -> Flow 2020-09-11 03:37:23 +00:00