768 Commits

Author	SHA1	Message	Date
Darien Raymond	f9c794c795	fix lint errors	2018-04-23 16:42:37 +02:00
Darien Raymond	148a7d064d	simplify buf.BufferedReader	2018-04-21 00:54:53 +02:00
Darien Raymond	d7aeb51904	merge http.Connection into net.Connection	2018-04-20 21:30:58 +02:00
Darien Raymond	3997d13b97	rename Slice and Slice from to Resize and Advance	2018-04-19 23:48:38 +02:00
Darien Raymond	1425fd2ba9	remove Buffer.Append method	2018-04-19 22:56:55 +02:00
Darien Raymond	1d001c090b	comments	2018-04-19 21:33:18 +02:00
Darien Raymond	a8aab30e6b	fix done.Close() in defer	2018-04-18 23:15:57 +02:00
Darien Raymond	8e62134bdf	fix draining in mux	2018-04-18 23:01:57 +02:00
Darien Raymond	be1c175de6	fix lint warnings	2018-04-18 22:35:44 +02:00
Darien Raymond	0c66016d5f	fix a regression that mux doesn't handle passive connection. fixes #1061	2018-04-18 22:13:31 +02:00
Darien Raymond	ef1d9d24cd	fix test break	2018-04-17 00:40:27 +02:00
Darien Raymond	5d23604713	rewrite ray -> pipe	2018-04-17 00:31:10 +02:00
Darien Raymond	d6dc88860b	simplify done api	2018-04-15 20:40:47 +02:00
Darien Raymond	f175d322ae	fix lint warnings	2018-04-14 13:09:58 +02:00
Darien Raymond	c76d492c0f	stats counter for inbound traffic	2018-04-12 00:10:14 +02:00
Darien Raymond	d2470e2cdb	fix lint errors	2018-04-11 20:17:19 +02:00
Darien Raymond	622cb529a9	include base error	2018-04-11 20:17:08 +02:00
Darien Raymond	a320196b77	refine domain socket transport	2018-04-09 17:09:24 +02:00
DarienRaymond	61d9b04ca5	Merge pull request #1019 from v2ray/domainsocket ... Implemented Primitive Domain Socket Support described in https://github.com/v2ray/Planning/issues/25	2018-04-09 12:42:42 +02:00
Darien Raymond	83625618ee	re-init maps when they are empty	2018-04-07 23:07:30 +02:00
Darien Raymond	758723516e	reorder condition list to short circuit IP resolution if possible. ... Fix #1021	2018-04-06 15:56:53 +02:00
Darien Raymond	7315b2c647	fix mux test	2018-04-05 21:09:57 +02:00
Darien Raymond	435be61661	fix error handling in mux	2018-04-05 20:16:31 +02:00
Shelikhoo	6d1faf5f6e	Remove staging code	2018-04-05 19:28:30 +08:00
Shelikhoo	c542c043f3	Merge branch 'master' of github.com:v2ray/v2ray-core into domainsocket	2018-04-05 19:11:33 +08:00
Shelikhoo	12012cd4df	Testing and fixs	2018-04-05 19:06:54 +08:00
Shelikhoo	8b881d7eb6	Rename to prevent confusion	2018-04-05 18:47:36 +08:00
Darien Raymond	2b675335bd	properly handle error case	2018-04-05 12:19:57 +02:00
Shelikhoo	d08929a687	finish up dial	2018-04-05 15:25:39 +08:00
Darien Raymond	79c1087311	change status to option	2018-04-04 21:33:33 +02:00
Darien Raymond	75a7e9c7f5	comments	2018-04-04 21:32:40 +02:00
Darien Raymond	90c6113dfc	handle transport errors in mux session	2018-04-04 17:20:45 +02:00
Shelikhoo	176a5c0d44	generalize interface	2018-04-04 18:17:42 +08:00
Shelikhoo	7e96581921	Added integration	2018-04-04 17:12:09 +08:00
Shelikhoo	c51830bd75	Added UnixSenderConfig	2018-04-04 16:45:46 +08:00
Darien Raymond	a3f47f4fa2	comments	2018-04-04 00:57:44 +02:00
Darien Raymond	9f198d7e3d	fix lint errors	2018-04-04 00:29:30 +02:00
DarienRaymond	8bc20c8656	Merge pull request #1013 from wuxiangzhou2010/master ... add nil check and correct some comments	2018-04-03 11:52:58 +02:00
wuxiang	3f19d09878	update some comments	2018-04-03 17:11:54 +08:00
Darien Raymond	c5bd23105e	change uint32 to int32	2018-04-02 22:01:55 +02:00
Darien Raymond	81a147e540	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2018-04-02 20:01:05 +02:00
Darien Raymond	08dab81eb2	migrate int to int32	2018-04-02 20:00:50 +02:00
wuxiangzhou2010	a58063e7ac	fix typo, first sound of user is not a vowel, but the consonant /j/	2018-04-02 15:17:36 +08:00
Darien Raymond	4de3f1adc1	change ReadFullFrom to take int32 size	2018-04-02 00:44:47 +02:00
Darien Raymond	6d98bc4607	split uplink and downlink traffic	2018-03-31 20:30:49 +02:00
Darien Raymond	0975e26ed1	command handler for stats	2018-03-31 10:30:12 +02:00
Darien Raymond	e5a5c30b67	support stats counter in dispatcher	2018-03-30 23:48:45 +02:00
Darien Raymond	695a4f8493	support stats in policy	2018-03-30 23:39:54 +02:00
Darien Raymond	f7dd7e6279	support stats counter in ray stream	2018-03-30 23:17:28 +02:00
Darien Raymond	35e160a1ff	stats feature	2018-03-30 19:56:59 +02:00
Darien Raymond	fa63beceb6	fix double release on buffers	2018-03-28 22:23:24 +02:00
Darien Raymond	12181f527f	defensive fix for improper usage of buf.New().	2018-03-28 14:40:51 +02:00
Shelikhoo	a00c0764e5	Pass unused data into Receiver	2018-03-28 20:09:43 +08:00
Jinqiu Yu	33e090befe	Clean useless code	2018-03-23 14:20:14 +08:00
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	649119493b	remove pending request from cache when error. fixes #942	2018-03-10 09:34:38 +01:00
Darien Raymond	fbc025869b	fix lint errors	2018-03-08 21:21:50 +01: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
DarienRaymond	0179b73de3	Merge pull request #884 from yujinqiu/fix-sniffer-typo ... Fix sniff typo	2018-02-26 10:56:39 +01:00
Jinqiu Yu	861ff94e5e	Fix sniff typo	2018-02-26 09:06:27 +08:00
Darien Raymond	c43a5e7d85	use AddressParser in mux	2018-02-24 00:57:54 +01:00
Darien Raymond	0a3b3d0b6d	refactor UDPNameServer clean up task	2018-02-22 17:29:21 +01:00
Darien Raymond	6b872c266c	session id	2018-02-22 15:26:00 +01:00
Darien Raymond	7e6b45ace4	format	2018-02-22 10:34:14 +01:00
Darien Raymond	88b25d38cb	simplify context retrieval	2018-02-21 17:05:29 +01:00
Darien Raymond	3734195156	fix log test	2018-02-20 22:07:50 +01:00
Darien Raymond	f0849543ed	remove commander from core feature	2018-02-20 21:19:09 +01:00
Darien Raymond	c25a76a0cf	integration test case for policy	2018-02-20 13:53:07 +01:00
Darien Raymond	446059f8dc	fix error handling in outbound handler	2018-02-19 17:51:10 +01:00
Darien Raymond	39cfc982b5	test case for policy	2018-02-17 23:37:09 +01:00
Darien Raymond	5bd3cee371	gofmt	2018-02-17 21:22:28 +01:00
Darien Raymond	84f8192b61	fix default logger	2018-02-14 22:00:08 +01:00
Darien Raymond	c48fa50ab1	logger service	2018-02-14 17:35:09 +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	c1fc7c738a	fix command listener	2018-02-08 23:37:47 +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	dffaef60b4	use periodic task in dns.Server	2018-02-08 17:00:22 +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	ddb6437976	remove unused code	2018-01-13 00:07:29 +01:00
Darien Raymond	efc8c23207	support dial for v2ray instance	2018-01-10 17:31:52 +01:00
Darien Raymond	68ef98a35d	remove unused code	2018-01-10 14:47:12 +01:00
Darien Raymond	6a7887b655	fix LocalNameServer	2018-01-10 13:32:48 +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	bc52a105ff	rename dns.Server	2017-12-28 23:19:41 +01:00
Darien Raymond	2bf5a008f0	fix error levels	2017-12-27 22:25:12 +01:00
Darien Raymond	a82ca019b2	release script relocation	2017-12-25 21:54:44 +01:00
Darien Raymond	e736c08794	report pack error instead of panic	2017-12-23 21:11:17 +01:00
Darien Raymond	2b8cc43cb4	fix a typo	2017-12-22 00:42:27 +01:00
Darien Raymond	11d726f9bf	refine log handlers	2017-12-22 00:41:40 +01:00
Darien Raymond	35545cb2db	fix test	2017-12-20 00:51:46 +01:00
Darien Raymond	7078f23291	fix nil pointer on close().	2017-12-20 00:09:52 +01:00
Darien Raymond	c277c6de54	fix test	2017-12-20 00:00:36 +01:00
Darien Raymond	ab4f245313	overrideable dns	2017-12-19 23:55:09 +01:00
Darien Raymond	49056d22ac	remove unused function	2017-12-19 22:04:20 +01:00
Darien Raymond	49b270152a	register logger on start	2017-12-19 22:02:52 +01:00
Darien Raymond	f4c35db968	merge log into common log	2017-12-19 21:28:12 +01:00
Darien Raymond	484bdeecc9	comments	2017-12-14 15:02:36 +01:00
Darien Raymond	6797483fe0	remove unused web server	2017-12-14 14:52:51 +01:00
Darien Raymond	742d9d25d1	migrate to new severity def	2017-12-10 23:33:23 +01:00
Darien Raymond	d43a23aa96	move error generator to common	2017-12-03 01:04:57 +01:00
Darien Raymond	5e27e3d260	gofmt	2017-12-03 01:04:38 +01:00
Darien Raymond	21bcf64f0f	comments	2017-11-30 12:55:31 +01:00
Darien Raymond	fd8db49dc9	generalized event handler	2017-11-28 23:41:20 +01:00
Darien Raymond	973ce07db9	fix proto merging logic	2017-11-27 23:25:43 +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	6de4ef014a	read directly from underlying buffered reader in mux	2017-11-25 01:05:30 +01:00
Darien Raymond	1226f3ce39	more test cases	2017-11-23 14:48:43 +01:00
Darien Raymond	619f4eae59	remove vpndialer from core. will be added through plugin	2017-11-23 12:07:03 +01:00
Darien Raymond	afacee9e05	refactor	2017-11-19 21:43:20 +01:00
Darien Raymond	8fb69fc2b6	send IPv6 query only to supported server.	2017-11-19 20:42:34 +01:00
Darien Raymond	878d412c6a	handle truncated DNS messages. fix #713	2017-11-18 20:00:09 +01:00
Darien Raymond	88b521c77e	remove debug info	2017-11-17 03:03:27 +00:00
Darien Raymond	aa2c1f76f4	remove unused function	2017-11-16 18:54:10 +01:00
Darien Raymond	26f005e822	resolve to ip on demand	2017-11-15 12:55:47 +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	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	57648c145c	cachable domain matcher: step 2	2017-11-06 22:30:56 +01:00
Darien Raymond	6b77e14bf6	cachable domain matcher, step 1	2017-11-06 21:12:28 +01:00
Darien Raymond	682319a004	proto def for geosite	2017-11-05 17:19:34 +01:00
Darien Raymond	3545d20b1c	protobuf for geoip	2017-11-02 10:54:06 +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	52ad41cda3	completely move away from net package	2017-08-29 14:32:54 +02:00
Darien Raymond	815019f6da	rename IPNet to IPNetTable	2017-08-29 13:51:09 +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	2b80d096ff	trace only non nil error	2017-07-25 23:12:45 +02:00
Darien Raymond	c13b212fc6	remove unused variables	2017-06-22 21:07:16 +02:00
Darien Raymond	8a3288dc6c	fixmultiplesniffer	2017-06-05 23:27:50 +02:00
Darien Raymond	661c0fc237	more test cases for router config	2017-05-17 21:46:57 +02:00
Darien Raymond	06d4c37889	integrate mux in vmess server	2017-05-17 21:13:01 +02:00
Darien Raymond	fcafd4e8f8	test case for email	2017-05-17 13:28:22 +02:00
Darien Raymond	069837417f	test case for routing rule	2017-05-17 13:24:53 +02:00
Darien Raymond	52216d0204	test case for domain matcher	2017-05-09 13:39:09 +02:00
Darien Raymond	5829b45bbe	close timer faster	2017-05-09 00:01:15 +02:00
Darien Raymond	74b2734cb8	refactor	2017-05-08 12:25:36 +02:00
Darien Raymond	a0bde091d4	sub domain matcher	2017-05-08 12:18:13 +02:00
Darien Raymond	a0ac334703	refactor	2017-05-08 11:48:41 +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	c5aa4acb35	prototype of vpndialer	2017-04-30 23:37:30 +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	2e756cdaa8	refactor	2017-04-27 11:54:15 +02:00
Darien Raymond	10ce629c02	close input on error	2017-04-26 21:43:53 +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	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	64b929862c	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-04-12 11:13:33 +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	a758e07339	fix a typo	2017-04-11 21:18:23 +02:00
Darien Raymond	4fa3c70429	simplify log handling	2017-04-10 15:03:10 +02:00
Darien Raymond	68bc9ea8e4	cleanup error messages	2017-04-09 15:04:04 +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