lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-05 09:47:56 -05:00
Code Issues Releases Wiki Activity
5,021 Commits 15 Branches 437 Tags 71 MiB
d2226cb0c8
Commit Graph

820 Commits

Author SHA1 Message Date
Darien Raymond
c2566e1331
cleanup unused scenarios 2018-10-22 22:40:53 +02:00
Darien Raymond
17e51b277b
move proxy.Dialer to internet.Dialer 2018-10-22 22:12:50 +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
9decb3fe36
comments 2018-10-22 08:42:10 +02:00
Darien Raymond
ab9ae703fc
remove config from outbound.Handler 2018-10-22 08:26:03 +02:00
Darien Raymond
c29f1c8cf0
merge duplicated code 2018-10-21 21:27:05 +02:00
Darien Raymond
a5dcb0f13e
refactor dependency resolution 2018-10-21 10:27:13 +02:00
Darien Raymond
fb7dd1a577
fix #1322 2018-10-19 06:45:10 +02:00
Darien Raymond
dcae6c63dd
move size stats writer into vio 2018-10-15 09:03:40 +02:00
Darien Raymond
33becfe553
comments 2018-10-15 08:51:24 +02:00
Darien Raymond
595f3d685e
merge user info inbound metadata 2018-10-15 08:36:50 +02:00
Darien Raymond
cb8e7dc9a0
comments 2018-10-14 08:23:49 +02:00
Darien Raymond
e2bfdec012
rename ReadFrom to Unmarshal 2018-10-14 08:05:23 +02:00
Darien Raymond
abf0cb1ec4
move function to features 2018-10-13 15:15:49 +02:00
Darien Raymond
d730637239
Require Type() for Feature 2018-10-12 23:57:56 +02:00
Darien Raymond
c3170dfc8e
fix dns client 2018-10-11 23:09:15 +02:00
Darien Raymond
b4821c5ed5
move policy and dnsClient 2018-10-11 22:34:31 +02:00
Darien Raymond
273342d0b9
move stats and inbound to features directory 2018-10-11 21:14:53 +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
56ce5d5f84
use new context 2018-09-30 23:08:14 +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
f9f8c21a07
move framemeta onto stack 2018-09-26 13:01:12 +02:00
Darien Raymond
9d646d6039
support tproxy in tcp connections 2018-09-23 20:14:07 +02:00
Darien Raymond
909cb9b27a
announce deprecated proto settings 2018-09-21 16:54:06 +02:00
Darien Raymond
5649c7ba2d
support regex domain type in dns 2018-09-19 16:10:42 +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
f9436b3556
skip DNS tests on windows 2018-09-10 23:43:17 +02:00
Darien Raymond
813fdb6235
Revert "move away from dns.Server.ListenAndServe" 
This reverts commit f0a801142d.
 2018-09-10 23:41:52 +02:00
Darien Raymond
f0a801142d
move away from dns.Server.ListenAndServe 2018-09-10 22:58:37 +02:00
Darien Raymond
dad0892a39
wait until dns server is up 2018-09-10 22:29:35 +02:00
Darien Raymond
156af4241d
add some logs 2018-09-10 22:12:07 +02:00
Darien Raymond
b3847fb7c0
MemoryStreamSettings 2018-09-07 14:50:25 +02:00
Darien Raymond
91109f3657
replace channel with pipe in udp conn 2018-09-03 00:56:43 +02:00
Darien Raymond
1be86e6e3a
update activity in ReadMultiBuffer 2018-09-01 21:19:01 +02:00
Darien Raymond
de74460f15
extract logic for write frame 2018-08-31 15:15:40 +02:00
Darien Raymond
eb05a92592
dont start periodic task until necessary 2018-08-29 23:00:01 +02:00
Darien Raymond
89fa9367ba
release buffer on error 2018-08-29 16:42:14 +02:00
Darien Raymond
ce96941029
reduce waiting time on sniffing 2018-08-28 19:52:31 +02:00
Darien Raymond
54e1bb96cc
introduce in-memory user 2018-08-27 00:11:32 +02:00
Darien Raymond
f227e85b54
support per-domain prioritized name server 2018-08-24 21:51:03 +02:00
Darien Raymond
128ec95218
merge stread reader from mux to crypto 2018-08-23 10:39:53 +02:00
Darien Raymond
4e30ac33d0
reduce delay on passive connections 2018-08-21 23:09:45 +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
fdb3a7b57d
remove use of buf.NewSize() 2018-08-16 12:05:33 +02:00
Darien Raymond
053fc38d38
refine udp hub api 2018-08-11 22:35:01 +02:00
Darien Raymond
c0fc277551
fix mux closing logic 2018-08-05 18:57:41 +02:00
Darien Raymond
ef679bddbd
test case 2018-08-02 13:28:13 +02:00
Darien Raymond
200ce404c6
fix buffer settings 2018-07-31 16:46:37 +02:00
Darien Raymond
206f52affc
refine buffer interface 2018-07-30 22:45:06 +02:00
Darien Raymond
4b63638dca
update protobuf lib 2018-07-25 00:36:28 +02:00
Darien Raymond
cd7a8595d9
fix #1207 2018-07-23 23:39:55 +02:00
Darien Raymond
72b4fa4a14
fix #1205 2018-07-21 12:11:49 +02:00
Darien Raymond
6276bfa508
rename domain override 2018-07-20 13:09:42 +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
b288b3c773
grpc for QueryStats 2018-07-10 23:40:58 +02:00
Darien Raymond
e3cc852c57
udp dispatcher takes context with dispatching requests. fixes #1182. 2018-07-03 21:38:02 +02:00
Darien Raymond
463a9cbef8
tweak dns options 2018-07-02 22:22:04 +02:00
Darien Raymond
4c18b61e6c
fix dns query for CNAME 2018-07-01 17:15:29 +02:00
Darien Raymond
4368edf87c
switch to pubsub in dns service 2018-07-01 12:38:40 +02:00
Darien Raymond
b05597df3a
fix passive connection in mux. fix #1167 2018-06-27 12:21:22 +02:00
Darien Raymond
c9e35bb1ba
fix localnameserver creation 2018-06-27 11:23:39 +02:00
Darien Raymond
69820788b5
fix #1165 2018-06-27 09:12:55 +02:00
Darien Raymond
4477e7436b
simplify client ip design 2018-06-26 23:23:59 +02:00
Darien Raymond
d5f7728acd
support subdomain matching in dns hosts 2018-06-26 22:34:05 +02:00
Darien Raymond
cb0eb91f2b
strmatcher 2018-06-26 21:57:41 +02:00
Darien Raymond
ed34adf967
set udp size in edns 2018-06-26 17:26:34 +02:00
Darien Raymond
e9e9de55ac
support client subnet 2018-06-26 17:14:51 +02:00
Darien Raymond
ff0ae91b9b
update protobuf generated files 2018-06-26 16:28:54 +02:00
Darien Raymond
f743b1e591
remove task member in dns.Server. 2018-06-26 15:35:22 +02:00
Darien Raymond
2fb77d6911
consume context in local nameserver. 2018-06-26 15:16:45 +02:00
Darien Raymond
9cfb2bfd51
simplify classic dns server 2018-06-26 15:04:47 +02:00
Darien Raymond
9977eadf8c
remove dependency from errors to session 2018-06-25 01:09:02 +02:00
Darien Raymond
70abb689bf
relace Notifier with Done 2018-06-09 04:29:40 +02:00
Darien Raymond
b01180b913
fix lint warnings 2018-06-04 14:29:43 +02:00
Darien Raymond
ee0ca6cbd2
fix a deadlock 2018-05-31 13:12:36 +02:00
Darien Raymond
4a46817cf6
optimize map usage 2018-05-31 12:05:25 +02:00
Darien Raymond
adade2bffd
fix lint warnings 2018-05-31 11:55:11 +02:00
Darien Raymond
daa790582f
update uplink traffic in read multibuffer 2018-05-29 00:47:22 +02:00
Darien Raymond
ac6a0f7511
update activity timer 2018-05-27 14:42:53 +02:00
Darien Raymond
46dbbfff8c
fix reading in udp conn 2018-05-27 13:23:41 +02:00
Darien Raymond
13f3c356ca
unified task package 2018-05-27 13:02:29 +02:00
Darien Raymond
cad07c3a83
faster udp reading 2018-05-27 01:19:05 +02:00
Darien Raymond
fde877e276
fix lint errors 2018-05-26 16:32:55 +02:00
Darien Raymond
483a56c847
adjust lint settings 2018-05-26 00:47:51 +02:00
Darien Raymond
67f5292f38
fix lint errors 2018-05-25 23:20:24 +02:00
Darien Raymond
65bd8509d7
fix buffer policy settings 2018-05-25 13:12:00 +02:00
Darien Raymond
b24e808a8a
fix pipe related tests 2018-05-25 12:50:33 +02:00
Darien Raymond
213f827406
policy for internal buffer size 2018-05-25 12:08:28 +02:00
Darien Raymond
68da956fc4
re-generate code 2018-05-25 11:56:01 +02:00
Darien Raymond
0b5c638028
sniff on TCP only 2018-05-20 21:29:40 +02:00
Darien Raymond
f9c794c795
fix lint errors 2018-04-23 16:42:37 +02:00
Darien Raymond
148a7d064d
simplify buf.BufferedReader 2018-04-21 00:54:53 +02:00
Darien Raymond
d7aeb51904
merge http.Connection into net.Connection 2018-04-20 21:30:58 +02:00
Darien Raymond
3997d13b97
rename Slice and Slice from to Resize and Advance 2018-04-19 23:48:38 +02:00
Darien Raymond
1425fd2ba9
remove Buffer.Append method 2018-04-19 22:56:55 +02:00
Darien Raymond
1d001c090b
comments 2018-04-19 21:33:18 +02:00
Darien Raymond
a8aab30e6b
fix done.Close() in defer 2018-04-18 23:15:57 +02:00
Darien Raymond
8e62134bdf
fix draining in mux 2018-04-18 23:01:57 +02:00
Darien Raymond
be1c175de6
fix lint warnings 2018-04-18 22:35:44 +02:00
Darien Raymond
0c66016d5f
fix a regression that mux doesn't handle passive connection. fixes #1061 2018-04-18 22:13:31 +02:00
Darien Raymond
ef1d9d24cd
fix test break 2018-04-17 00:40:27 +02:00
Darien Raymond
5d23604713
rewrite ray -> pipe 2018-04-17 00:31:10 +02:00
Darien Raymond
d6dc88860b
simplify done api 2018-04-15 20:40:47 +02:00
Darien Raymond
f175d322ae
fix lint warnings 2018-04-14 13:09:58 +02:00
Darien Raymond
c76d492c0f
stats counter for inbound traffic 2018-04-12 00:10:14 +02:00
Darien Raymond
d2470e2cdb
fix lint errors 2018-04-11 20:17:19 +02:00
Darien Raymond
622cb529a9
include base error 2018-04-11 20:17:08 +02:00
Darien Raymond
a320196b77
refine domain socket transport 2018-04-09 17:09:24 +02:00
DarienRaymond
61d9b04ca5
Merge pull request #1019 from v2ray/domainsocket 
Implemented Primitive Domain Socket Support described in https://github.com/v2ray/Planning/issues/25
 2018-04-09 12:42:42 +02:00
Darien Raymond
83625618ee
re-init maps when they are empty 2018-04-07 23:07:30 +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
7315b2c647
fix mux test 2018-04-05 21:09:57 +02:00
Darien Raymond
435be61661
fix error handling in mux 2018-04-05 20:16:31 +02:00
Shelikhoo
6d1faf5f6e
Remove staging code 2018-04-05 19:28:30 +08:00
Shelikhoo
c542c043f3
Merge branch 'master' of github.com:v2ray/v2ray-core into domainsocket 2018-04-05 19:11:33 +08:00
Shelikhoo
12012cd4df
Testing and fixs 2018-04-05 19:06:54 +08:00
Shelikhoo
8b881d7eb6
Rename to prevent confusion 2018-04-05 18:47:36 +08:00
Darien Raymond
2b675335bd
properly handle error case 2018-04-05 12:19:57 +02:00
Shelikhoo
d08929a687
finish up dial 2018-04-05 15:25:39 +08:00
Darien Raymond
79c1087311
change status to option 2018-04-04 21:33:33 +02:00
Darien Raymond
75a7e9c7f5
comments 2018-04-04 21:32:40 +02:00
Darien Raymond
90c6113dfc
handle transport errors in mux session 2018-04-04 17:20:45 +02:00
Shelikhoo
176a5c0d44
generalize interface 2018-04-04 18:17:42 +08:00
Shelikhoo
7e96581921
Added integration 2018-04-04 17:12:09 +08:00
Shelikhoo
c51830bd75
Added UnixSenderConfig 2018-04-04 16:45:46 +08:00
Darien Raymond
a3f47f4fa2
comments 2018-04-04 00:57:44 +02:00
Darien Raymond
9f198d7e3d
fix lint errors 2018-04-04 00:29:30 +02:00
DarienRaymond
8bc20c8656
Merge pull request #1013 from wuxiangzhou2010/master 
add nil check  and correct some comments
 2018-04-03 11:52:58 +02:00
wuxiang
3f19d09878 update some comments 2018-04-03 17:11:54 +08:00
Darien Raymond
c5bd23105e
change uint32 to int32 2018-04-02 22:01:55 +02:00
Darien Raymond
81a147e540
Merge branch 'master' of https://github.com/v2ray/v2ray-core 2018-04-02 20:01:05 +02:00
Darien Raymond
08dab81eb2
migrate int to int32 2018-04-02 20:00:50 +02:00
wuxiangzhou2010
a58063e7ac fix typo, first sound of user is not a vowel, but the consonant /j/ 2018-04-02 15:17:36 +08:00
Darien Raymond
4de3f1adc1
change ReadFullFrom to take int32 size 2018-04-02 00:44:47 +02:00
Darien Raymond
6d98bc4607
split uplink and downlink traffic 2018-03-31 20:30:49 +02:00
Darien Raymond
0975e26ed1
command handler for stats 2018-03-31 10:30:12 +02:00
Darien Raymond
e5a5c30b67
support stats counter in dispatcher 2018-03-30 23:48:45 +02:00
Darien Raymond
695a4f8493
support stats in policy 2018-03-30 23:39:54 +02:00
Darien Raymond
f7dd7e6279
support stats counter in ray stream 2018-03-30 23:17:28 +02:00
Darien Raymond
35e160a1ff
stats feature 2018-03-30 19:56:59 +02:00
Darien Raymond
fa63beceb6
fix double release on buffers 2018-03-28 22:23:24 +02:00
Darien Raymond
12181f527f
defensive fix for improper usage of buf.New(). 2018-03-28 14:40:51 +02:00
Shelikhoo
a00c0764e5
Pass unused data into Receiver 2018-03-28 20:09:43 +08:00
Jinqiu Yu
33e090befe Clean useless code 2018-03-23 14:20:14 +08:00
DarienRaymond
bf5e93efd7
Merge pull request #968 from wuxiangzhou2010/master 
fix typo
 2018-03-19 21:44:25 +07:00
Wuxiang
e8438a522a
fix typo 
fix typo
 2018-03-19 16:40:47 +08:00
Shelikhoo
09bf78a089
notify progressTraffic to quit 2018-03-18 22:13:17 +08:00
Shelikhoo
3e05a3529a
finish UnixInboundHandler 2018-03-18 22:08:03 +08:00
Shelikhoo
8e5063dedf
(Sync Commit) 2018-03-16 12:35:12 +08:00
DarienRaymond
a8a68c2e70
Merge pull request #962 from yujinqiu/fix-typo 
Fix typo
 2018-03-16 04:16:47 +01:00
Jinqiu Yu
855925a805 Fix typo 2018-03-15 10:32:10 +08:00
Darien Raymond
5a227ec356
int to int32 2018-03-13 03:39:36 +01:00
Darien Raymond
1cbfeea0cd
simplify NewSize calls 2018-03-12 22:10:13 +01:00
Darien Raymond
994aecd13c
rename NewLocal to NewSize 2018-03-11 23:29:17 +01:00
Darien Raymond
f97e6fa3d2
refine buffer allocation 2018-03-11 23:06:04 +01:00
Shelikhoo
43abfc9463
Unix listeners(sync commit) 2018-03-11 13:44:21 +08:00
Darien Raymond
649119493b
remove pending request from cache when error. fixes #942 2018-03-10 09:34:38 +01:00
Darien Raymond
fbc025869b
fix lint errors 2018-03-08 21:21:50 +01:00
Darien Raymond
e1bdca446d
fix context reference 2018-03-05 21:15:41 +01:00
Darien Raymond
59958fed68
refactor udp worker 2018-03-01 14:58:13 +01:00
DarienRaymond
0179b73de3
Merge pull request #884 from yujinqiu/fix-sniffer-typo 
Fix sniff typo
 2018-02-26 10:56:39 +01:00
Jinqiu Yu
861ff94e5e Fix sniff typo 2018-02-26 09:06:27 +08:00
Darien Raymond
c43a5e7d85
use AddressParser in mux 2018-02-24 00:57:54 +01:00
Darien Raymond
0a3b3d0b6d
refactor UDPNameServer clean up task 2018-02-22 17:29:21 +01:00
Darien Raymond
6b872c266c
session id 2018-02-22 15:26:00 +01:00
Darien Raymond
7e6b45ace4
format 2018-02-22 10:34:14 +01:00
Darien Raymond
88b25d38cb
simplify context retrieval 2018-02-21 17:05:29 +01:00
Darien Raymond
3734195156
fix log test 2018-02-20 22:07:50 +01:00
Darien Raymond
f0849543ed
remove commander from core feature 2018-02-20 21:19:09 +01:00
Darien Raymond
c25a76a0cf
integration test case for policy 2018-02-20 13:53:07 +01:00
Darien Raymond
446059f8dc
fix error handling in outbound handler 2018-02-19 17:51:10 +01:00
Darien Raymond
39cfc982b5
test case for policy 2018-02-17 23:37:09 +01:00
Darien Raymond
5bd3cee371
gofmt 2018-02-17 21:22:28 +01:00
Darien Raymond
84f8192b61
fix default logger 2018-02-14 22:00:08 +01:00
Darien Raymond
c48fa50ab1
logger service 2018-02-14 17:35:09 +01:00
Darien Raymond
1e0b35f869
fix nil reference in udp worker 2018-02-14 13:41:21 +01:00
Darien Raymond
31d1fb6cc3
fix lint errors 2018-02-12 21:35:10 +01:00
Darien Raymond
ae395bbe1f
increase udp hub capacity 2018-02-12 15:08:20 +01:00
Darien Raymond
7391b2439e
simplify udp hub 2018-02-12 13:14:11 +01:00
Shelikhoo
91f32cc8c4
Auto Gen 2018-02-12 14:47:23 +08:00
Shelikhoo
5e0ed59599
added function stub for UnixReceiverHandler Instancer 2018-02-12 14:18:33 +08:00
Shelikhoo
7f34cbdaff
Add Generated Files 2018-02-12 14:17:14 +08:00
Shelikhoo
7b51a56c33
Fix pb err 2018-02-12 14:15:50 +08:00
Shelikhoo
7afd26a78f
Type switch for UnixReceiver 2018-02-12 14:15:50 +08:00
Shelikhoo
71c3e81a7e
Rebase: Add domainsocket receiver config 2018-02-12 14:07:16 +08:00
Darien Raymond
92aef24f98
remove unnecessary proxy functions 2018-02-09 23:07:38 +01:00
Darien Raymond
c1fc7c738a
fix command listener 2018-02-08 23:37:47 +01:00
Darien Raymond
d9040b571d
decouple commander interface from grpc 2018-02-08 23:24:35 +01:00