184 Commits

Author	SHA1	Message	Date
Shelikhoo	95f808ccd8	Fix merge error	2019-10-30 20:24:38 +08:00
Shelikhoo	35e9da8ca6	Merge branch 'master' of github.com:v2ray/v2ray-core ... This are significant amount of change introduced in this merge, needs additional testing.	2019-10-30 20:03:11 +08:00
fcying	1cc7702c51	check detour tag size	2019-10-27 23:14:08 +08:00
fcying	fa926a1d1d	access log add detour tag	2019-10-27 14:24:50 +08:00
fcying	23e5d3cd12	access log add detour tag	2019-06-14 14:43:42 +08:00
Darien Raymond	3828a463ea	move sniffing request to session	2019-02-23 00:27:21 +01:00
Darien Raymond	7e5e080488	move sniffing result to session	2019-02-22 16:58:16 +01:00
Darien Raymond	1ab94fed79	optimize v2ctl size	2019-02-01 20:08:21 +01:00
Darien Raymond	defc93c49d	rename dispatcher to handler	2019-01-12 09:44:59 +01:00
Darien Raymond	3de8389361	rename CloseError() to Interrupt()	2018-12-31 21:25:10 +01:00
Darien Raymond	d35c407419	fix #1493	2018-12-31 10:43:08 +01:00
Darien Raymond	0ca762e0e2	fix a deadlock in cacheReader. fix #1471	2018-12-11 09:17:10 +01:00
Darien Raymond	057e271588	update proto lib	2018-12-01 17:39:51 +01:00
Darien Raymond	842a089dad	refactor multibuffer	2018-11-18 19:36:36 +01:00
Darien Raymond	0f324a613e	remove MultiBuffer.Release	2018-11-17 22:45:07 +01:00
Darien Raymond	3ccdecaf8f	remove vio package	2018-11-03 13:05:23 +01:00
Darien Raymond	128a90b98b	move link to transport	2018-11-03 12:36:29 +01:00
Darien Raymond	f7b96507f9	simplify buffer extension	2018-11-02 21:34:04 +01:00
Darien Raymond	f78cf6cfc2	testing with mock	2018-10-22 15:58:52 +02:00
Darien Raymond	307aac26b3	simplify dependency resolution	2018-10-22 11:26:22 +02:00
Darien Raymond	a5dcb0f13e	refactor dependency resolution	2018-10-21 10:27:13 +02:00
Darien Raymond	dcae6c63dd	move size stats writer into vio	2018-10-15 09:03:40 +02:00
Darien Raymond	33becfe553	comments	2018-10-15 08:51:24 +02:00
Darien Raymond	595f3d685e	merge user info inbound metadata	2018-10-15 08:36:50 +02:00
Darien Raymond	d730637239	Require Type() for Feature	2018-10-12 23:57:56 +02:00
Darien Raymond	b4821c5ed5	move policy and dnsClient	2018-10-11 22:34:31 +02:00
Darien Raymond	273342d0b9	move stats and inbound to features directory	2018-10-11 21:14:53 +02:00
Darien Raymond	b6dc31d3fe	first part to move feature interfaces into dedicated directory	2018-10-11 20:43:37 +02:00
Darien Raymond	091fa6ad23	use new errorgen	2018-09-30 23:08:41 +02:00
Darien Raymond	d55fbd7f8d	simplify error creation	2018-09-30 18:39:53 +02:00
Darien Raymond	00ea6e3cb2	update protobuf generated files	2018-09-30 18:39:28 +02:00
Darien Raymond	94b880d060	move session based info into session package	2018-09-18 23:09:54 +02:00
Darien Raymond	383b84e7dd	unified tproxy option	2018-09-17 15:12:58 +02:00
Darien Raymond	d068f357bd	update proto lib	2018-09-14 11:00:59 +02:00
Darien Raymond	ce96941029	reduce waiting time on sniffing	2018-08-28 19:52:31 +02:00
Darien Raymond	4b63638dca	update protobuf lib	2018-07-25 00:36:28 +02:00
Darien Raymond	cd7a8595d9	fix #1207	2018-07-23 23:39:55 +02:00
Darien Raymond	72b4fa4a14	fix #1205	2018-07-21 12:11:49 +02:00
Darien Raymond	6276bfa508	rename domain override	2018-07-20 13:09:42 +02:00
Darien Raymond	c0e37ef34a	prototype for new sniffing mechanism	2018-07-16 13:47:00 +02:00
Darien Raymond	b05597df3a	fix passive connection in mux. fix #1167	2018-06-27 12:21:22 +02:00
Darien Raymond	ff0ae91b9b	update protobuf generated files	2018-06-26 16:28:54 +02:00
Darien Raymond	9977eadf8c	remove dependency from errors to session	2018-06-25 01:09:02 +02:00
Darien Raymond	213f827406	policy for internal buffer size	2018-05-25 12:08:28 +02:00
Darien Raymond	68da956fc4	re-generate code	2018-05-25 11:56:01 +02:00
Darien Raymond	0b5c638028	sniff on TCP only	2018-05-20 21:29:40 +02:00
Darien Raymond	1d001c090b	comments	2018-04-19 21:33:18 +02:00
Darien Raymond	5d23604713	rewrite ray -> pipe	2018-04-17 00:31:10 +02:00
Darien Raymond	c76d492c0f	stats counter for inbound traffic	2018-04-12 00:10:14 +02:00
Darien Raymond	622cb529a9	include base error	2018-04-11 20:17:08 +02:00
Shelikhoo	c542c043f3	Merge branch 'master' of github.com:v2ray/v2ray-core into domainsocket	2018-04-05 19:11:33 +08:00
Darien Raymond	9f198d7e3d	fix lint errors	2018-04-04 00:29:30 +02:00
wuxiang	3f19d09878	update some comments	2018-04-03 17:11:54 +08:00
Darien Raymond	6d98bc4607	split uplink and downlink traffic	2018-03-31 20:30:49 +02:00
Darien Raymond	e5a5c30b67	support stats counter in dispatcher	2018-03-30 23:48:45 +02:00
Darien Raymond	f7dd7e6279	support stats counter in ray stream	2018-03-30 23:17:28 +02:00
Jinqiu Yu	855925a805	Fix typo	2018-03-15 10:32:10 +08:00
Jinqiu Yu	861ff94e5e	Fix sniff typo	2018-02-26 09:06:27 +08: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
Shelikhoo	91f32cc8c4	Auto Gen	2018-02-12 14:47:23 +08:00
Darien Raymond	efcb567273	remove context in struct	2018-02-08 15:39:46 +01:00
Darien Raymond	b5caea67ac	gofmt	2018-01-13 00:07:37 +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	fd8db49dc9	generalized event handler	2017-11-28 23:41:20 +01:00
Darien Raymond	1226f3ce39	more test cases	2017-11-23 14:48:43 +01:00
Darien Raymond	74cf833758	fully migrate to new assertion lib	2017-10-24 16:15:35 +02:00
Darien Raymond	8a3288dc6c	fixmultiplesniffer	2017-06-05 23:27:50 +02:00
Darien Raymond	784d4ce560	comments	2017-04-26 21:28:10 +02:00
Darien Raymond	93d913b959	refactor peeking strategy	2017-04-26 21:24:58 +02:00
Darien Raymond	7c59b2e224	bug fixes in sniffer	2017-04-26 00:43:59 +02:00
Darien Raymond	c9c2338f05	refactor	2017-04-25 10:48:06 +02:00
Darien Raymond	94405dd467	fix snifer	2017-04-25 01:56:08 +02:00
Darien Raymond	00dd7d5cd2	test case for sni proxy	2017-04-25 01:40:34 +02:00
Darien Raymond	2c3ed5d9e4	snifered dispatch	2017-04-25 00:49:27 +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	35248497d2	refactor error messages	2017-04-09 01:43:25 +02:00
Darien Raymond	67956b9120	update error message	2017-04-06 21:44:20 +02:00
Darien Raymond	fc31f9b94c	refactor error interface	2017-04-06 15:13:09 +02:00
Darien Raymond	2e5cb82790	update proto	2017-04-04 12:28:14 +02:00
Darien Raymond	d04d92c187	update context functions	2017-02-09 22:49:38 +01:00
Darien Raymond	d72029211f	completely remove allow passive connection	2017-02-07 17:37:26 +01:00
Darien Raymond	b5d14b6823	update java options	2017-02-03 23:15:10 +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	ca721230e1	split listening settings from inbound proxies and apply context	2017-01-26 20:46:44 +01:00
Darien Raymond	8b00d6fc30	clean imports	2017-01-14 00:27:45 +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	0e940fb1fa	close both stream immediately after error	2017-01-10 15:10:30 +01:00
Darien Raymond	72992c7478	able to close ray stream with error	2017-01-10 14:22:42 +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	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