1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-17 01:53:36 -05:00
Commit Graph

186 Commits

Author SHA1 Message Date
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
Jebbs
b05a469488
v5: Remove v2ctl & wv2ray (rebased from 7c1ab06206) 2021-09-04 11:09:55 +01:00
Jebbs
557b0c3353
V5: YAML support (rebased from 9367e9b1f2) 2021-09-04 11:05:52 +01:00
kslr
54a627c443
remove mtproto (rebased from aa24f9a638) 2021-09-04 11:05:36 +01:00
Jebbs
8c78712841
v5: New multi-json loader (rebased from ff59bd37ce) 2021-09-04 11:05:20 +01:00
Jebbs
a96e093432
go style commands, merge v2ctl commands, v5 oriented (rebased from 521120d196) 2021-09-04 11:05:19 +01:00
Shelikhoo
a53fd35205
separate client ca and server ca
This is designed to prevent a server from being attacked with a client with a certificate issued by a trusted system CA.
Some commercial CA actually can issue certificate to individual to proof their identity. The server should not accept these certs as a valid client certificates.
2021-09-01 22:34:13 +01:00
ydx
fb665ee94a
add client certificate verify (#1169) 2021-09-01 21:12:03 +01:00
Loyalsoldier
5794a97708
Fix: JSON tag case (#1212)
JSON unmarshal is case insensitive in Golang
2021-08-19 21:16:54 +08:00
ihotte
8f429c35cb
Fix: observatory log & JSON config(#1211)
Co-authored-by: ihotte <ihotte@yeah.net>
2021-08-19 13:40:47 +08:00
Loyalsoldier
639148dda4
Refinement: LRU (#1142) 2021-08-10 11:08:45 +08:00
Shelikhoo
91a2286064
apply coding style 2021-07-01 19:02:27 +01:00
Shelikhoo
54fc21e537
add custom probe interval for observer 2021-06-30 19:33:37 +01:00
Shelikhoo
4773e3a1ed
add custom probe URL support for observatory 2021-06-30 17:47:29 +01:00
Shelikhoo
0822160008
VMess AEAD based packet length 2021-06-22 12:26:01 +01:00
Loyalsoldier
6f8979d017
Style: format code by gofumpt (#1022) 2021-05-20 05:28:52 +08:00
Shelikhoo
31a7fb503c
update TCPKeepAliveInterval type to allow expression disable 2021-05-06 15:33:35 +01:00
Shelikhoo
77a573caf1
refactor test for loader benchmark 2021-05-05 13:50:56 +01:00
loyalsoldier
fa85afc920
Feat: add geodata loader benchmark 2021-05-05 13:22:01 +01:00
Loyalsoldier
1cb9fd2999
Chore: little refinements (#973) 2021-05-05 07:28:09 +08:00
Shelikhoo
d6abddc7f5
rename the field to keep lint happy 2021-05-04 22:55:39 +01:00
Shelikhoo
44514ebc1a
Merge branch 'dev-wsearlydatadiverse' 2021-05-04 22:50:06 +01:00
Shelikhoo
8d4b4201f8
add json parse rule for tcp keep alive interval 2021-05-04 22:37:38 +01:00
rurirei
2129c6e1e9
feat: update bootstrap_dns_android (#966)
* update with non_specified network

* remove wrongs

* add alternative bootstrapDialer

* do test

* Update dns_bootstrap_android_test.go

* example of alternative dialer

* public method

* move const

* Update dns_bootstrap_android_test.go

* no duplicated

* Rename infra/conf/dns_bootstrap_android.go to transport/internet/system_dns_android.go

* Update system_dns_android.go

* Update and rename infra/conf/dns_bootstrap_android_test.go to transport/internet/system_dns_android_test.go

* no imports

* Update system_dns_android.go

* Update system_dns_android_test.go

* create systemDNS

* Create system_dns_android.go

* Update system_dialer.go

* call Resolver on systemDialer

* create system_dns_test.go

* resolver.LookupIP params

* param fix

* noneed TestSystemDNSResolver

* revert: no specified resolver

* Delete system_dns.go

* android only

* android only test

* typo
2021-05-04 22:22:01 +01:00
Shelikhoo
1d7e497599
Added json configure file parsing of h2 transport 2021-05-04 20:32:27 +01:00
loyalsoldier
007a15bd79
fix 2021-05-04 19:21:46 +01:00
loyalsoldier
2bdc86049a
code style 2021-05-04 19:21:34 +01:00
loyalsoldier
40f8e82204
refine 2021-05-04 19:19:43 +01:00
Shelikhoo
3ba9a5b4f5
Refine geodata related tests (#967)
(cherry picked from commit 7805ca2ac1)
2021-05-04 19:13:52 +01:00
Shelikhoo
bf0e7e35c8
move geo loader conf to environment variable 2021-05-04 19:08:18 +01:00
Shelikhoo
19d1ff9003
apply coding style 2021-05-04 19:08:15 +01:00
Shelikhoo
4610c5e23f
memconservative geofile loader 2021-05-04 19:08:06 +01:00
Shelikhoo
0f1fac84ca
refactor configure file loader for geo loader and v5 2021-05-04 19:07:58 +01:00
Shelikhoo
9458963b5a
Revert "Refactor: memory-efficient geo file decoder (#934)"
This reverts commit 7e876709
2021-05-04 19:07:54 +01:00
Shelikhoo
ace2c44c2b
Revert "Refine geodata related tests (#967)"
This reverts commit 7805ca2a
2021-05-04 19:07:35 +01:00
Loyalsoldier
7805ca2ac1
Refine geodata related tests (#967) 2021-05-04 16:30:23 +08:00
Shelikhoo
40a7847d7f
update json configure for websocket header 2021-05-01 15:49:42 +01:00
Loyalsoldier
980fb59878
Fix: observatory starts with empty config & fails to close (#957) 2021-05-01 22:28:23 +08:00
秋のかえで
b68411f460
Fix: browserforwarder panics with empty config (#954)
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
2021-05-01 20:50:30 +08:00
Loyalsoldier
7e876709fe
Refactor: memory-efficient geo file decoder (#934) 2021-05-01 07:59:29 +08:00
Shelikhoo
95432b2131
fix:browser forwarder not supported by multi-json 2021-04-30 20:53:08 +01:00
Shelikhoo
347b0c3e85
fix:observatory not supported by multi-json 2021-04-30 15:25:24 +01:00
Loyalsoldier
a21e4a7deb
Fix: FakeDNS IPv6 & refine JSON unmarshal (#925) 2021-04-22 08:12:52 +08:00
Shelikhoo
0c6a2e06b9
added json loading of the PinnedPeerCertificateChainSha256 2021-04-16 23:52:49 +01:00
Shelikhoo
3cd145a6f0
fix not creating test dir in some environment 2021-04-13 18:15:06 +01:00
Shelikhoo
d7c9a98d76
apply coding style 2021-04-13 16:06:48 +01:00
Shelikhoo
8323add330
apply coding style 2021-04-13 15:50:29 +01:00
Shelikhoo
1e282944a6
apply coding style 2021-04-13 15:39:10 +01:00
Shelikhoo
f5d2ddedb4
Merge branch 'dev-fakednsimprovement' 2021-04-13 15:14:47 +01:00
Shelikhoo
6dcdd2afad
Merge branch 'dev-advloadblancer-2' 2021-04-13 15:09:32 +01:00