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

598 Commits

Author SHA1 Message Date
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
v2ray
8a07534586 remove unnecessary package alias 2016-05-07 20:26:29 +02:00
v2ray
ef200c3c5e http client 2016-05-07 14:08:27 +02:00
v2ray
f2c656843e allow tls connection in http proxy 2016-05-07 10:36:36 +02:00
v2ray
b65017d28d Fix build break 2016-05-07 10:06:56 +02:00
v2ray
301b0ccff7 refine cert config in http 2016-05-07 10:06:12 +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
0442000964 fix nil reference issue in shadowsocks 2016-05-02 09:38:50 +02:00
v2ray
c11ddace15 fix a buffer bug 2016-05-01 20:14:57 +02:00
v2ray
b453288e04 release shadowsocks request 2016-05-01 17:18:02 +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
d9d3eac8f7 Fix unkeyed fields 2016-04-26 00:59:44 +02:00
v2ray
a7f40da07a Fix unused variables 2016-04-26 00:46:04 +02:00
v2ray
26ebd8dde9 refactor 2016-04-26 00:35:42 +02:00
v2ray
991cea01ab rename SocksServer to Server 2016-04-26 00:33:16 +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
c044234e4a tls settings for http proxy 2016-04-25 15:30:28 +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
44bf412dfc release all adaptive readers and writers 2016-04-18 19:01:24 +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
3b35df1244 Handler state 2016-03-06 16:36:08 +01:00
v2ray
7f2b157956 Fix OTA in Shadowsocks TCP 2016-02-28 21:11:50 +01:00
v2ray
684e133ac5 better log 2016-02-28 21:02:03 +01:00
v2ray
e298121126 Fix shadowsocks OTA issue 2016-02-28 21:00:53 +01:00
v2ray
3d4da5822b Email in shadowsocks 2016-02-28 14:50:30 +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
ef51c600fb Apply buffered reader and writer to socks 2016-02-27 11:02:42 +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
87b15b2b20 Add ChaCha20 in Shadowsocks 2016-02-23 18:16:13 +01:00
v2ray
471b655934 log whole destination in vmess out 2016-02-22 17:10:11 +01:00
v2ray
b60f491cec add test case for http proxy 2016-02-20 23:27:06 +01:00
v2ray
c9750fa3ba prefer pointer over struct 2016-02-17 16:46:53 +01:00
v2ray
131e6bf239 Fix a potential issue mentioned in #81 2016-02-16 14:35:24 +01:00
v2ray
45db388e3f more docs 2016-02-06 18:01:27 +01:00
v2ray
6c860d64ad rename destIp to destIP 2016-02-05 22:12:46 +01:00
v2ray
d0de8060b6 Merge branch 'master' of https://github.com/v2ray/v2ray-core 2016-02-05 22:04:51 +01:00
v2ray
25dfa66822 typos 2016-02-05 22:04:43 +01:00
Darien Raymond
e5d0da0982 wording 2016-02-05 11:45:31 +00:00
Darien Raymond
20147cb0bd fix test break 2016-02-05 10:48:34 +00:00
Darien Raymond
d1e990d46e test case for shadowsocks ota 2016-02-05 10:38:45 +00:00
Darien Raymond
c618ce543c use net.ParseAddress in socks udp 2016-02-05 10:23:16 +00:00
Darien Raymond
4d2bcda9cc test case for socks protocol 2016-02-05 10:21:13 +00:00
v2ray
76b0db2016 return ErrorInvalidAuthentication when OTA is not valid 2016-02-04 22:52:42 +01:00
v2ray
c849f3df54 test case for shadowsocks protocol 2016-02-04 22:10:52 +01:00
v2ray
903985eab5 close dokodemo after testing 2016-02-04 18:03:15 +01:00
v2ray
4f59d6847f fix test break 2016-02-04 13:27:35 +01:00
v2ray
3212337aa3 clean up test cases for dokodemo 2016-02-04 13:13:15 +01:00
v2ray
77f5c15dbc fix freedom test 2016-02-04 13:09:17 +01:00
Darien Raymond
b18693a9c4 more test cases for freedom 2016-02-04 10:11:11 +00:00
v2ray
29c100e613 doc for proxy 2016-02-03 22:56:40 +01:00
v2ray
32b2220739 apply udpHub in socks proxy 2016-02-03 22:43:09 +01:00
v2ray
2d1ded9b9e fix race condition in shadowsocks 2016-02-03 22:42:58 +01:00
v2ray
265c9e4abb fix race condition in dokodemo 2016-02-03 22:42:44 +01:00
v2ray
11c7191b38 clean up after error 2016-02-03 21:44:20 +01:00
v2ray
c6df0fde19 clean up variable initialization 2016-02-03 21:36:52 +01:00
v2ray
2932d23b32 apply user settings to shadowsocks 2016-02-03 12:18:28 +01:00
v2ray
2147ba5ab3 move fundamental interfaces from vmess to common 2016-02-03 11:58:42 +01:00
v2ray
e8b0505c01 import comment of package vmess 2016-02-02 22:21:43 +01:00
v2ray
159644a230 remove out dated test case 2016-02-01 23:53:20 +01:00
v2ray
5e2583ec8d fix udp for dokodemo and shadowsocks 2016-02-01 21:34:07 +01:00
v2ray
48aa9af631 remove out dated test 2016-02-01 17:21:31 +01:00
Darien Raymond
0d77139c24 fix udp issue in socks proxy 2016-02-01 15:36:33 +00:00
Darien Raymond
8006d0cfdc update version in install-release.sh 2016-02-01 14:06:03 +00:00
Darien Raymond
3b1f92b7e8 allow multiple UDP incoming packets in freedom 2016-02-01 11:38:38 +00:00
v2ray
d3ff2b3698 chunk stream in vmess 2016-02-01 12:22:29 +01:00
v2ray
6c7a9586d0 Save 1 allocation in shadowsocks 2016-01-31 21:37:00 +01:00
v2ray
2031c13a7f refactor app.Space 2016-01-31 17:01:28 +01:00
v2ray
fcf8a74a3a log access info in shadowsocks 2016-01-30 22:57:20 +01:00
v2ray
026f17fdcc todo sync 2016-01-30 22:50:36 +01:00
v2ray
6b9cb3f80d send to UDP dest 2016-01-30 22:36:28 +01:00
v2ray
383eb57487 rename CorruptedPacket to ErrorCorruptedPacket 2016-01-30 17:20:30 +01:00
v2ray
1e79a3b75a rename errors 2016-01-30 12:32:38 +01:00
v2ray
f34e253ea3 Rename errors with Error prefix 2016-01-30 12:23:56 +01:00
v2ray
be10ca7e09 fix shadowsocks udp ota 2016-01-29 21:55:42 +01:00
v2ray
e9c784d4bd refactor shadowsocks 2016-01-29 20:54:06 +01:00
Darien Raymond
57ff7ba923 complete implementation of shadowsocks ota 2016-01-29 15:43:45 +00:00
Darien Raymond
7f5184e943 understand OTA bit 2016-01-29 14:09:51 +00:00
Darien Raymond
008c285324 move transport methods from net to io 2016-01-29 13:39:55 +00:00
v2ray
494f431c37 remove ReadAllBytes in favor of io.ReadFull 2016-01-28 23:58:23 +01:00
v2ray
795c49b6fb close udp hub 2016-01-28 21:30:46 +01:00
v2ray
dde3f60e30 udp for shadowsocks 2016-01-28 21:30:05 +01:00
v2ray
1f9bd5f692 rename TCPListener to TCPHub 2016-01-28 20:47:00 +01:00
Darien Raymond
4be27a6377 udp hub 2016-01-28 16:43:47 +00:00
Darien Raymond
925c06aeed rename transport/listener to hub 2016-01-28 16:08:32 +00:00
Darien Raymond
30f131b9ee test case for shadowsocks tcp 2016-01-28 12:40:00 +00:00
v2ray
095905a460 tcp handler for shadowsocks 2016-01-28 12:33:58 +01:00
v2ray
8ae8b3c9f5 custom tcp listener and connection object 2016-01-27 22:11:31 +01:00
v2ray
3f634eb54f fix build break 2016-01-27 15:57:53 +01:00
v2ray
2e866be181 R.I.P Shadowsocks 2016-01-27 12:46:40 +01:00
Darien Raymond
6b894c719d own hosts in http config 2016-01-26 10:28:09 +00:00
v2ray
e11088aad5 update doc 2016-01-25 21:33:28 +01:00
v2ray
9ae258de3d rename 2016-01-25 17:29:26 +01:00
v2ray
5e16fa2dcd rename InboundConnectionHandlerCreator 2016-01-25 17:27:15 +01:00
v2ray
d4dcee5fa3 rename InboundConfig methods 2016-01-25 17:23:10 +01:00
v2ray
d325400f2e rename RegisterInboundConnectionHandlerFactory to RegisterInboundHandlerCreator 2016-01-25 17:20:44 +01:00
v2ray
01ed2fa889 rename RegisterInboundConnectionConfig to RegisterInboundConfig 2016-01-25 17:19:09 +01:00
v2ray
9fe8178e4a rename InboundConnectionHandler to InboundHandler 2016-01-25 17:18:24 +01:00
v2ray
4817f8ab1f Merge branch 'master' of https://github.com/v2ray/v2ray-core 2016-01-25 11:54:59 +01:00
Darien Raymond
4624de091b remove cache of existing user hashes 2016-01-25 10:54:03 +00:00
v2ray
9f6822411b late set of cmd id 2016-01-25 00:43:55 +01:00
v2ray
2b1441b030 bytes to number methods 2016-01-24 22:28:44 +01:00
v2ray
73c17d9931 more fuzz test 2016-01-22 21:56:37 +01:00
v2ray
42b4764700 revert lock change 2016-01-22 17:56:19 +01:00
v2ray
f735663364 check input value nil 2016-01-22 17:56:12 +01:00
v2ray
790d37bf90 checksum for response command 2016-01-22 17:56:03 +01:00
v2ray
9ec238d161 account fuzz test 2016-01-22 17:55:03 +01:00
v2ray
795681c288 fix locking in vmess inbound 2016-01-22 16:50:31 +01:00
v2ray
d8f29f4b5e log for detour picking 2016-01-22 16:48:17 +01:00
v2ray
f478db2b2e ensure that detour list has not changed 2016-01-22 01:10:25 +01:00
v2ray
2c03641f74 test case for receiver 2016-01-22 01:10:12 +01:00
v2ray
37a9d8ef50 dice.Roll() 2016-01-21 22:45:44 +01:00
Darien Raymond
d623b1809d minor fix 2016-01-21 16:29:18 +00:00
Darien Raymond
d8c6102638 test case for on demand detour 2016-01-21 16:22:56 +00:00
Darien Raymond
d75eeed25d format code 2016-01-21 12:05:16 +00:00
Darien Raymond
85feb725a5 BytesLiteral.All() 2016-01-21 11:52:09 +00:00
v2ray
f60747c455 2nd step to reduce number of authentication bits 2016-01-21 10:08:00 +01:00
Darien Raymond
23b6b987ca fix a bug in cmdkey generation 2016-01-20 16:45:50 +00:00
v2ray
baaef1dad5 handle switch account command in vmess out 2016-01-20 17:31:43 +01:00
v2ray
b0adb24003 handle inbound detour in vmess inbound 2016-01-19 23:41:40 +01:00
v2ray
6eff759b05 more fields in switch account command 2016-01-19 01:21:07 +01:00
v2ray
65d5c07533 BytesLiteral.String 2016-01-18 12:58:04 +01:00
v2ray
4dd771170c lazy evaluation of access log 2016-01-18 12:31:27 +01:00
v2ray
eec0bb4db4 lazy evaluation of log fields 2016-01-18 12:24:33 +01:00
v2ray
8f20933457 cleanup socks log 2016-01-18 11:43:24 +01:00