1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 01:57:12 -05:00
Commit Graph

425 Commits

Author SHA1 Message Date
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
v2ray
c9750fa3ba prefer pointer over struct 2016-02-17 16:46:53 +01:00
v2ray
6c860d64ad rename destIp to destIP 2016-02-05 22:12:46 +01:00
v2ray
25dfa66822 typos 2016-02-05 22:04:43 +01:00
v2ray
c6df0fde19 clean up variable initialization 2016-02-03 21:36:52 +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
d3ff2b3698 chunk stream in vmess 2016-02-01 12:22:29 +01:00
v2ray
2031c13a7f refactor app.Space 2016-01-31 17:01:28 +01:00
v2ray
383eb57487 rename CorruptedPacket to ErrorCorruptedPacket 2016-01-30 17:20:30 +01:00
v2ray
f34e253ea3 Rename errors with Error prefix 2016-01-30 12:23:56 +01: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
1f9bd5f692 rename TCPListener to TCPHub 2016-01-28 20:47:00 +01:00
Darien Raymond
925c06aeed rename transport/listener to hub 2016-01-28 16:08:32 +00:00
v2ray
8ae8b3c9f5 custom tcp listener and connection object 2016-01-27 22:11:31 +01:00
v2ray
9ae258de3d rename 2016-01-25 17:29:26 +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
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
dde47290d7 completely remove json folder in v2ray 2016-01-17 21:43:10 +01:00
v2ray
5ceac7a6e2 move host from net/json to net 2016-01-15 13:17:04 +01:00
v2ray
e5fa96f814 massive refactoring against json config parsing 2016-01-15 12:43:06 +01:00
v2ray
7881330644 remove unnecessary memory allocation in vmess 2016-01-12 13:39:17 +01:00
v2ray
f7a152b871 remove unnecessary memory allocation in id generation 2016-01-12 13:39:02 +01:00
v2ray
48ff2a5ae8 use [16]byte instead of string for faster hashing 2016-01-12 13:02:05 +01:00
Darien Raymond
bed5235772 remove proxy/vmess/protocol/user 2016-01-12 10:52:40 +00:00
Darien Raymond
dc1fbecdfb remove fuzzing tests 2016-01-12 10:45:38 +00:00
v2ray
349b02084c rewrite hashing logic in vmess 2016-01-12 11:38:43 +01:00
v2ray
ea080b2ebf rewrite id hash queue 2016-01-11 22:51:35 +01:00
v2ray
8daea1dc06 close inbound ray when there is an error 2016-01-11 01:01:52 +01:00
v2ray
d1fecba6e4 improve timed queue performance 2016-01-10 09:11:46 +01:00
v2ray
242624de96 fix test break 2016-01-09 00:22:50 +01:00
v2ray
4ca43c3121 alternative user ids 2016-01-09 00:10:57 +01:00
v2ray
5b1854f842 simplify connection handler registration 2016-01-06 16:23:54 +01:00
v2ray
350b31cad9 First step to reduce number of bytes for response validation 2016-01-06 01:37:53 +01:00
v2ray
b9c3f2cb75 Fix for empty packets 2016-01-05 12:08:16 +01:00
v2ray
7c64093a7a Output debug info when parsing VMess request 2016-01-05 00:08:00 +01:00
v2ray
3e76c3f307 fix a typo 2016-01-04 23:00:14 +01:00
v2ray
1239b1a57b fix buffer usage in vmess out 2016-01-04 22:02:22 +01:00
Darien Raymond
e6ad1d8518 format code 2016-01-04 14:16:52 +00:00
Darien Raymond
27b521d2aa fix buffer usage in VMess 2016-01-04 12:01:32 +00:00
v2ray
4271e619fe fixes for mutex usage 2016-01-04 08:40:24 +01:00
v2ray
59a5f832f6 fixes for sync logic 2016-01-04 01:19:27 +01:00
v2ray
56c5302367 close method for point server 2016-01-04 00:33:25 +01:00
v2ray
201481a82c close method for inbound connection handler 2016-01-03 23:30:37 +01:00
v2ray
0780db7999 move connhandler to proxy 2016-01-02 23:32:18 +01:00
v2ray
54ce82fbfa Move unnecessary functions to internal 2016-01-02 23:08:36 +01:00
v2ray
1c4c9bffad Move proxy/common/config to proxy/internal/config 2016-01-02 17:40:51 +01:00
v2ray
3baa1f5bc5 interface for inbound connection handler manager 2016-01-01 23:44:11 +01:00
v2ray
8d6fdd014a dns cache command 2015-12-25 01:07:42 +01:00
v2ray
6543facd51 converting from host to address directly 2015-12-17 00:58:45 +01:00
v2ray
34a0cb0b70 move port out of address 2015-12-16 23:53:38 +01:00
v2ray
1f584f1502 interface for secondary id 2015-12-13 00:10:35 +01:00
v2ray
a63670311e use uuid in vmess id 2015-12-12 21:40:16 +01:00
v2ray
fed5697dc3 SwitchAccount command 2015-12-12 13:11:49 +01:00
Darien Raymond
b6ed26aedf pubsub 2015-12-11 14:56:10 +00:00
Darien Raymond
dd81fc6f6a hide space implementations from interfaces 2015-12-11 11:01:20 +00:00
Darien Raymond
ed09b4ea6a support domain as host in VMess outbound config. 2015-12-09 11:20:59 +00:00
Darien Raymond
af8412175e re-org vmess content 2015-12-07 19:32:38 +00:00
v2ray
8bee0c4a7b cleanup shell/point/config 2015-12-06 16:41:41 +01:00
v2ray
e1c58fae2b dns cache 2015-12-06 11:00:10 +01:00
v2ray
15e6e6d80c introduce app.Space 2015-12-05 22:55:45 +01:00
v2ray
32c3565681 typo 2015-12-05 01:49:03 +01:00
v2ray
06f9b65ec4 receiver manager 2015-12-05 01:16:21 +01:00
Darien Raymond
6bb53251e9 handle response command in vmess outbound. 2015-12-04 11:42:56 +00:00
Darien Raymond
11220a4952 split vmess inbound and outbound 2015-12-04 11:07:32 +00:00
Darien Raymond
5003afc85c test case for vmess outbound config 2015-12-02 21:30:15 +00:00
Darien Raymond
ae056714db refactor common/net.Port 2015-12-02 20:44:01 +00:00
Darien Raymond
fa7c1069bc more update 2015-12-02 16:27:55 +00:00
Darien Raymond
36848af749 leveral serial.String in code 2015-12-02 15:49:34 +00:00
Darien Raymond
3c12469ae5 leverage serial.String in assert 2015-12-02 15:41:19 +00:00
Darien Raymond
7960b97c8e fix test break 2015-12-02 15:26:11 +00:00
Darien Raymond
0a2e4343bc massive refactoring against unit test lib 2015-12-02 14:27:18 +00:00
V2Ray
cee85bdf26 Add Port as a type 2015-12-02 12:47:54 +01:00
Darien Raymond
cab29a7bc9 breaking change: update the way in vmess response validation 2015-12-01 13:54:49 +00:00
V2Ray
07582c5b60 Move point to shell 2015-11-29 14:45:32 +01:00
V2Ray
10b5f5cc5e Rename vmess in & out file 2015-11-28 20:50:44 +01:00
V2Ray
c2904383b3 FIx a bug that mutex is passed by value. 2015-11-28 20:29:42 +01:00
V2Ray
3f0ada1bc8 add response op in vmess protocol 2015-11-28 10:11:56 +01:00
V2Ray
9a88e8696a format code 2015-11-27 21:57:15 +01:00
V2Ray
1b8e100879 validation reader for vmess 2015-11-15 21:54:28 +01:00
V2Ray
3a6844f482 reduce number of iterations of vmess fuzzing test. 2015-11-10 12:25:26 +01:00
V2Ray
bd48556b98 Smarter reader generator 2015-11-10 12:13:01 +01:00
V2Ray
2a6f4740c1 fuzzing test for vmess protocol 2015-11-10 00:05:25 +01:00
V2Ray
fdc72ed8c9 Move mocked userset to vmess/protocol/user 2015-11-04 23:04:00 +01:00
V2Ray
1d4b541d2f Move mock config to app/config 2015-11-04 23:01:04 +01:00
V2Ray
31fb65b3d8 Remove VMess UDP 2015-11-04 21:52:48 +01:00
V2Ray
a46db069fb Refactor AES encryption/decryption 2015-11-03 21:26:16 +01:00
V2Ray
f2cf4a1f89 Test case for too-short request 2015-11-02 23:48:47 +01:00
V2Ray
03b8c8f9e8 Port picker 2015-11-01 21:32:08 +01:00
V2Ray
192960b711 Move mocked connection handlers to proxy/testing/mocks 2015-11-01 21:15:08 +01:00
V2Ray
1c09b70931 format code 2015-10-31 14:08:13 +01:00
V2Ray
46c0d457d9 User settings for trusted user 2015-10-31 09:39:45 +01:00
V2Ray
b44098d752 Introduce user level 2015-10-31 00:38:31 +01:00
V2Ray
2b45e63607 Move config cache to proxy/common 2015-10-30 22:42:24 +01:00
V2Ray
f93b29993b Move connection handler interfaces to proxy/common/connhandler 2015-10-30 00:11:29 +01:00
V2Ray
361a22d74d Move proxy errors to proxy/common/errors 2015-10-29 23:59:57 +01:00
V2Ray
fdb41bbd50 Remove call to UTC() which is not necessary. 2015-10-29 12:04:14 +01:00
V2Ray
08328d23fa beginning of http proxy 2015-10-28 12:13:27 +01:00
V2Ray
294376edc0 Remove unused const 2015-10-25 21:44:08 +01:00
V2Ray
58dcfd5e84 Reduce timeout for reading VMess header 2015-10-21 23:10:03 +02:00
V2Ray
f474fc32a7 Remove all []byte allocation 2015-10-21 22:38:53 +02:00
V2Ray
96c5d32d59 Remove []byte allocation in vmess 2015-10-21 22:28:26 +02:00
V2Ray
2c710d6b1c Protect from DoS attack 2015-10-21 21:53:55 +02:00
V2Ray
a81327c5b9 Fix zero users bug 2015-10-16 14:15:28 +02:00
Claire Raymond
771d0225c7 Refactor vmess config 2015-10-16 10:03:22 +00:00
Claire Raymond
f10f08c87d add retry on socks and vmess inbound 2015-10-15 11:42:43 +00:00
V2Ray
4bc91b0215 Fix test 2015-10-14 14:56:11 +02:00
V2Ray
890d185979 Cleanup root directory 2015-10-14 14:51:19 +02:00
V2Ray
efb881d73c Remove log level detection during runtime 2015-10-13 18:27:29 +02:00
V2Ray
1d40220d31 Remove error defination 2015-10-13 13:55:06 +02:00
V2Ray
9e078d533d continue to work even if failed to accept connection 2015-10-11 22:46:56 +02:00
V2Ray
37112f737e Log UDP access as well 2015-10-11 17:03:52 +02:00
V2Ray
d4f3fc0c0f More accurate hash generation 2015-10-10 21:43:40 +02:00
V2Ray
ab151cc053 Don't generate duplicated hash 2015-10-10 21:29:26 +02:00
V2Ray
a77f62428a Use Buffer as a writer 2015-10-10 20:52:13 +02:00
V2Ray
bcffdf0da5 Simplify code 2015-10-10 16:54:15 +02:00
V2Ray
083b1d4736 Simplify code 2015-10-10 16:50:19 +02:00
V2Ray
055c8f1833 Move goroutine one level above. 2015-10-10 01:25:12 +02:00
V2Ray
03de798a58 Update access log in vmess in 2015-10-09 17:49:59 +02:00
V2Ray
fc80d5e279 Access log 2015-10-09 17:43:27 +02:00
V2Ray
746580d566 Use buffer in socks proxy 2015-10-08 23:06:12 +02:00
V2Ray
3cb1951dfc Use []byte in pool instead of buffer 2015-10-08 17:41:38 +02:00
V2Ray
9ee73c4f6b Maintain an internal buffer pool to accelerate allocation 2015-10-08 14:46:18 +02:00
V2Ray
71df5103cd Simplify code 2015-10-08 01:39:50 +02:00
V2Ray
3aca3492eb Increase buffer size in VMessIn 2015-10-08 01:30:43 +02:00
V2Ray
e7daa4c21c Add size parameter to transport.ReadFrom 2015-10-07 21:17:11 +02:00
V2Ray
3ba9ee73b9 Increase reading timeout in favor of long connection 2015-10-07 15:24:34 +02:00
V2Ray
d2e69ed6f8 Remove unnecessary slicing 2015-10-07 14:58:31 +02:00
V2Ray
3d1a6322bd Remove unnecessary copy in VMess protocol 2015-10-07 14:50:17 +02:00
V2Ray
b126c5ce2a Simplify vmess response 2015-10-07 13:48:01 +02:00
V2Ray
cd81e5531b reuse outbound connection handler 2015-10-07 00:30:44 +02:00
V2Ray
72b4eeba8b Simpilify configuration files 2015-10-06 23:11:08 +02:00
V2Ray
78daf8a879 format code 2015-10-06 17:24:57 +02:00
V2Ray
8334d5177e Debug info 2015-10-06 16:44:19 +02:00
V2Ray
be59463fd0 Actually use UDP relay 2015-10-06 16:43:50 +02:00
V2Ray
c61ddc7028 build break 2015-10-06 09:35:02 +02:00
V2Ray
aa4d897a21 Leverage v2net functions 2015-10-06 09:33:46 +02:00
V2Ray
8461cde710 Remove unnecessary debug info 2015-10-05 16:57:58 +02:00
V2Ray
5c4b149d48 UDP support 2015-10-03 11:34:01 +02:00
V2Ray
cd42e5551c Remove VMess UDP 2015-10-02 21:55:37 +02:00
V2Ray
820da78f92 UDP handler in VMess in. 2015-10-02 16:08:01 +02:00
V2Ray
6f433f5206 Remove token field in VMess UDP 2015-10-02 15:41:09 +02:00
V2Ray
76563cb7c7 simplify udp handling 2015-10-02 15:32:26 +02:00
V2Ray
05b83508f8 Implementation of VMess UDP message 2015-09-28 17:13:50 +02:00
V2Ray
8f0cb97e89 Refactor timed queue 2015-09-28 01:11:40 +02:00
V2Ray
9c45cb031a Remove magic number 2015-09-26 22:32:45 +02:00
V2Ray
fc14b9346c Remove keepalive settings 2015-09-24 15:10:02 +02:00
V2Ray
51c2a2b880 build break 2015-09-24 14:55:21 +02:00
V2Ray
a78dbe7133 Close connection more aggressively. 2015-09-24 14:51:19 +02:00
V2Ray
c138004bf9 First attempt to regulate errors. 2015-09-24 12:54:10 +02:00
V2Ray
6ecb18268e Use array instead of slice 2015-09-23 22:17:25 +02:00
V2Ray
8ce7ee1cda Initial version of TimedStringMap 2015-09-23 18:19:05 +02:00
V2Ray
bb442b4f83 Fix usage of Mutex 2015-09-23 17:13:50 +02:00
V2Ray
3fbae6795a Switch to Mutex for better readability 2015-09-23 14:14:53 +02:00
V2Ray
c59dcc309c Update VMess protocol to remove unnecessary data 2015-09-23 00:29:10 +02:00
V2Ray
ec83281d18 Parse config just once 2015-09-22 18:11:55 +02:00
V2Ray
787df1ab9b Reduce memory allocation in vmess. 2015-09-22 14:50:34 +02:00
V2Ray
4874cd54a4 Introduce Packet to unify TCP and UDP communication 2015-09-22 14:45:03 +02:00
V2Ray
bd35793cf8 Don't random pick if there is only one vnext or user 2015-09-22 00:28:52 +02:00
V2Ray
26b6c06c9e format code 2015-09-21 19:57:30 +02:00
V2Ray
0ce10e1f88 More docs 2015-09-21 19:56:58 +02:00
V2Ray
79ffd818b2 Add network field in config file. 2015-09-21 17:52:58 +02:00
V2Ray
e2bd6abb04 format code 2015-09-21 17:48:08 +02:00
V2Ray
3e2cd914b3 Prevent DoS attack 2015-09-21 17:37:06 +02:00
V2Ray
a51d64a102 More information when vmess auth fails. 2015-09-21 17:28:48 +02:00
V2Ray
cb16047cf0 prefer interface over struct 2015-09-20 18:22:29 +02:00
V2Ray
823cbf1509 Split Address struct to save some bytes 2015-09-20 16:55:45 +02:00
V2Ray
b319704282 Add network type to destination to be ready for UDP connection 2015-09-20 16:03:12 +02:00
V2Ray
a887fd01b8 Move log into common 2015-09-20 00:50:21 +02:00
V2Ray
b40be74b86 Fix test break 2015-09-20 00:11:14 +02:00
V2Ray
075753c030 Massive refactoring for better code structure 2015-09-19 23:54:36 +02:00