489 Commits

Author	SHA1	Message	Date
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
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	48eb40ff39	dice.RandomUint16	2017-02-14 22:29:44 +01:00
Darien Raymond	6d446f57f7	remove cancel signal	2017-02-13 23:03:42 +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	6888093197	gofmt	2017-02-10 16:42:24 +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	d3d2fab1d9	refine error messages	2017-02-02 14:42:31 +01:00
Darien Raymond	c8f48fde4d	remove unused file	2017-02-01 22:04:28 +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	0bf5f3e531	fix #374	2017-01-28 09:04:29 +01:00
Darien Raymond	c5ecdc8078	fix nil address in inbound proxyman	2017-01-27 23:52:29 +01:00
Darien Raymond	09e5ae7a4b	remove unnecessary code	2017-01-27 22:49:54 +01:00
Darien Raymond	8231d2cdad	dns test	2017-01-27 21:19:46 +01:00
Darien Raymond	9716d7fdfe	Fix usage of source in context	2017-01-27 20:38:01 +01:00
Darien Raymond	18e1ca85aa	rename udp.Server	2017-01-27 14:45:16 +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	8b00d6fc30	clean imports	2017-01-14 00:27:45 +01:00