lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 10:08:15 -05:00
Code Issues Releases Wiki Activity
5,327 Commits 22 Branches 438 Tags 68 MiB
8702812735
Commit Graph

113 Commits

Author SHA1 Message Date
Loyalsoldier
8702812735
Chore: fix lint (#533) 2020-12-20 11:30:31 +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
Xiaokang Wang
61112d8af7
Workaround for muti-json's hard coded override method (#409) 
* Simple workaround for muti-json unable to automatically understand new config options.

* Update jsonem.go
 2020-11-21 02:50:46 +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
Xiaokang Wang
3684dc15de
Merge pull request #351 from v2fly/dev-fix-mutijson-dep 
Fix json parsing dependency introduced by mutijson config
 2020-10-26 15:44:58 +00:00
Shelikhoo
9391f7c377
Apply Coding Style 2020-10-23 19:51:39 +01:00
Kslr
0dc17643a0
Merge pull request #299 from forever8938/master 
Load JSON internally by default
 2020-10-24 01:39:11 +08:00
Shelikhoo
fd2638c522
Fix json parsing dependency introduced by mutijson config 2020-10-23 15:04:03 +01:00
kslr
3c6e11673f revert: support yaml config 2020-10-20 14:01:16 +08: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
forever8938
51d3fc694f
Load JSON internally by default 
why not?
 2020-10-10 21:06:13 +08:00
Loyalsoldier
ba99e32b2d
Bazel: discard GOPATH (#278) 2020-10-07 18:35:21 +08:00
loyalsoldier
b181045b0c
Errorgen: support to run outside of GOPATH 2020-10-04 13:06:12 +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
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
97eddc2374
Add XTLS support 2020-09-21 14:56:43 +00:00
RPRX
bad7e2cfd8
VLESS PREVIEW 1.1 2020-07-28 15:00:23 +00:00
RPRX
c8f266c740
Adjust Bazel 2020-07-19 02:40:33 +00:00
rprx
4947537eee
Adjust arm build 2020-06-28 08:56:55 +00:00
rprx
694180fc9a
Add windows arm build (#39) 
* Add windows arm build

* Add windows arm build

* Add windows arm build
 2020-06-28 00:46:43 +08:00
Agioi Theodoroi
37a55653e9
remove unused parameter 2020-06-27 07:51:44 +08:00
Agioi Theodoroi
97074c5bf4
gofmt 2020-06-27 07:51:43 +08:00
kslr
bc96f75bcb add armv5 2020-06-19 20:20:14 +08:00
vcptr
0fd0c374c1 fix config compatibility with old inbound/inboundDetors/out 2020-03-24 21:52:03 +08:00
vcptr
94ea326d89 fix confdir env startup priority 2020-03-24 21:52:03 +08:00
Shelikhoo
e61b44ff78
Fix Test Parse flag before flag defined by V2 in main 2020-03-23 11:34:53 +08:00
vcptr
0d71d3dcf8 revert back to multiconfig 2020-03-19 19:11:16 +08:00
Kslr
fdbec9a141
Revert "multiple config" 2020-01-02 01:23:56 +08:00
Kslr
e6f226c64d
Revert "add arg -confdir" 2020-01-02 01:14:36 +08:00
vcptr
e50afd6e44 trim err msg 2019-12-31 13:29:25 +08:00
vcptr
c3f55dcd67 filter .json in confDir 2019-12-31 13:11:34 +08:00
vcptr
5ae47d45c2 multiconf with -confdir arg 2019-12-31 11:45:19 +08:00
Kslr
3c96c6ac22
Merge pull request #2124 from vcptr/newconfig 
multiple config
 2019-12-30 17:22:30 +08:00
vcptr
9d1cac1680
arm release include GOARM=6 2019-12-29 13:14:08 +08:00
vcptr
f578f0d617 add comment to please codacy 2019-12-24 01:13:10 +08:00
vcptr
f14eb97e3c rearrange loader 2019-12-16 10:22:17 +08:00
vcptr
75f0879c12 proper handle stdin 2019-12-14 23:48:56 +08:00
vcptr
1bb34bfe17 abstract type for conf load func 2019-12-14 23:48:56 +08:00
vcptr
1e76123a4c main loads multiple 2019-12-14 23:48:56 +08:00
Darien Raymond
9a125276b5
fix bazel build 2019-02-10 19:19:05 +01:00
Darien Raymond
4eb2b5e607
merge ext into core 2019-02-10 19:04:11 +01:00
Darien Raymond
7505be8bfc
enable dns outbound 2019-02-06 17:06:03 +01:00