622 Commits

Author	SHA1	Message	Date
Darien Raymond	14176a340d	fix error usage	2018-01-18 11:35:04 +01:00
Darien Raymond	292d7cc353	massive refactoring for interoperability	2018-01-10 12:22:37 +01:00
Darien Raymond	f4c35db968	merge log into common log	2017-12-19 21:28:12 +01:00
Darien Raymond	d43a23aa96	move error generator to common	2017-12-03 01:04:57 +01:00
Darien Raymond	9ff0dc7327	remove struct scoped context	2017-12-01 10:36:08 +01:00
Darien Raymond	fd8db49dc9	generalized event handler	2017-11-28 23:41:20 +01:00
Darien Raymond	f90ec9fff0	rename interfaces	2017-11-27 22:18:39 +01:00
Darien Raymond	3214a5078c	customizable policy	2017-11-27 22:09:30 +01:00
Darien Raymond	25dd739285	refactor	2017-11-25 15:20:59 +01:00
Darien Raymond	2371617a22	fix lint warnings	2017-11-23 23:46:46 +01:00
Darien Raymond	3ed16fad38	enable pading for cfb	2017-11-23 15:21:57 +01:00
Darien Raymond	4aa87be0f2	enable command mux	2017-11-23 15:21:16 +01:00
Darien Raymond	5a6022d1ed	log err for SetReadDeadline(). fix #707	2017-11-15 01:14:02 +01:00
Darien Raymond	0dbfb66126	clean up dns package	2017-11-15 00:36:14 +01:00
Darien Raymond	594ec15c09	cleanup buffer usage	2017-11-09 22:33:15 +01:00
Darien Raymond	66b82e4ab7	cleanup MultiBuffer	2017-11-09 00:55:28 +01:00
Darien Raymond	cab5c10fc2	remove use of KeepAlive	2017-11-07 22:31:47 +01:00
Darien Raymond	02685094d3	rewrite vmess encoding using buf	2017-10-27 21:11:45 +02:00
Darien Raymond	74cf833758	fully migrate to new assertion lib	2017-10-24 16:15:35 +02:00
Darien Raymond	26818a2602	fix domain length issue for all proxies	2017-10-22 20:17:06 +02:00
Darien Raymond	24089bfad0	remove duplicated address type def	2017-10-21 21:59:46 +02:00
Darien Raymond	f1a15e92f5	apply bitmask to other packages	2017-10-21 21:04:24 +02:00
Darien Raymond	3a27ff8239	increase default timeout to 5 minutes	2017-09-27 21:09:13 +02:00
Darien Raymond	109a37fe7e	aggressively close connection when response is done	2017-09-27 15:29:00 +02:00
Darien Raymond	8971e699d9	common.Must2	2017-09-19 23:27:49 +02:00
Darien Raymond	1c856a46ab	step 1 to remove reference to net package	2017-08-29 12:56:57 +02:00
Darien Raymond	6bbc3a6945	check error	2017-07-25 22:28:48 +02:00
Darien Raymond	21284fbd61	refactor	2017-07-25 22:21:59 +02:00
Darien Raymond	3d13bba412	allow error on set deadline	2017-05-30 17:33:41 +02:00
Darien Raymond	62b01ef0ba	code cleanup	2017-05-24 01:35:05 +02:00
Darien Raymond	ade88fd5c7	reuse buffered writer in auth writer	2017-05-24 00:54:30 +02:00
Darien Raymond	06d4c37889	integrate mux in vmess server	2017-05-17 21:13:01 +02:00
Darien Raymond	7a4bab4940	support packet transfer type in mux	2017-05-02 22:23:07 +02:00
Darien Raymond	939fae00e9	packet mode reader and writer	2017-05-02 00:28:16 +02:00
Darien Raymond	6f3362fc4c	update activity	2017-04-27 22:30:48 +02:00
Darien Raymond	4668f9d3de	refactor	2017-04-25 23:51:04 +02:00
Darien Raymond	e87b0ca848	size encoder and decoder	2017-04-23 13:30:08 +02:00
Darien Raymond	ab9349ec31	rename buf.Copy	2017-04-17 22:50:02 +02:00
Darien Raymond	2f565bfd5e	simplify ray stream	2017-04-16 09:57:28 +02:00
Darien Raymond	f506a39d32	multi buffer	2017-04-15 21:07:23 +02:00
Darien Raymond	a8586eace6	fix interface	2017-04-09 12:45:25 +02:00
Darien Raymond	345e43b4c4	update error message	2017-04-09 09:49:19 +02:00
Darien Raymond	2a51b71ba4	use merging reader only for tcp traffic	2017-04-09 09:08:10 +02:00
Darien Raymond	35248497d2	refactor error messages	2017-04-09 01:43:25 +02:00
Darien Raymond	bc4e2293ef	remove errors.Format	2017-04-09 00:31:06 +02:00
Darien Raymond	a034276eee	update error messages	2017-04-07 22:56:27 +02:00
Darien Raymond	ade8453c0a	completely remove connection reuse feature	2017-04-07 21:54:40 +02:00
Darien Raymond	1b244bf3a1	reduce VMess memory usage	2017-04-06 23:11:36 +02:00
Darien Raymond	b4cd497abf	update error messages	2017-04-06 22:00:32 +02:00
Darien Raymond	75f5cb9afb	refactor log and error	2017-04-06 21:13:17 +02:00
Darien Raymond	fc31f9b94c	refactor error interface	2017-04-06 15:13:09 +02:00
Darien Raymond	65c6972eb5	delete then add	2017-04-06 11:41:57 +02:00
Darien Raymond	2e5cb82790	update proto	2017-04-04 12:28:14 +02:00
Darien Raymond	18b0b87c52	no-op timer	2017-04-04 10:24:38 +02:00
Darien Raymond	f34ad57b58	refactor timer api	2017-03-31 21:45:43 +02:00
Darien Raymond	a57531ef5d	cancel context after finish	2017-03-31 21:10:33 +02:00
Darien Raymond	f643344154	merge buf stream	2017-03-27 11:26:44 +02:00
Darien Raymond	14824c8451	fix timeout reader usage	2017-03-27 11:14:55 +02:00
Darien Raymond	d627638412	refine error message	2017-03-07 22:08:16 +01:00
Darien Raymond	e480091388	smart error propagation	2017-02-21 23:14:07 +01:00
Darien Raymond	3112d3a2d3	typo	2017-02-21 15:48:21 +01:00
Darien Raymond	020b436827	merge bufio into buf	2017-02-15 22:51:01 +01:00
Darien Raymond	3c032f0d53	update frame header masking strategy	2017-02-14 14:16:43 +01:00
Darien Raymond	104446afdf	update masking strategy	2017-02-14 10:55:45 +01:00
Darien Raymond	8d6a4d0a8a	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-02-14 10:13:13 +01:00
Darien Raymond	0d83330ced	condition session history	2017-02-14 10:13:09 +01:00
Darien Raymond	d5b1762865	mask size bytes	2017-02-14 10:11:26 +01:00
Darien Raymond	7b707275df	naming refactoring	2017-02-13 13:16:37 +01:00
Darien Raymond	4c661bee47	update comments	2017-02-13 13:10:43 +01:00
Darien Raymond	02028bf8be	fix panic when there is no available handler	2017-02-13 13:08:28 +01:00
Darien Raymond	ec95caa946	per inbound session history	2017-02-12 16:53:23 +01:00
Darien Raymond	10d26f2d7f	test case for anti reply attack	2017-02-12 14:00:17 +01:00
Darien Raymond	3e10f3ae69	server side anti reply attack	2017-02-12 13:57:36 +01:00
Darien Raymond	0cfd8ab423	default security settings for dynamic port	2017-02-11 07:29:29 +01:00
Darien Raymond	6888093197	gofmt	2017-02-10 16:42:24 +01:00
Darien Raymond	5e7fb6d0dd	refine error handling in retry logic	2017-02-10 11:41:50 +01:00
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