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

546 Commits

Author SHA1 Message Date
Darien Raymond
d04d92c187
update context functions 2017-02-09 22:49:38 +01:00
Darien Raymond
ce34a25e66
fix build break 2017-02-06 13:49:03 +01:00
Darien Raymond
b5d14b6823
update java options 2017-02-03 23:15:10 +01:00
Darien Raymond
c4d0227977
simplify dialer and dispatcher parameters 2017-02-03 22:35:09 +01:00
Darien Raymond
504ff4b0c4
remove mux settings from vmess 2017-02-03 00:14:43 +01:00
Darien Raymond
8afdbbfc9f
fix error usage 2017-02-02 10:51:15 +01:00
Darien Raymond
f046f334cd
move common/log to app/log 2017-02-01 21:35:40 +01:00
Darien Raymond
08b9778f05
refine user timeout 2017-01-31 17:46:39 +01:00
Darien Raymond
ad7d98473f
remove timeout reader 2017-01-31 16:49:59 +01:00
Darien Raymond
c462e35aad
cancel sessions after inactivity 2017-01-31 12:42:05 +01:00
Darien Raymond
cbebbc3e68
remove aggressive reader 2017-01-30 22:07:22 +01:00
Darien Raymond
bfcc75f5d1
fix goroutine leak in dynamic port 2017-01-29 12:58:52 +01:00
Darien Raymond
c09ca41161
handle close wait 2017-01-28 22:31:21 +01:00
Darien Raymond
fab20bb0cf
close outbound connections when context is done 2017-01-28 21:24:46 +01:00
Darien Raymond
ca721230e1
split listening settings from inbound proxies and apply context 2017-01-26 20:46:44 +01:00
Darien Raymond
73b5a51529
true none encryption 2017-01-22 20:43:01 +01:00
Darien Raymond
f2b1d5b60c
InboundHandler.Proxy() 2017-01-15 00:57:06 +01:00
Darien Raymond
b40a139310
simplify import 2017-01-13 23:42:39 +01:00
Darien Raymond
f7e1f00c88
rename dispatcher.Interface 2017-01-13 13:53:44 +01:00
Darien Raymond
148e4832eb
leverage global object creator in proxies. 2017-01-13 00:56:21 +01:00
Darien Raymond
d24fe9dbfb
separate network and transport protocol 2017-01-12 12:54:34 +01:00
Darien Raymond
72992c7478
able to close ray stream with error 2017-01-10 14:22:42 +01:00
Darien Raymond
b11d48d73f
simplify app design 2017-01-06 15:32:36 +01:00
Darien Raymond
13e4506781
better error handling in vmess inbound 2017-01-06 11:59:51 +01:00
Darien Raymond
e678000c44
remove release() pattern 2017-01-04 12:52:24 +01:00
Darien Raymond
49210d8362
refine stream handling 2017-01-04 12:34:01 +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
f6aa7a0053
fix usage of ray stream. 2016-12-30 00:51:39 +01:00
Darien Raymond
609dbc1f13
task engine for all proxies 2016-12-30 00:32:20 +01:00
Darien Raymond
690d71b16e
go style task engine 2016-12-29 22:17:12 +01:00
Darien Raymond
5ff2b3453a
task engine 2016-12-28 23:42:32 +01:00
Darien Raymond
7c751fcca0
common.Must 2016-12-28 00:53:29 +01:00
Darien Raymond
c347e50c28
rename cached to buffered 2016-12-27 21:41:44 +01:00
Darien Raymond
7d1426ff7f
fix lint warnings 2016-12-27 21:34:14 +01:00
Darien Raymond
c68da6a0e8
unified release 2016-12-27 21:33:34 +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
e66a787782
command protobuf 2016-12-23 00:16:37 +01:00
Darien Raymond
99c897992d
partially revert compression stream. 2016-12-21 12:53:31 +01:00
Darien Raymond
3ec82f5d32
remove unuseful errors 2016-12-15 17:12:53 +01:00
Darien Raymond
1ab02e0a6b
refactor proxy registry 2016-12-15 15:46:20 +01:00
Darien Raymond
50bc195f7f
rename TypedSettings to TypedMessage 2016-12-15 11:51:09 +01:00
Darien Raymond
5bbbdc05de
errors.Format 2016-12-15 11:05:32 +01:00
Darien Raymond
f47c21c422
remove goroutine on command handling 2016-12-14 21:50:14 +01:00
Darien Raymond
031b1c14b8
style 2016-12-13 11:15:11 +01:00
Darien Raymond
76da31c755
Fix compatibility with Actinium 2016-12-13 10:45:21 +01:00
Darien Raymond
a9790d59f0
comments 2016-12-13 09:32:29 +01:00
Darien Raymond
76776ddf99
delay check of remote address 2016-12-13 09:17:39 +01:00
Darien Raymond
948c86e5c5
remove unnecessary function call 2016-12-13 07:03:48 +01:00
Darien Raymond
a67d525fc2
try fix connection reuse settings 2016-12-12 13:08:31 +01:00
Darien Raymond
d0b301594d
support security = "auto" 2016-12-11 14:58:53 +01:00
Darien Raymond
bc80cc72c7
pading compatibitlity 2016-12-10 01:05:55 +01:00
Darien Raymond
1948d0738f
refactor io package 2016-12-09 13:17:34 +01:00
Darien Raymond
055023fdd5
refactor buffer 2016-12-09 12:08:25 +01:00
Darien Raymond
7a80409e30
rename alloc to buf 2016-12-09 11:35:27 +01:00
Darien Raymond
605fc49e9e
remove unused APIs. 2016-12-08 16:50:40 +01:00
Darien Raymond
12bce36693
fix test break 2016-12-08 11:08:46 +01:00
Darien Raymond
7d2cf4c0e0
bug fixes 2016-12-07 22:52:56 +01:00
Darien Raymond
a6e25b3f67
security options in vmess 2016-12-07 21:43:41 +01:00
Darien Raymond
85163d4b47
more security types in vmess. 2016-12-07 17:32:40 +01:00
Darien Raymond
a92df58017
refactor auth reader 2016-12-07 13:00:32 +01:00
Darien Raymond
78b726d4e8
comments 2016-12-07 12:32:03 +01:00
Darien Raymond
919b749578
aead reader and writer 2016-12-07 00:31:15 +01:00
Darien Raymond
8c8f0a53fd
rewrite alloc.buffer 2016-12-06 11:03:42 +01:00
Darien Raymond
4bf8288cc2
remove use of Buffer.Value 2016-12-05 21:33:24 +01:00
Darien Raymond
e46bad3f18
format errors 2016-12-04 09:43:33 +01:00
Darien Raymond
efb24a4d21
rewrite error lib 2016-12-04 09:10:47 +01:00
Darien Raymond
f69f551c99
reduce vmess log 2016-12-01 00:40:20 +01:00
Darien Raymond
14829f67f0
refine outbound proxy handler interface 2016-11-27 23:57:19 +01:00
Darien Raymond
2a37c62e07
remove unnecessary assign 2016-11-27 21:43:20 +01:00
Darien Raymond
9dd4f016b1
gofmt 2016-11-27 21:40:19 +01:00
Darien Raymond
f95c322677
rename 'this' 2016-11-27 21:39:09 +01:00
Darien Raymond
6804d8f73a
better handling error from Pipe() 2016-11-22 00:17:49 +01:00
Darien Raymond
30cd9e929d
add exponential backoff as retry logic 2016-11-20 21:47:51 +01:00
Darien Raymond
1bbbb6e3cd
release payload after writting 2016-11-19 22:39:18 +01:00
Darien Raymond
ecd0cf2fe2
fix proxy settings in vmess outbound 2016-11-19 14:38:28 +01:00
Darien Raymond
2078f29142
refine error message 2016-11-19 14:38:13 +01:00
Darien Raymond
5a32cd8602
remove large buffer 2016-11-19 01:50:09 +01:00
Darien Raymond
65a49e7fa0
small fixes 2016-11-19 00:37:11 +01:00
Darien Raymond
a14795e1e6
optimize udp hub 2016-11-18 21:30:03 +01:00
Darien Raymond
ad3f450bce
fix usage of io.EOF 2016-11-17 23:21:44 +01:00
Darien Raymond
9471b5b066
refine dispatcher 2016-11-13 14:33:00 +01:00
Darien Raymond
d343cb1ee6
proxy connection 2016-11-09 00:17:09 +01:00
Darien Raymond
68b85cce60
remove unused code 2016-11-02 16:42:02 +01:00
Darien Raymond
5f3f173b5e
shadowsocks client factory 2016-11-02 16:33:04 +01:00
Darien Raymond
369256c82f
include user when dispatch requests in VMess. 2016-10-24 16:57:16 +02:00
Darien Raymond
7a14f646ee
gofmt 2016-10-17 14:44:06 +02:00
Darien Raymond
5a311cbe08
json config parser 2016-10-17 14:35:13 +02:00
Darien Raymond
e33b7df34c
remove use of any 2016-10-16 14:22:21 +02:00
Darien Raymond
be026870f7
protogen update 2016-10-16 00:23:27 +02:00
Darien Raymond
fc6a706166
refactor protos 2016-10-12 18:43:55 +02:00
Darien Raymond
1d13f47f9c
protobuf for stream settings 2016-10-02 23:43:58 +02:00
Darien Raymond
af6abfa3e3
update proto generated code 2016-09-26 15:14:39 +02:00
Darien Raymond
91f2a40dae
refine proto package names 2016-09-26 15:14:16 +02:00
Darien Raymond
922e761bef
rename server spec user 2016-09-25 22:57:27 +02:00
Darien Raymond
24e575f2cd
protobuf for vmess 2016-09-24 23:11:58 +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
8b37edd02d
format log 2016-09-18 00:46:16 +02:00
Darien Raymond
d08cba000f
accounts in protobuf 2016-09-18 00:41:21 +02:00
Darien Raymond
cdb4c56546
protobuf for net 2016-08-27 00:04:35 +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
2268f3d1bc
remove import path restriction 2016-08-19 17:05:15 +02:00
v2ray
39737f6fc1
merge bad configuration error 2016-08-18 08:21:20 +02:00
v2ray
89a876a6d4
rename proxy/internal to proxy/registry 2016-08-17 23:30:15 +02:00
Darien Raymond
667b71aad0 Merge pull request #238 from xiaokangwang/websocket
Websocket transport support for v2ray
2016-08-15 17:45:25 +02:00
v2ray
66bb7879e0
handle empty payload in freedom and outbound 2016-08-15 12:23:35 +02:00
Shelikhoo
7259b3363b
Merge branch 'master' into websockwt 2016-08-15 10:17:22 +08:00
v2ray
cc92973daf
fix destination from addr 2016-08-14 23:20:23 +02:00
v2ray
07dee80f54
update server 2016-08-14 22:08:23 +02:00
v2ray
4419f1e3d6
introduce address family in v2net 2016-08-14 18:14:12 +02:00
v2ray
a9d583b92f
connection session 2016-08-14 17:08:01 +02:00
Shelikhoo
508f79f95f
Advertise WS cap 2016-08-13 21:33:34 +08:00
v2ray
bcd27ba36f
option to allow passive connection 2016-08-12 23:37:21 +02:00
v2ray
9e997a5be7
typo 2016-08-09 23:17:02 +02:00
v2ray
e6a61930d9
remove use of small buffer 2016-07-29 23:18:58 +02:00
v2ray
443e9d4725
fix a bug in vmess encoding 2016-07-27 16:36:46 +02:00
v2ray
2034d54bab
rename VMessAccount to vmess.Account 2016-07-25 17:36:24 +02:00
v2ray
2049759640
use server spec in vmess 2016-07-25 16:48:09 +02:00
v2ray
f871ca63e2
refine error message 2016-07-24 11:29:59 +02:00
v2ray
96ec5cfc58
Fix VMess inbound for empty response 2016-07-24 09:59:52 +02:00
v2ray
6f5b54747e
move encoding to vmess 2016-07-23 13:17:51 +02:00
v2ray
85d6e1ad13
prepend hash 2016-07-17 23:11:05 +02:00
v2ray
e13ea7a54f
refine log in vmess 2016-07-12 00:12:35 +02:00
v2ray
2c259165ff
read entire small payload 2016-07-03 22:32:28 +02:00
v2ray
7f661f5215
rename Error to Err 2016-06-27 08:53:35 +02:00
v2ray
67ac925ee7
refactor bytes functions 2016-06-26 22:34:48 +02:00
v2ray
560b429902
Update log 2016-06-19 02:02:38 +02:00
v2ray
20f046af0b fix a race condition issue in VMess inbound 2016-06-18 17:01:48 +02:00
v2ray
71ce8f4416 enable kcp 2016-06-14 23:00:00 +02:00
v2ray
9b6dc6bcea massive refactoring for kcp 2016-06-14 22:54:08 +02:00
Shelikhoo
e72a7cb96f
KCP: VMess will call setProxyCap to advertise KCP capacity on init 2016-06-12 13:57:08 +08:00
Shelikhoo
29cb680a4b
KCP: VMess will advertise its KCP capacity 2016-06-12 13:52:29 +08:00
Shelikhoo
6d6158b089
KCP: Vmess will pass its meta to Dial3 and ListenTCP6 2016-06-12 13:48:40 +08:00
v2ray
09f7e8b61e meaningful error message 2016-06-11 22:52:37 +02:00
v2ray
d9b59133cc Properly close inbound when no payload 2016-06-11 01:37:33 +02:00
v2ray
e732ba62a6 unified config loader 2016-06-10 22:26:39 +02:00
v2ray
83c7e8491c fix conn reuse 2016-06-06 01:20:20 +02:00
v2ray
e878973def retry if vmess conn fails 2016-06-06 00:10:51 +02:00
v2ray
50ca869929 organize handler metadata 2016-06-04 14:25:13 +02:00
v2ray
a4d76dc394 support using specific address 2016-06-04 00:38:22 +02:00
Darien Raymond
a2d8d55ba1 Update io_test.go 2016-06-03 11:40:50 +02:00
v2ray
72fb5a256c send reuse option in header 2016-06-02 21:34:25 +02:00
v2ray
b9c88b673b unexpected eof 2016-06-02 21:20:58 +02:00
v2ray
dfe1ac1f2b Fix connection reuse 2016-06-02 02:20:53 +02:00
v2ray
9713bf9adf completely fix detour config 2016-06-01 22:45:12 +02:00
v2ray
957eaf38db Assign detour config 2016-06-01 22:33:45 +02:00
v2ray
43f6998d31 discard bad connections 2016-06-01 22:09:34 +02:00
v2ray
0fac2084c7 reusable connection 2016-05-31 00:21:41 +02:00
v2ray
b47c1ca609 get rid of annoying firewall warnings 2016-05-29 16:37:52 +02:00
v2ray
3f9cb1136a allow dynamic type of user accounts 2016-05-28 13:44:11 +02:00
v2ray
81cdaa0e4e Unify buffer allocation 2016-05-25 22:05:47 +02:00
v2ray
c75d840706 Remove serial.String 2016-05-24 22:41:51 +02:00
v2ray
444808a51a Remove Intxx interfaces 2016-05-24 22:15:46 +02:00
v2ray
ab39750ceb Remove serial.Bytes 2016-05-24 22:09:22 +02:00
v2ray
fc63f0432c simplify testing 2016-05-24 21:55:46 +02:00
v2ray
47b2fafb32 Shorten StringLiteral 2016-05-23 20:23:40 +02:00
v2ray
cfdda19834 Shorten BytesLiteral 2016-05-23 20:21:23 +02:00
v2ray
5b23d25e35 address 2016-05-23 20:16:36 +02:00
v2ray
3ded18a75b initializable apps 2016-05-18 08:12:04 -07:00
v2ray
634c4964cc Massive fixes 2016-05-12 17:20:07 -07:00
v2ray
ff210aa67f agressively close stream 2016-05-09 08:23:31 -07:00
v2ray
b5f43031d4 refactor alter id generation 2016-05-07 21:07:46 +02:00
v2ray
8a07534586 remove unnecessary package alias 2016-05-07 20:26:29 +02:00
v2ray
67db5830be agreesively close rays 2016-05-07 09:53:15 +02:00
v2ray
8d1f06ebaf clean up on error 2016-05-07 00:19:06 +02:00
v2ray
0bc846f016 Fix ending in vmess reader. 2016-05-05 00:24:18 +02:00
v2ray
a7f61af79b fix auth reader 2016-05-04 23:41:24 +02:00
v2ray
c20c44526c Fix buffer overrun in vmess 2016-05-03 14:57:09 +02:00
v2ray
7d43952690 tcphub now takes tls config as construtor parameter 2016-05-03 00:16:07 +02:00
v2ray
f594f5b606 simplify tcp connection 2016-05-02 23:53:16 +02:00
v2ray
36bf645199 Fix a dead lock issue in VMess 2016-05-02 14:03:31 +02:00
v2ray
c11ddace15 fix a buffer bug 2016-05-01 20:14:57 +02:00
v2ray
58530e6920 force chunked stream 2016-04-28 21:14:00 +02:00
v2ray
94eab286c0 introduct Connection interface 2016-04-27 23:01:31 +02:00
v2ray
42907ff2e8 Remove v2net.Packet 2016-04-26 00:13:26 +02:00
v2ray
7db14dad9b releasble user validator 2016-04-25 18:39:30 +02:00
v2ray
6486891b18 comments 2016-04-24 22:54:41 +02:00
v2ray
9e1d0d8c5e update detour config settings 2016-04-24 22:40:43 +02:00
v2ray
7407c8d561 use stream instead of raw chan 2016-04-18 18:44:10 +02:00
v2ray
42b8dbe871 release all readers and writers 2016-04-12 21:56:36 +02:00
v2ray
70f803173a simplify reader/writer interface 2016-04-12 21:43:13 +02:00
v2ray
e8023f0d92 releasable writer 2016-03-24 23:36:18 +08:00
v2ray
77ecd1649b fix test break 2016-03-13 11:34:09 +01:00
v2ray
ff69ac7a0e Release all references 2016-03-11 23:51:58 +01:00
v2ray
c1c22a50d5 remove old commands 2016-02-27 22:41:57 +01:00
v2ray
3ec40eedc1 remove old vmess request 2016-02-27 22:37:22 +01:00
v2ray
547cc75651 Migrate VMessIn with protocol 2016-02-27 17:28:21 +01:00
v2ray
2144c47102 Migrate VMessOut into protocol 2016-02-27 16:41:21 +01:00
v2ray
76ca9de25f refactor protocol 2016-02-25 21:50:10 +01:00
v2ray
59bc881d70 move timestamp generator to protocol 2016-02-25 17:14:49 +01:00
v2ray
f0081f5327 remove unused code 2016-02-25 16:58:54 +01:00
v2ray
791ac307a2 Move userset to protocol 2016-02-25 16:40:43 +01:00
v2ray
9f50692d15 auto user creation for dynamic port 2016-02-25 14:38:41 +01:00
v2ray
471b655934 log whole destination in vmess out 2016-02-22 17:10:11 +01:00