355 Commits

Author	SHA1	Message	Date
DarienRaymond	bf5e93efd7	Merge pull request #968 from wuxiangzhou2010/master ... fix typo	2018-03-19 21:44:25 +07:00
Wuxiang	e8438a522a	fix typo ... fix typo	2018-03-19 16:40:47 +08:00
Shelikhoo	09bf78a089	notify progressTraffic to quit	2018-03-18 22:13:17 +08:00
Shelikhoo	3e05a3529a	finish UnixInboundHandler	2018-03-18 22:08:03 +08:00
Shelikhoo	8e5063dedf	(Sync Commit)	2018-03-16 12:35:12 +08:00
DarienRaymond	a8a68c2e70	Merge pull request #962 from yujinqiu/fix-typo ... Fix typo	2018-03-16 04:16:47 +01:00
Jinqiu Yu	855925a805	Fix typo	2018-03-15 10:32:10 +08:00
Darien Raymond	5a227ec356	int to int32	2018-03-13 03:39:36 +01:00
Darien Raymond	1cbfeea0cd	simplify NewSize calls	2018-03-12 22:10:13 +01:00
Darien Raymond	994aecd13c	rename NewLocal to NewSize	2018-03-11 23:29:17 +01:00
Darien Raymond	f97e6fa3d2	refine buffer allocation	2018-03-11 23:06:04 +01:00
Shelikhoo	43abfc9463	Unix listeners(sync commit)	2018-03-11 13:44:21 +08:00
Darien Raymond	e1bdca446d	fix context reference	2018-03-05 21:15:41 +01:00
Darien Raymond	59958fed68	refactor udp worker	2018-03-01 14:58:13 +01:00
Darien Raymond	c43a5e7d85	use AddressParser in mux	2018-02-24 00:57:54 +01:00
Darien Raymond	6b872c266c	session id	2018-02-22 15:26:00 +01:00
Darien Raymond	88b25d38cb	simplify context retrieval	2018-02-21 17:05:29 +01:00
Darien Raymond	446059f8dc	fix error handling in outbound handler	2018-02-19 17:51:10 +01:00
Darien Raymond	1e0b35f869	fix nil reference in udp worker	2018-02-14 13:41:21 +01:00
Darien Raymond	31d1fb6cc3	fix lint errors	2018-02-12 21:35:10 +01:00
Darien Raymond	ae395bbe1f	increase udp hub capacity	2018-02-12 15:08:20 +01:00
Darien Raymond	7391b2439e	simplify udp hub	2018-02-12 13:14:11 +01:00
Shelikhoo	91f32cc8c4	Auto Gen	2018-02-12 14:47:23 +08:00
Shelikhoo	5e0ed59599	added function stub for UnixReceiverHandler Instancer	2018-02-12 14:18:33 +08:00
Shelikhoo	7f34cbdaff	Add Generated Files	2018-02-12 14:17:14 +08:00
Shelikhoo	7b51a56c33	Fix pb err	2018-02-12 14:15:50 +08:00
Shelikhoo	7afd26a78f	Type switch for UnixReceiver	2018-02-12 14:15:50 +08:00
Shelikhoo	71c3e81a7e	Rebase: Add domainsocket receiver config	2018-02-12 14:07:16 +08:00
Darien Raymond	92aef24f98	remove unnecessary proxy functions	2018-02-09 23:07:38 +01:00
Darien Raymond	d9040b571d	decouple commander interface from grpc	2018-02-08 23:24:35 +01:00
Darien Raymond	495ae1c5e3	implement remove user operation	2018-02-08 22:53:01 +01:00
Darien Raymond	862f9a152e	comments and refactoring	2018-02-08 22:09:55 +01:00
Darien Raymond	b5facc0ca5	remove context from mux.Client	2018-02-08 17:46:50 +01:00
Darien Raymond	32f1ba7c7e	properly start and close outbound handlers	2018-02-08 17:24:14 +01:00
Darien Raymond	9a46cf37fb	fix default outbound handler	2018-02-08 15:45:50 +01:00
Darien Raymond	efcb567273	remove context in struct	2018-02-08 15:39:46 +01:00
Darien Raymond	8b83bf2283	comments and test cases.	2018-02-07 12:38:12 +01:00
Darien Raymond	8b5fe1a13b	correct handler running status	2018-02-07 12:34:15 +01:00
Darien Raymond	deaee9fa65	test case for removing handler on the fly	2018-02-06 13:47:50 +01:00
Darien Raymond	3a0f211c22	gofmt	2018-02-05 23:39:04 +01:00
Darien Raymond	1e6d5561cc	prototype of commander	2018-02-05 23:38:24 +01:00
Darien Raymond	384844f898	fix #840	2018-02-02 22:35:18 +01:00
Darien Raymond	b5caea67ac	gofmt	2018-01-13 00:07:37 +01:00
Darien Raymond	efc8c23207	support dial for v2ray instance	2018-01-10 17:31:52 +01:00
Darien Raymond	292d7cc353	massive refactoring for interoperability	2018-01-10 12:22:37 +01:00
Darien Raymond	24395a3e60	comments for protos.	2018-01-04 11:09:23 +01:00
Darien Raymond	2bf5a008f0	fix error levels	2017-12-27 22:25:12 +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	fd8db49dc9	generalized event handler	2017-11-28 23:41:20 +01:00
Darien Raymond	6de4ef014a	read directly from underlying buffered reader in mux	2017-11-25 01:05:30 +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	ead3fa09e5	release buffer on error	2017-11-07 22:33:16 +01:00
Darien Raymond	cab5c10fc2	remove use of KeepAlive	2017-11-07 22:31:47 +01:00
Darien Raymond	c1eccb3a45	safe release buffer	2017-11-07 11:58:43 +01:00
Darien Raymond	c3fc27f7a1	comments	2017-10-30 12:36:31 +01:00
Darien Raymond	5901192a58	fix udp in transparent proxy	2017-10-27 17:13:43 +02:00
Darien Raymond	27c099dd37	simplify metadata reader	2017-10-27 16:32:00 +02:00
Darien Raymond	a1cf299848	reduce memory allocation in mux	2017-10-27 11:40:18 +02:00
Darien Raymond	d6e9162f78	trace outstanding error only	2017-10-24 17:33:46 +02:00
Darien Raymond	0f27e0b4d3	close outbound ray on error	2017-10-24 17:33:28 +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	9f392eb506	avoid long domain names in mux	2017-10-22 19:48:19 +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	8c6f73f30b	bitmask	2017-10-21 20:40:31 +02:00
Darien Raymond	948534f480	reduce memory consumption of mux.Writer	2017-10-21 20:21:51 +02:00
Darien Raymond	9df5ac6e4f	fix frame meta	2017-10-21 19:29:27 +02:00
Darien Raymond	aa5e06a26e	reduce memory consumption of frame meta	2017-10-21 19:27:53 +02:00
Darien Raymond	7f4296cd78	assert meta is nil on error	2017-10-21 19:27:31 +02:00
Darien Raymond	badc77a7f7	return proper error in drain	2017-10-21 19:27:20 +02:00
Darien Raymond	103cb48692	test case for SessionManager.Size()	2017-10-21 19:26:57 +02:00
Darien Raymond	95c469c1fd	handle proxy error in mux client	2017-10-20 21:11:13 +02:00
Darien Raymond	1c856a46ab	step 1 to remove reference to net package	2017-08-29 12:56:57 +02:00
Darien Raymond	e7aaba0c30	refactor	2017-07-25 23:12:54 +02:00
Darien Raymond	06d4c37889	integrate mux in vmess server	2017-05-17 21:13:01 +02:00
Darien Raymond	5829b45bbe	close timer faster	2017-05-09 00:01:15 +02:00
Darien Raymond	dc76e36ed7	close mux session on end	2017-05-02 23:53:39 +02:00
Darien Raymond	d5f931ae8b	fix udp handling in dokodemo and mux	2017-05-02 23:36:37 +02:00
Darien Raymond	7a4bab4940	support packet transfer type in mux	2017-05-02 22:23:07 +02:00
Darien Raymond	61b6b6fff5	update proto	2017-04-29 22:25:36 +02:00
Darien Raymond	6f3362fc4c	update activity	2017-04-27 22:30:48 +02:00
Darien Raymond	f418b9bc20	swallow write error in mux	2017-04-27 22:20:29 +02:00
Darien Raymond	10ce629c02	close input on error	2017-04-26 21:43:53 +02:00
Darien Raymond	77521029b1	support for http and tls header sniffing	2017-04-25 00:19:22 +02:00
Darien Raymond	59a1e2d736	refactor	2017-04-23 19:16:56 +02:00
Darien Raymond	cea6e28634	refactor	2017-04-23 13:41:52 +02:00
Darien Raymond	6a90ce3c43	comments	2017-04-21 15:36:05 +02:00
Darien Raymond	a7abac2eaf	extend mux session timeout	2017-04-19 21:33:11 +02:00
Darien Raymond	6d7aaa6535	bug fixes	2017-04-19 21:27:21 +02:00
Darien Raymond	1d761e30a9	cleanup	2017-04-19 18:00:11 +02:00
Darien Raymond	0ebebfa458	cleanup	2017-04-19 16:29:36 +02:00
Darien Raymond	a624e50ffe	test case	2017-04-19 12:36:04 +02:00
Darien Raymond	bb72264994	fix a typo in session manager	2017-04-19 12:11:59 +02:00
Darien Raymond	027270fd2c	cleanup	2017-04-19 11:20:08 +02:00
Darien Raymond	ffa0787b09	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-04-19 11:18:00 +02:00
Darien Raymond	bc58c3e14b	test case for mux	2017-04-19 11:17:41 +02:00
Darien Raymond	31a0951bd2	write by slice when buffer is too large	2017-04-19 10:14:52 +02:00
Darien Raymond	cee2fe4b6f	fix test break	2017-04-18 12:35:54 +02:00
Darien Raymond	ab9349ec31	rename buf.Copy	2017-04-17 22:50:02 +02:00
Darien Raymond	e064ce65c8	handle error properly	2017-04-16 13:24:02 +02:00
Darien Raymond	d6988f1a63	simplify code	2017-04-16 13:17:35 +02:00
Darien Raymond	abe790181e	multi reader	2017-04-15 22:22:29 +02:00
Darien Raymond	f506a39d32	multi buffer	2017-04-15 21:07:23 +02:00
Darien Raymond	0a2547b285	cleanup handler functions	2017-04-14 10:03:10 +02:00
Darien Raymond	2cf809021b	force close session manage when main connection is finished	2017-04-13 20:56:32 +02:00
Darien Raymond	81d840699a	mutex protected close	2017-04-13 20:14:07 +02:00
Darien Raymond	c9f661f018	refactor	2017-04-12 23:55:59 +02:00
Darien Raymond	ad083989aa	split session manager out of mux client and server	2017-04-12 22:31:11 +02:00
Darien Raymond	9b834a2148	handle status keep alive	2017-04-12 11:52:10 +02:00
Darien Raymond	343417633a	fix build break	2017-04-12 10:41:02 +02:00
Darien Raymond	c89cd8ae24	settings for mux concurrency	2017-04-12 10:40:21 +02:00
Darien Raymond	0e01e9e9ca	comments	2017-04-09 14:49:40 +02:00
Darien Raymond	277a08d8a7	fix lint error	2017-04-09 14:33:08 +02:00
Darien Raymond	35248497d2	refactor error messages	2017-04-09 01:43:25 +02:00
Darien Raymond	ade8453c0a	completely remove connection reuse feature	2017-04-07 21:54:40 +02:00
Darien Raymond	b4cd497abf	update error messages	2017-04-06 22:00:32 +02:00
Darien Raymond	67956b9120	update error message	2017-04-06 21:44:20 +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	8acde086c3	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-04-05 17:36:18 +02:00
Darien Raymond	babf7476ff	more logs	2017-04-05 17:36:15 +02:00
Darien Raymond	7682929c11	close main connection quicker	2017-04-05 15:22:21 +02:00
Darien Raymond	4ee1abdaff	refactor	2017-04-05 14:26:20 +02:00
Darien Raymond	9b1d20943f	clean up mux client in manager	2017-04-05 14:24:15 +02:00
Darien Raymond	d10445d49a	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-04-05 14:13:28 +02:00
Darien Raymond	4d682c01e0	refactor mux	2017-04-05 14:13:26 +02:00
Darien Raymond	2a3facab5a	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-04-05 13:46:13 +02:00
Darien Raymond	55328921b5	wait for done	2017-04-05 13:46:11 +02:00
Darien Raymond	0a15bceb55	fix dead lock	2017-04-05 12:56:50 +02:00
Darien Raymond	947492a71c	close all sessions after main connection ends	2017-04-05 11:02:49 +02:00
Darien Raymond	2e5cb82790	update proto	2017-04-04 12:28:14 +02:00
Darien Raymond	7195c17af6	close server down link	2017-04-04 11:20:07 +02:00
Darien Raymond	18b0b87c52	no-op timer	2017-04-04 10:24:38 +02:00
Darien Raymond	55ecd92064	simplify mux code	2017-04-04 00:17:38 +02:00
Darien Raymond	bf0a4c428e	refactor mux code	2017-04-03 23:43:33 +02:00
Darien Raymond	682235cacc	refactor server worker	2017-04-03 17:28:15 +02:00
Darien Raymond	c4ba853887	refactor error messages	2017-04-03 13:07:12 +02:00
Darien Raymond	72d9cb8a74	bug fixes	2017-04-03 12:55:46 +02:00
Darien Raymond	852fd14ba9	wait for handler init	2017-04-03 01:07:18 +02:00
Darien Raymond	5686566139	apply mux in client	2017-04-02 21:30:21 +02:00
Darien Raymond	2111c7e9ca	update proto def	2017-04-02 14:24:10 +02:00
Darien Raymond	9d6513d3d3	remove unused code	2017-04-02 14:23:58 +02:00
Darien Raymond	1e06cf34d9	apply mux in inbound handler	2017-04-02 14:06:20 +02:00
Darien Raymond	3161c56aba	refactor	2017-04-02 13:43:24 +02:00
Darien Raymond	73c4696e00	mux io	2017-04-02 09:48:30 +02:00
Darien Raymond	9e6a57b2b8	mux client	2017-04-01 00:53:01 +02:00
Darien Raymond	eab2f1effc	refactor	2017-03-27 01:47:01 +02:00
Darien Raymond	514dcffe2e	Fix a potential issue causing high CPU usage	2017-03-02 11:54:40 +01:00
Darien Raymond	9206d7a741	fix sync issue in time calculation	2017-02-27 21:34:35 +01:00
Darien Raymond	d93ff628bc	refactor tcp worker	2017-02-26 14:38:41 +01:00
Darien Raymond	e480091388	smart error propagation	2017-02-21 23:14:07 +01:00
Darien Raymond	020b436827	merge bufio into buf	2017-02-15 22:51:01 +01:00
Darien Raymond	02028bf8be	fix panic when there is no available handler	2017-02-13 13:08:28 +01:00
Darien Raymond	c0ea29a2ed	switch to info	2017-02-11 07:39:06 +01:00
Darien Raymond	e57124ab87	remove unnecessary error message	2017-02-10 12:01:52 +01:00
Darien Raymond	396cf21597	output detailed error message	2017-02-10 12:00:37 +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	d7167f552d	remove allowPassiveConnection from config	2017-02-07 21:28:21 +01:00
Darien Raymond	e7a7b38319	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-02-07 21:11:50 +01:00
Darien Raymond	b652032d9d	update for mux	2017-02-07 21:11:47 +01:00
Darien Raymond	d72029211f	completely remove allow passive connection	2017-02-07 17:37:26 +01:00
Darien Raymond	a13a8cffd8	test v2ray close	2017-02-05 08:44:08 +01:00
Darien Raymond	05626ca0fe	check if hub is initialized.	2017-02-05 08:38:25 +01:00
Darien Raymond	4812e66229	fix stream settings check	2017-02-04 00:27:16 +01:00
Darien Raymond	b5d14b6823	update java options	2017-02-03 23:15:10 +01:00
Darien Raymond	b07d947311	update proto for mux	2017-02-03 23:09:24 +01:00
Darien Raymond	43fb425fd7	unified dispatcher interface	2017-02-03 22:50:01 +01:00
Darien Raymond	c4d0227977	simplify dialer and dispatcher parameters	2017-02-03 22:35:09 +01:00
Darien Raymond	f046f334cd	move common/log to app/log	2017-02-01 21:35:40 +01:00
Darien Raymond	509700eddb	typo	2017-01-30 21:37:50 +01:00
Darien Raymond	e7aa920c27	refine dyn port	2017-01-30 21:35:34 +01:00
Darien Raymond	bfcc75f5d1	fix goroutine leak in dynamic port	2017-01-29 12:58:52 +01:00
Darien Raymond	19ca32efd7	fix tcp connection source	2017-01-29 07:58:29 +01:00
Darien Raymond	f6e0d08d34	Fix HTTP proxy	2017-01-28 23:34:55 +01:00
Darien Raymond	fab20bb0cf	close outbound connections when context is done	2017-01-28 21:24:46 +01:00
Darien Raymond	1ee9450dfc	release buffer	2017-01-28 16:27:46 +01:00
Darien Raymond	c5ecdc8078	fix nil address in inbound proxyman	2017-01-27 23:52:29 +01:00
Darien Raymond	83c35c1e41	remove unnecessary log	2017-01-27 14:30:09 +01:00
Darien Raymond	15e0b7125d	fix udp worker	2017-01-27 14:27:02 +01:00
Darien Raymond	866a4d879c	fix udp handling	2017-01-27 14:10:36 +01:00
Darien Raymond	6c45f593dd	bug fixes in outbound handler	2017-01-26 22:47:31 +01:00
Darien Raymond	7f36a5d1d3	rename proxy interfaces	2017-01-26 20:57:18 +01:00
Darien Raymond	ca721230e1	split listening settings from inbound proxies and apply context	2017-01-26 20:46:44 +01:00
Darien Raymond	34a2ae0ab7	implement default outbound handler	2017-01-15 00:48:37 +01:00
Darien Raymond	b8f01e0c03	merge sender and receiver to proxyman	2017-01-15 00:17:06 +01:00
Darien Raymond	17504d2aac	context'ize apps	2017-01-13 13:41:40 +01:00
Darien Raymond	ed3033e785	socks submodule	2017-01-08 10:10:37 +01:00
Darien Raymond	b11d48d73f	simplify app design	2017-01-06 15:32:36 +01:00
Darien Raymond	e678000c44	remove release() pattern	2017-01-04 12:52:24 +01:00
Darien Raymond	ff01a886da	simplify comments	2017-01-03 14:21:59 +01:00
Darien Raymond	c9a421fba6	remove generate package comments in .pb.go files.	2017-01-03 14:17:44 +01:00
Darien Raymond	6c39ce0714	doc	2017-01-03 13:06:03 +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	095c29fa8c	decouple outbound handler manager	2016-12-16 23:02:11 +01:00
Darien Raymond	f95c322677	rename 'this'	2016-11-27 21:39:09 +01:00