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

345 Commits

Author SHA1 Message Date
Felix Yan
7001483b62
Don't copy assets if they are already present
They can now reside in system path (like /usr/share/v2ray), so it's not
possible to copy into there.
2020-09-03 16:17:44 +08:00
Loyalsoldier
ef460f68f8
Adjust Protocol Buffers (#109)
* Update protoc binary executable files to v3.13.0

* Write proto files in more standard way

* Make go generate & vprotogen compatible with protoc-gen-gofast

* Regenerate pb.go files according to new proto files

* Clean go.sum by running go mod tidy

* Implement mustEmbedUnimplementedServiceServer for gPRC services
2020-08-24 12:10:26 +00:00
Vigilans
c74a33f827 Amending domain matcher with returning array of all matches 2020-08-11 13:31:04 +08:00
Vigilans
40c0bcc3ab Support source port matching in routing config 2020-08-09 16:53:45 +08:00
Agioi Theodoroi
bbd3988f3d
clean up code 2020-06-27 07:51:42 +08:00
Shelikhoo
09b81b78c3
regenerate pb data 2020-06-08 16:16:32 +08:00
Kirill Motkov
0401a91ef4 Some code improvements
* Rewrite empty string checks more idiomatically.
* Change strings.ToLower comparisons to strings.EqualFold.
* Rewrite switch statement with only one case as if.
2019-06-28 17:53:44 +03:00
Darien Raymond
02d8845093
add scripting support for attributes matching 2019-02-28 14:04:43 +01:00
Darien Raymond
0d31a68694
extract all session context before checking conditions 2019-02-28 09:28:55 +01:00
Darien Raymond
95583b5031
support range list in routing rule 2019-02-24 23:43:00 +01:00
Darien Raymond
7e5e080488
move sniffing result to session 2019-02-22 16:58:16 +01:00
Darien Raymond
4eb2b5e607
merge ext into core 2019-02-10 19:04:11 +01:00
Darien Raymond
1ab94fed79
optimize v2ctl size 2019-02-01 20:08:21 +01:00
Darien Raymond
c9958681f7
remove dependency on assert lib 2019-01-31 20:57:01 +01:00
Darien Raymond
7f1bd9f522
comment 2018-12-27 21:13:02 +01:00
Darien Raymond
82d562d1f0
use session.Outbound.ResolvedIPs 2018-12-04 20:36:51 +01:00
Darien Raymond
e5314cfb56
domain property 2018-12-01 21:02:36 +01:00
Darien Raymond
769f770cf7
migrate NetworkList to []Network 2018-11-20 16:58:26 +01:00
Darien Raymond
7b80322b60
fix function signature 2018-11-20 16:12:14 +01:00
Darien Raymond
6543f5825b
remove usage of NetworkList in NetworkMatcher 2018-11-20 12:27:33 +01:00
Darien Raymond
b9c8506c23
optimize network matcher 2018-11-20 12:25:56 +01:00
Darien Raymond
2364f5f280
remove AddressFamily.Either() 2018-11-16 11:13:36 +01:00
Darien Raymond
58221ebae1
optimize multi-geoip matcher 2018-11-07 23:57:06 +01:00
Darien Raymond
2cc92920fa
test case for balancer 2018-11-07 21:25:43 +01:00
Darien Raymond
73d3be424b
prototype for balancing rules 2018-11-07 21:08:20 +01:00
Darien Raymond
6e82128dc9
remove unused code 2018-11-05 11:36:05 +01:00
Darien Raymond
e13def10c4
more test cases 2018-11-04 19:14:17 +01:00
Darien Raymond
128a90b98b
move link to transport 2018-11-03 12:36:29 +01:00
Darien Raymond
815c7f09ba
migrate to std lib 2018-11-02 15:47:58 +01:00
Darien Raymond
9360448c59
improve geoip matching performance 2018-11-02 12:30:45 +01:00
Darien Raymond
41956e92a5
migrate to the new geoip matcher 2018-11-01 21:43:16 +01:00
Darien Raymond
5400153827
sort cidr list before use 2018-11-01 21:30:36 +01:00
Darien Raymond
15cd999ed3
comments 2018-11-01 10:39:03 +01:00
Darien Raymond
c73e899f54
prototype for high performance geoip matcher 2018-11-01 09:10:41 +01:00
Darien Raymond
ee74256aac
sort.Interface for CIDR list 2018-11-01 08:44:11 +01:00
Darien Raymond
9e66f315e6
update mocks 2018-10-23 22:41:27 +02:00
Darien Raymond
5fc606ce9d
relocate mocks 2018-10-23 22:27:45 +02:00
Darien Raymond
c2566e1331
cleanup unused scenarios 2018-10-22 22:40:53 +02:00
Darien Raymond
ed2779e333
more test case for router 2018-10-22 20:59:01 +02:00
Darien Raymond
39134c1b82
remove unnecessary sleep 2018-10-22 16:14:00 +02:00
Darien Raymond
f78cf6cfc2
testing with mock 2018-10-22 15:58:52 +02:00
Darien Raymond
307aac26b3
simplify dependency resolution 2018-10-22 11:26:22 +02:00
Darien Raymond
a5dcb0f13e
refactor dependency resolution 2018-10-21 10:27:13 +02:00
Darien Raymond
595f3d685e
merge user info inbound metadata 2018-10-15 08:36:50 +02:00
Darien Raymond
d730637239
Require Type() for Feature 2018-10-12 23:57:56 +02:00
Darien Raymond
b4821c5ed5
move policy and dnsClient 2018-10-11 22:34:31 +02:00
Darien Raymond
b6dc31d3fe
first part to move feature interfaces into dedicated directory 2018-10-11 20:43:37 +02:00
Iskander Sharipov
4dfe45ec19 app/router: rewrite if-else chain to switch
From effective Go: https://golang.org/doc/effective_go.html#switch

> It's therefore possible—and idiomatic—to write an if-else-if-else chain as a switch.
2018-10-01 12:07:19 +03:00
Darien Raymond
091fa6ad23
use new errorgen 2018-09-30 23:08:41 +02:00
Darien Raymond
d55fbd7f8d
simplify error creation 2018-09-30 18:39:53 +02:00
Darien Raymond
00ea6e3cb2
update protobuf generated files 2018-09-30 18:39:28 +02:00
Darien Raymond
94b880d060
move session based info into session package 2018-09-18 23:09:54 +02:00
Darien Raymond
383b84e7dd
unified tproxy option 2018-09-17 15:12:58 +02:00
Darien Raymond
d068f357bd
update proto lib 2018-09-14 11:00:59 +02:00
Darien Raymond
eb05a92592
dont start periodic task until necessary 2018-08-29 23:00:01 +02:00
Darien Raymond
54e1bb96cc
introduce in-memory user 2018-08-27 00:11:32 +02:00
Darien Raymond
d828aa2fba
add full domain matching 2018-08-21 21:30:32 +02:00
Darien Raymond
059dfdbb97
doc for strmatcher interface 2018-08-20 15:39:58 +02:00
Darien Raymond
fca324a399
fix build break 2018-08-19 22:28:02 +02:00
Darien Raymond
edcf564dd7
improve performance of domain matcher 2018-08-19 21:04:15 +02:00
Darien Raymond
ef679bddbd
test case 2018-08-02 13:28:13 +02:00
Darien Raymond
4b63638dca
update protobuf lib 2018-07-25 00:36:28 +02:00
Darien Raymond
ecd45ffb65
propagate error when adding domain condition 2018-07-17 17:53:24 +02:00
Darien Raymond
c0e37ef34a
prototype for new sniffing mechanism 2018-07-16 13:47:00 +02:00
Darien Raymond
cb0eb91f2b
strmatcher 2018-06-26 21:57:41 +02:00
Darien Raymond
ff0ae91b9b
update protobuf generated files 2018-06-26 16:28:54 +02:00
Darien Raymond
4a46817cf6
optimize map usage 2018-05-31 12:05:25 +02:00
Darien Raymond
68da956fc4
re-generate code 2018-05-25 11:56:01 +02:00
Darien Raymond
758723516e
reorder condition list to short circuit IP resolution if possible.
Fix #1021
2018-04-06 15:56:53 +02:00
Darien Raymond
75a7e9c7f5
comments 2018-04-04 21:32:40 +02:00
Darien Raymond
88b25d38cb
simplify context retrieval 2018-02-21 17:05:29 +01:00
Darien Raymond
efcb567273
remove context in struct 2018-02-08 15:39:46 +01:00
Darien Raymond
292d7cc353
massive refactoring for interoperability 2018-01-10 12:22:37 +01:00
Darien Raymond
24395a3e60
comments for protos. 2018-01-04 11:09:23 +01:00
Darien Raymond
2bf5a008f0
fix error levels 2017-12-27 22:25:12 +01:00
Darien Raymond
a82ca019b2
release script relocation 2017-12-25 21:54:44 +01:00
Darien Raymond
c277c6de54
fix test 2017-12-20 00:00:36 +01:00
Darien Raymond
ab4f245313
overrideable dns 2017-12-19 23:55:09 +01:00
Darien Raymond
f4c35db968
merge log into common log 2017-12-19 21:28:12 +01:00
Darien Raymond
d43a23aa96
move error generator to common 2017-12-03 01:04:57 +01:00
Darien Raymond
5e27e3d260
gofmt 2017-12-03 01:04:38 +01:00
Darien Raymond
fd8db49dc9
generalized event handler 2017-11-28 23:41:20 +01:00
Darien Raymond
aa2c1f76f4
remove unused function 2017-11-16 18:54:10 +01:00
Darien Raymond
26f005e822
resolve to ip on demand 2017-11-15 12:55:47 +01:00
Darien Raymond
57648c145c cachable domain matcher: step 2 2017-11-06 22:30:56 +01:00
Darien Raymond
6b77e14bf6 cachable domain matcher, step 1 2017-11-06 21:12:28 +01:00
Darien Raymond
682319a004 proto def for geosite 2017-11-05 17:19:34 +01:00
Darien Raymond
3545d20b1c protobuf for geoip 2017-11-02 10:54:06 +01:00
Darien Raymond
74cf833758 fully migrate to new assertion lib 2017-10-24 16:15:35 +02:00
Darien Raymond
52ad41cda3 completely move away from net package 2017-08-29 14:32:54 +02:00
Darien Raymond
815019f6da rename IPNet to IPNetTable 2017-08-29 13:51:09 +02:00
Darien Raymond
661c0fc237
more test cases for router config 2017-05-17 21:46:57 +02:00
Darien Raymond
fcafd4e8f8
test case for email 2017-05-17 13:28:22 +02:00
Darien Raymond
069837417f
test case for routing rule 2017-05-17 13:24:53 +02:00
Darien Raymond
52216d0204
test case for domain matcher 2017-05-09 13:39:09 +02:00
Darien Raymond
74b2734cb8
refactor 2017-05-08 12:25:36 +02:00
Darien Raymond
a0bde091d4
sub domain matcher 2017-05-08 12:18:13 +02:00
Darien Raymond
a0ac334703
refactor 2017-05-08 11:48:41 +02:00
Darien Raymond
59a1e2d736
refactor 2017-04-23 19:16:56 +02:00
Darien Raymond
68bc9ea8e4
cleanup error messages 2017-04-09 15:04:04 +02:00
Darien Raymond
35248497d2
refactor error messages 2017-04-09 01:43:25 +02:00
Darien Raymond
75f5cb9afb
refactor log and error 2017-04-06 21:13:17 +02:00
Darien Raymond
2e5cb82790
update proto 2017-04-04 12:28:14 +02:00
Darien Raymond
d04d92c187
update context functions 2017-02-09 22:49:38 +01:00
Darien Raymond
b5d14b6823
update java options 2017-02-03 23:15:10 +01:00
Darien Raymond
f046f334cd
move common/log to app/log 2017-02-01 21:35:40 +01:00
Darien Raymond
0bf5f3e531
fix #374 2017-01-28 09:04:29 +01:00
Darien Raymond
09e5ae7a4b
remove unnecessary code 2017-01-27 22:49:54 +01:00
Darien Raymond
8231d2cdad
dns test 2017-01-27 21:19:46 +01:00
Darien Raymond
9716d7fdfe
Fix usage of source in context 2017-01-27 20:38:01 +01:00
Darien Raymond
ca721230e1
split listening settings from inbound proxies and apply context 2017-01-26 20:46:44 +01:00
Darien Raymond
8b00d6fc30
clean imports 2017-01-14 00:27:45 +01:00
Darien Raymond
289c467a12
remove unnecessary code 2017-01-13 13:47:44 +01:00
Darien Raymond
17504d2aac
context'ize apps 2017-01-13 13:41:40 +01:00
Darien Raymond
b11d48d73f
simplify app design 2017-01-06 15:32:36 +01:00
Darien Raymond
e678000c44
remove release() pattern 2017-01-04 12:52:24 +01:00
Darien Raymond
c9a421fba6
remove generate package comments in .pb.go files. 2017-01-03 14:17:44 +01:00
Darien Raymond
20fe6d10a4
rollback gitignore change 2017-01-02 20:52:45 +01:00
Darien Raymond
52e1dfaeac
remove all generated files 2017-01-02 08:15:31 +01:00
Darien Raymond
a4dfca0ef7
accommodate protobuf compiler change 2016-12-23 12:42:25 +01:00
Darien Raymond
7dc7937443
rename ws to websocket 2016-12-23 00:30:46 +01:00
Darien Raymond
eb782436b3
proto option for C# namespace 2016-12-23 00:24:28 +01:00
Darien Raymond
095c29fa8c
decouple outbound handler manager 2016-12-16 23:02:11 +01:00
Darien Raymond
50bc195f7f
rename TypedSettings to TypedMessage 2016-12-15 11:51:09 +01:00
Darien Raymond
efb24a4d21
rewrite error lib 2016-12-04 09:10:47 +01:00
Darien Raymond
f95c322677
rename 'this' 2016-11-27 21:39:09 +01:00
Darien Raymond
c041740940
remove ErrMissingApplication 2016-11-21 21:13:01 +01:00
Darien Raymond
fc81b0aae2
config for inbound tag routing 2016-11-13 21:23:34 +01:00
Darien Raymond
a7ef82ffbc
fix test break 2016-10-19 12:01:11 +02:00
Darien Raymond
aae99a8e98
use session in router 2016-10-18 23:01:39 +02:00
Darien Raymond
e13c97d162
rename IP to CIDR in router 2016-10-18 16:42:22 +02:00
Darien Raymond
4e80ed05d9
comments 2016-10-18 10:31:39 +02:00
Darien Raymond
5a311cbe08
json config parser 2016-10-17 14:35:13 +02:00
Darien Raymond
e866ff24a4
refine app settings in v2ray config 2016-10-16 16:04:30 +02:00
Darien Raymond
22ef12a456
simplify router 2016-10-12 16:11:13 +02:00
Darien Raymond
63f3108737
protobuf for router 2016-10-11 23:02:44 +02:00
Darien Raymond
7de7588ec2
proto for destination 2016-09-20 11:53:05 +02:00
Darien Raymond
c518726910
network proto 2016-09-20 10:44:44 +02:00
Darien Raymond
9ade07db03
remove IsTCP() and IsUDP() 2016-09-19 16:39:11 +02:00
Darien Raymond
ea2c491ade
global proto gen 2016-08-28 23:41:51 +02:00
Darien Raymond
64e38ba851
update chinaip 2016-08-25 22:17:57 +02:00
Darien Raymond
bbca180dba
try protobuf 2016-08-25 21:55:49 +02:00
Darien Raymond
e6e0419958
format private annotation 2016-08-24 11:17:42 +02:00
v2ray
07a86f549b
unified import path 2016-08-20 20:55:45 +02:00
v2ray
ad1353ac2f
merge similar error definitions 2016-08-18 08:34:21 +02:00
v2ray
4419f1e3d6
introduce address family in v2net 2016-08-14 18:14:12 +02:00
v2ray
dbee8c620a
update china ip 2016-07-24 13:44:49 +02:00
v2ray
7f661f5215
rename Error to Err 2016-06-27 08:53:35 +02:00
v2ray
08261e4f13 more china sites 2016-06-05 23:41:37 +02:00
v2ray
372a32a66f more china sites 2016-06-04 17:48:23 +02:00