1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-23 02:26:49 -05:00
Commit Graph

743 Commits

Author SHA1 Message Date
Darien Raymond
cf3eb0e77d
refine buffer usage 2016-12-05 15:19:14 +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
470e35849f
Server side OTA settings in shadowsocks 2016-11-25 16:46:59 +01:00
Darien Raymond
b9dde62ae7
fix import 2016-11-22 08:21:10 +01:00
Darien Raymond
6804d8f73a
better handling error from Pipe() 2016-11-22 00:17:49 +01:00
Darien Raymond
bc822985ab
shadowsocks log 2016-11-21 23:06:26 +01:00
Darien Raymond
70c75038a2
small buffer 2016-11-21 22:08:34 +01:00
Darien Raymond
c041740940
remove ErrMissingApplication 2016-11-21 21:13:01 +01:00
Darien Raymond
30cd9e929d
add exponential backoff as retry logic 2016-11-20 21:47:51 +01:00
Darien Raymond
84740b676a
handle empty payload 2016-11-19 22:40:14 +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
26aa48d4f9
fix shadowsocks ota 2016-11-19 10:57:00 +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
3a51157929
fix allow passive connection 2016-11-13 23:08:32 +01:00
Darien Raymond
b49f76cd1c
fix tcp reading 2016-11-13 21:05:40 +01:00
Darien Raymond
9471b5b066
refine dispatcher 2016-11-13 14:33:00 +01:00
Darien Raymond
5dc05d6352
allow outbound to be proxied 2016-11-10 23:41:28 +01:00
Darien Raymond
d343cb1ee6
proxy connection 2016-11-09 00:17:09 +01:00
Darien Raymond
d75cb28413
fix tcp encoding 2016-11-06 21:04:56 +01:00
Darien Raymond
d70b997d84
test case for shadowsocks UDP 2016-11-06 14:32:04 +01:00
Darien Raymond
3a15f799c2
prevent deadlock in shadowsocks 2016-11-05 01:00:09 +01:00
Darien Raymond
1600a59254
enable tcp for shadowsocks server 2016-11-02 22:19:01 +01:00
Darien Raymond
c5a92e00ef
dont reuse shadowsock connections 2016-11-02 22:18:25 +01:00
Darien Raymond
68b85cce60
remove unused code 2016-11-02 16:42:02 +01:00
Darien Raymond
cdb0debcb0
register shadowsocks client factory 2016-11-02 16:38:09 +01:00
Darien Raymond
5f3f173b5e
shadowsocks client factory 2016-11-02 16:33:04 +01:00
Darien Raymond
35aa16d40d
refine shadowsocks user 2016-11-02 16:22:29 +01:00
Darien Raymond
63d3c9fa30
typo 2016-11-02 16:18:29 +01:00
Darien Raymond
687e008c9a
refine shadowsocks ota settings 2016-11-02 16:17:57 +01:00
Darien Raymond
43dacc3936
remove small buffer pool 2016-11-01 12:37:35 +01:00
Darien Raymond
c221802963
shadowsocks client 2016-10-31 16:35:18 +01:00
Darien Raymond
be4f3d0772
refine shadowsocks server 2016-10-31 15:24:28 +01:00
Darien Raymond
369256c82f
include user when dispatch requests in VMess. 2016-10-24 16:57:16 +02:00
Darien Raymond
687ae6c50e
chunk writer 2016-10-21 00:33:23 +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
0a32345af9
protobuf for v2ray config 2016-10-14 22:21:45 +02:00
Darien Raymond
f87d7f36f5
check nil settings 2016-10-14 21:19:45 +02:00
Darien Raymond
b060bb3b94
refactor proxy config cache 2016-10-13 11:14:24 +02:00
Darien Raymond
fc6a706166
refactor protos 2016-10-12 18:43:55 +02:00
Darien Raymond
22ef12a456
simplify router 2016-10-12 16:11:13 +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
c5f09c64a2
refine socks config 2016-09-25 22:54:18 +02:00
Darien Raymond
c6a7389817
refine cipher settings 2016-09-25 22:19:49 +02:00
Darien Raymond
ce5bc72f0c
refine shadowsocks proto 2016-09-25 22:07:32 +02:00
Darien Raymond
5e9017720e
check nil 2016-09-24 23:36:26 +02:00
Darien Raymond
24e575f2cd
protobuf for vmess 2016-09-24 23:11:58 +02:00
Darien Raymond
60f4292882
protobuf for dokodemo config 2016-09-22 16:49:20 +02:00
Darien Raymond
dc6b7e2e75
protobuf for blackhole config 2016-09-22 12:01:36 +02:00
Darien Raymond
1a3f51ade7
protobuf for kcp config 2016-09-21 14:39:07 +02:00
Darien Raymond
8f6a972970
refactor config cache 2016-09-21 13:52:16 +02:00
Darien Raymond
d38e62932d
proto for dns config 2016-09-20 16:05:35 +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
3423adaea4
fix test break 2016-08-29 12:25:16 +02:00
Darien Raymond
7a31e7a0c2
fix test break 2016-08-29 12:23:17 +02:00
Darien Raymond
7f2ba0d106
remove unnecessary code 2016-08-28 23:47:39 +02:00
Darien Raymond
948f04921d
update socks code for server config 2016-08-28 23:46:50 +02:00
Darien Raymond
ea2c491ade
global proto gen 2016-08-28 23:41:51 +02:00
Darien Raymond
11e310298c
proto for socks server 2016-08-28 23:41:45 +02:00
Darien Raymond
0f74c618de
close input stream early 2016-08-28 12:01:37 +02:00
Darien Raymond
9b72d3cbd7
simplify socks transport 2016-08-28 11:59:03 +02:00
Darien Raymond
cdb4c56546
protobuf for net 2016-08-27 00:04:35 +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
2268f3d1bc
remove import path restriction 2016-08-19 17:05:15 +02:00
v2ray
ad1353ac2f
merge similar error definitions 2016-08-18 08:34:21 +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
v2ray
99821dc2fb
change to wait group 2016-08-16 17:00:04 +02:00
v2ray
125ef8372c
actually follow redirect of UDP 2016-08-16 13:04:07 +02:00
v2ray
d025b8d48f
fix test break 2016-08-15 23:02:03 +02:00
v2ray
a5a70afdb8
remove port testing 2016-08-15 22:12:11 +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
210a32dc12
support udp redirection 2016-08-15 17:44:46 +02:00
v2ray
956b47f6ae
release connection after all data read in freedom 2016-08-15 14:31:46 +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
c6ad190f0a
add json tag 2016-08-08 23:53:07 +02:00
v2ray
545fa5b53c
rename errors 2016-08-07 15:32:41 +02:00
v2ray
0d73726930
srtp header for kcp 2016-08-06 21:59:22 +02:00
v2ray
c42ed62fd5
remove use of small buffer in tests 2016-08-01 22:59:18 +02:00
v2ray
283bafdd4a
remove use of small buffer 2016-08-01 17:47:20 +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
b72afc7c35
fix build break 2016-07-26 10:23:02 +02:00
v2ray
6a620d1c6d
socks client config 2016-07-25 23:45:25 +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
0857fdb0f8
test code for blackhole config 2016-07-24 13:40:27 +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
3be5045dfc
replace NewSmallBuffer with NewLocalBuffer 2016-07-23 11:55:57 +02:00
v2ray
84a7a2ad61
correct initialization in socks server 2016-07-23 11:09:49 +02:00
v2ray
85d6e1ad13
prepend hash 2016-07-17 23:11:05 +02:00
v2ray
3f396078ab
remove unnecessary buffer 2016-07-16 13:22:34 +02:00
v2ray
fc69c77369
fix an offset issue in OTA 2016-07-13 11:38:14 +02:00
v2ray
e13ea7a54f
refine log in vmess 2016-07-12 00:12:35 +02:00
v2ray
566adec285
allow customized timeout in socks protocol 2016-07-11 15:46:18 +02:00
v2ray
30041041d3
timeout settings in http proxy 2016-07-10 15:34:14 +02:00
v2ray
754e8b6e78
tls config 2016-07-10 15:27:58 +02:00
v2ray
d5cb2e88c9
Fix Shadowsocks OTA 2016-07-04 09:47:14 +02:00
v2ray
2c259165ff
read entire small payload 2016-07-03 22:32:28 +02:00
v2ray
54b791821e
remove unnecessary log 2016-07-03 09:40:22 +02:00
v2ray
7aa848dc02
remove unused import 2016-06-30 10:47:33 +02:00
v2ray
f050113925
fix #185 2016-06-30 00:08:20 +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
Darien Raymond
22ce652a25 Merge pull request #170 from xiaokangwang/kcptransport
Add KCP(UDPSession) as a transport for v2ray, reslove #162
2016-06-13 16:35:57 +02:00
v2ray
8a5f37dad7 check if address is set 2016-06-12 22:54:33 +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
Shelikhoo
a9ef8d27bd
Merged latest master 2016-06-12 12:58:20 +08:00
Shelikhoo
8666d122f0
InboundHandlerMeta,OutboundHandlerMeta added KcpSupported bool to declare KCP support 2016-06-12 12:46:26 +08:00
v2ray
679d646571 only build for linux 2016-06-12 01:35:40 +02:00
v2ray
1c06fc216a allow redirection in dokodemo 2016-06-12 01:30:56 +02: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
8a83a0b30e typo 2016-06-11 01:32:55 +02:00
v2ray
9c3f2ada47 update default response 2016-06-10 23:09:14 +02:00
v2ray
8b3875050d http response in blackhole 2016-06-10 23:01:17 +02:00
v2ray
e732ba62a6 unified config loader 2016-06-10 22:26:39 +02:00
Darien Raymond
3f7b70a465 Merge pull request #168 from xiaokangwang/fix.internal.CreateOutboundHandler.ErrorProxyNotFound
Fixed: internal.CreateOutboundHandler should return ErrorProxyNotFound if !found instead of ErrorNameExists
2016-06-09 11:03:18 +02:00
Shelikhoo
3b1f8b553b
Fixed: internal.CreateOutboundHandler should return ErrorProxyNotFound if !found instead of ErrorNameExists 2016-06-09 09:38:44 +08: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
aad10a75d3 typo 2016-06-05 23:37:28 +02:00
v2ray
5eae540e5c log access in socks and http 2016-06-05 15:02:15 +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
v2ray
6c31ff91e6 Merge branch 'master' of https://github.com/v2ray/v2ray-core 2016-06-03 20:21:53 +02:00
v2ray
4b92e6b25b update log 2016-06-03 20:21:46 +02:00
Darien Raymond
a2d8d55ba1 Update io_test.go 2016-06-03 11:40:50 +02:00
v2ray
0a7deabd46 remove unnecessary log 2016-06-02 23:23:04 +02:00
v2ray
47338fba1e timeout setting for freedom 2016-06-02 23:18:44 +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
6ce7b1d532 informational logs 2016-06-02 00:57:08 +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
9b07ffd68f cleanup http proxy package 2016-05-29 16:46:31 +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
46f76e55e5 reorg chan reader 2016-05-25 22:36:52 +02:00
v2ray
81cdaa0e4e Unify buffer allocation 2016-05-25 22:05:47 +02:00
v2ray
3156c4586c Allow data stream passing through http proxy 2016-05-25 09:32:26 +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
3582b9d869 move net/testing/assert into assert 2016-05-24 15:29:08 +02:00
v2ray
50957b9973 Fix build break 2016-05-23 20:25:24 +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
0ea2678e72 Allow freedom to consume DNS settings 2016-05-22 22:30:21 +02:00
v2ray
ec610494ea Fix dokodemo for space 2016-05-22 19:32:37 +02:00
v2ray
3ded18a75b initializable apps 2016-05-18 08:12:04 -07:00
v2ray
18d75cb7b4 bug fixes to dns server 2016-05-16 11:53:18 -07:00
v2ray
3b545abe02 dns client implementation 2016-05-15 23:09:28 -07:00
v2ray
634c4964cc Massive fixes 2016-05-12 17:20:07 -07:00
v2ray
9a3c7a03c9 rename shadowsocks server 2016-05-12 10:42:08 -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