840 Commits (5901192a584734d086b23ff156ecc47c931ebed5)

Author	SHA1	Message	Date
Darien Raymond	b8f01e0c03	merge sender and receiver to proxyman	2017-01-15 00:17:06 +01:00
Darien Raymond	8b00d6fc30	clean imports	2017-01-14 00:27:45 +01:00
Darien Raymond	b40a139310	simplify import	2017-01-13 23:42:39 +01:00
Darien Raymond	88b607d31b	rename NewDokodemoDoor	2017-01-13 23:38:04 +01:00
Darien Raymond	f7e1f00c88	rename dispatcher.Interface	2017-01-13 13:53:44 +01:00
Darien Raymond	17504d2aac	context'ize apps	2017-01-13 13:41:40 +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	5013d387a5	migrate router test to proto	2017-01-11 00:09:33 +01:00
Darien Raymond	18a4134358	delay close error on blackhole	2017-01-10 15:10:12 +01:00
Darien Raymond	72992c7478	able to close ray stream with error	2017-01-10 14:22:42 +01:00
Darien Raymond	d999bf62e2	fix link warnings	2017-01-09 00:14:44 +01:00
Darien Raymond	f2a750a019	comment out unused const	2017-01-08 23:31:45 +01:00
Darien Raymond	74938dc428	write back error status when authentication timeout	2017-01-08 23:19:03 +01:00
Darien Raymond	2e46e95536	fix #277	2017-01-08 23:15:29 +01:00
Darien Raymond	7401807c5f	test case for socks udp	2017-01-08 16:31:28 +01:00
Darien Raymond	5b89c6aada	socks4 tests	2017-01-08 10:23:55 +01:00
Darien Raymond	e87a16900e	remove debug info	2017-01-08 01:36:03 +01:00
Darien Raymond	f2e9d8a4e0	socks client	2017-01-08 01:06:35 +01:00
Darien Raymond	b00ee67369	refine socks udp handling	2017-01-07 21:57:24 +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	f2fcc90de2	check error for the first payload	2017-01-06 11:40:49 +01:00
Darien Raymond	b9fb670ca6	remove duplicated methods	2017-01-05 16:07:34 +01:00
Darien Raymond	a704d7b6b6	convert dokodemo scenario test to protobuf based	2017-01-05 11:20:04 +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	723207158f	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-01-04 11:10:52 +01:00
Darien Raymond	c4e2d99859	refine socks tcp handling	2017-01-04 00:43:13 +01:00
Darien Raymond	31d6e74482	remove rawtcp	2017-01-03 14:53:59 +01:00
Darien Raymond	c9a421fba6	remove generate package comments in .pb.go files.	2017-01-03 14:17:44 +01:00
Darien Raymond	1e5061f15e	fix #351	2017-01-03 01:37:27 +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	a44d556667	test case for tls connection	2016-12-30 23:12:00 +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	7bc98503a8	remove buggy CloseWrite()	2016-12-29 00:56:17 +01:00
Darien Raymond	5ff2b3453a	task engine	2016-12-28 23:42:32 +01:00
Darien Raymond	7d31c0641b	fix lint warnings	2016-12-28 00:58:53 +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	52fcfd71e6	Revert "Close http connection ASAP." ... This reverts commit 56f08afd9c.	2016-12-26 07:54:51 +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	56f08afd9c	Close http connection ASAP.	2016-12-22 13:54:11 +01:00
Darien Raymond	a24b11af27	fix lint warnings	2016-12-22 13:33:28 +01:00
Darien Raymond	4cbcd2fd8d	comments	2016-12-21 23:07:35 +01:00
Darien Raymond	25533412db	comments	2016-12-21 21:43:00 +01:00
Darien Raymond	3e73e66adb	remove unused code	2016-12-21 16:38:57 +01:00
Darien Raymond	3a6f66d177	remove unused code	2016-12-21 16:00:16 +01:00
Darien Raymond	c3942fd5f0	fix lint warnings	2016-12-21 15:48:39 +01:00
Darien Raymond	ceaf5d1178	fix lint warnings	2016-12-21 15:37:16 +01:00
Darien Raymond	99c897992d	partially revert compression stream.	2016-12-21 12:53:31 +01:00
Darien Raymond	bb498cbfa8	Fix shadowsocks client handling proxied connection	2016-12-21 10:45:47 +01:00
Darien Raymond	095c29fa8c	decouple outbound handler manager	2016-12-16 23:02:11 +01:00
Darien Raymond	1bf247da55	rollback shadowsocks iv change	2016-12-16 23:02:00 +01:00
Darien Raymond	dd96b4eee7	fix aes-256-cfb iv length	2016-12-16 17:31:13 +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	4c7faadfb9	remove test utilities	2016-12-15 15:37:07 +01:00
Darien Raymond	c693867603	include base error	2016-12-15 15:36:50 +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	3b5a791ae8	simplify IPOrDomain construction	2016-12-14 23:04:02 +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	eee23e6718	fix api usage	2016-12-11 21:43:16 +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	a3cb770f77	clean up errors	2016-12-09 00:11:05 +01:00
Darien Raymond	605fc49e9e	remove unused APIs.	2016-12-08 16:50:40 +01:00
Darien Raymond	0ad629ca31	remove use of prepend	2016-12-08 11:21:24 +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	341fa376a1	Buffer.SetByte	2016-12-06 11:31:19 +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	186bf1f141	FillFullFrom	2016-12-05 17:05:47 +01:00
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