1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-16 09:26:21 -05:00
Commit Graph

305 Commits

Author SHA1 Message Date
Shelikhoo
7bf1d7a1ce
add jsonv5 conf loader 2021-09-04 19:54:07 +01:00
Shelikhoo
51f05b1bff
fix test break for refactor data into seperate package 2021-09-04 19:43:10 +01:00
Shelikhoo
cef6a46548
add support for custom loader in json parser 2021-09-04 19:22:41 +01:00
Shelikhoo
1ec9a41ee8
added root config builder 2021-09-04 18:45:02 +01:00
Shelikhoo
2560e79ef0
added V5 config builder for outbound 2021-09-04 17:57:12 +01:00
Shelikhoo
9f145b4265
added V5 config builder for V5 2021-09-04 17:49:37 +01:00
Shelikhoo
98ba3a13f0
added protobuf config builder for stream 2021-09-04 17:19:18 +01:00
Shelikhoo
3ebc365230
add error message for v5cfg 2021-09-04 16:49:07 +01:00
Shelikhoo
324f0abbf0
added heterogeneous configure file loader 2021-09-04 16:48:23 +01:00
Shelikhoo
927f21e3e5
add v5 configure file skeleton 2021-09-04 16:11:46 +01:00
Shelikhoo
18b90d13df
isolate proxy settings: auto generated 2021-09-04 13:23:16 +01:00
Shelikhoo
4549dba2d7
update Build Interface 2021-09-04 13:20:04 +01:00
Shelikhoo
663e6028c3
isolate mux,proxy settings 2021-09-04 13:19:43 +01:00
Shelikhoo
436aaca6ab
isolate socks settings 2021-09-04 12:52:13 +01:00
Shelikhoo
df9624a965
isolate tls settings 2021-09-04 12:48:23 +01:00
Shelikhoo
38210fd74a
isolate sniffer config 2021-09-04 12:47:23 +01:00
Shelikhoo
3e68a192f5
isolate sniffer config 2021-09-04 12:37:53 +01:00
Shelikhoo
d1a4b0388a
add app environment definitions 2021-09-04 11:13:31 +01:00
Shelikhoo
a4e6fe5a94
reference google version of protobuf library 2021-09-04 11:13:31 +01:00
Shelikhoo
881571374d
rename Router Enum name Domain to prevent name collision
This creates build break in C++ environment.
2021-09-04 11:13:31 +01:00
Shelikhoo
d0521c3861
added protobuf descriptor into repo 2021-09-04 11:13:31 +01:00
Shelikhoo
3bcee172b0
refactor v2jsonpb to reduce unnecessary complexity 2021-09-04 11:13:30 +01:00
Shelikhoo
95ddd2a313
jsonpb loading 2021-09-04 11:13:30 +01:00
Shelikhoo
c119d8dc79
v2jsonpb full dump support 2021-09-04 11:13:30 +01:00
Shelikhoo
c187b6fb3e
v2jsonpb full dump 2021-09-04 11:13:30 +01:00
Shelikhoo
b36b434689
jsonpb format 2021-09-04 11:13:30 +01:00
Shelikhoo
28c36019b2
support v4 json pb output 2021-09-04 11:13:29 +01:00
Shelikhoo
2df4fa39e3
added jsonpb format support: auto generated 2021-09-04 11:13:29 +01:00
Shelikhoo
32374eb545
added jsonpb format support 2021-09-04 11:13:29 +01:00
Shelikhoo
ba2dd5995d
replace TypedMessage with anypb.Any 2021-09-04 11:13:28 +01:00
Shelikhoo
add375390e
move v4 configure support to own directory 2021-09-04 11:13:13 +01:00
Shelikhoo
c86ac3aca6
isolate dns settings synthesis: auto generated 2021-09-04 11:13:13 +01:00
Shelikhoo
b37755d111
isolate dns settings synthesis 2021-09-04 11:13:13 +01:00
Shelikhoo
3510ddb464
isolate log settings synthesis 2021-09-04 11:13:13 +01:00
Shelikhoo
72d2184dba
isolate router settings synthesis: auto generated file 2021-09-04 11:13:13 +01:00
Shelikhoo
39b3866774
isolate router settings synthesis 2021-09-04 11:13:11 +01:00
Shelikhoo
41b54ff61e
move buildable to cfg common 2021-09-04 11:12:36 +01:00
Shelikhoo
22f6b100ba
fix v4 json loader MultiObservatoryConfig 2021-09-04 11:12:35 +01:00
Shelikhoo
ab803000e7
bug fix for observer 2021-09-04 11:12:35 +01:00
Shelikhoo
6fd8e36a3b
adjust test with updated structure 2021-09-04 11:12:35 +01:00
Shelikhoo
2dc539cc70
add V4 json support for observer tag config 2021-09-04 11:12:34 +01:00
Shelikhoo
2cdad52334
add v4 json support for BurstObservatory & fix balancer reference 2021-09-04 11:12:33 +01:00
jebbs
a8dd708028
parse duration conf with time.Parse() 2021-09-04 11:12:04 +01:00
Shelikhoo
718d6f32bf
update coding style 2021-09-04 11:12:04 +01:00
Jebbs
7a0af318df
refine api, run command and merger (#766)
* mergers code optimize

* api log work with pipe

* remove inbounds/outbounds by tags
*fix rmo flag parse

* cmds description and message optimize
2021-09-04 11:11:45 +01:00
Jebbs
2523d77919
improve commands
(rebased from ebbf31f07e)
2021-09-04 11:11:45 +01:00
Jebbs
fa0cf6db26
v5: Health Check & LeastLoad Strategy (rebased from 2c5a714903)
Some changes will be necessary to integrate it into V2Ray
2021-09-04 11:11:45 +01:00
秋のかえで
dde9463275
V5: Add TOML Support (rebased from 36ba06837f) 2021-09-04 11:11:45 +01:00
Jebbs
ec1694beb1
fix commands issues (#492)
* fix api commands output

* remove unused code

* fix convert always has -r

* update merge err to locate failed file
2021-09-04 11:09:58 +01:00
young-zy
12dfbc78a3
Update protobuf version (rebased from 6d25d51519)
Some change is not adopted since it would break the code base. These changes will be reintroduced at a later date.
2021-09-04 11:09:58 +01:00