1086 Commits

Author	SHA1	Message	Date
Darien Raymond	a059ee2c00	fix lint errors	2018-02-23 17:14:20 +01:00
Darien Raymond	798212b311	fix timer settings	2018-02-23 17:07:45 +01:00
Darien Raymond	768e30c37b	disable socks 4 when auth is required.	2018-02-23 13:55:56 +01:00
Darien Raymond	16c6a5f078	fix test break	2018-02-23 12:36:33 +01:00
Darien Raymond	546c2fb226	settings for forcing secure encryption in vmess server	2018-02-23 12:13:02 +01:00
Darien Raymond	6b872c266c	session id	2018-02-22 15:26:00 +01:00
Darien Raymond	80a1e73361	fix error propagation in vmess server	2018-02-22 15:25:26 +01:00
Darien Raymond	cdfbd0317f	remove unused function	2018-02-22 11:58:46 +01:00
Darien Raymond	0920af171b	remove redundent code	2018-02-22 10:49:06 +01:00
Darien Raymond	1077e33d62	unify address reading in socks and shadowsocks	2018-02-22 10:31:08 +01:00
Darien Raymond	88b25d38cb	simplify context retrieval	2018-02-21 17:05:29 +01:00
Darien Raymond	1f8fcb558d	fix error handling in freedom, shadowsocks and socks	2018-02-19 21:38:04 +01:00
Darien Raymond	226d65c6c7	fix error handling in vmess outbound	2018-02-19 17:50:21 +01:00
Darien Raymond	e7858e78d5	properly set timeout in dokodemo door	2018-02-19 16:53:07 +01:00
Darien Raymond	03ba5ef4cb	properly close shadowsocks client udp connection	2018-02-12 12:28:18 +01:00
Shelikhoo	7f34cbdaff	Add Generated Files	2018-02-12 14:17:14 +08:00
Darien Raymond	34f51c6a0d	enable mux command for next version	2018-02-12 00:06:51 +01:00
Darien Raymond	6f4bddd62e	disable mux command temporarily	2018-02-10 11:17:40 +01:00
Darien Raymond	92aef24f98	remove unnecessary proxy functions	2018-02-09 23:07:38 +01:00
Darien Raymond	42d83a703e	fix transfer for mux	2018-02-09 22:29:30 +01:00
Darien Raymond	30a0aa6fb0	don't read 0 bytes	2018-02-09 17:56:39 +01:00
Darien Raymond	8460d016ab	fix address parsing for mux	2018-02-09 17:48:09 +01:00
Darien Raymond	05d93e5eb0	fix handling for empty email addresses	2018-02-09 11:43:23 +01:00
Darien Raymond	87ba7dd0d1	implement remove user in vmess	2018-02-09 11:32:12 +01:00
Darien Raymond	5755d4153a	fix encoding test	2018-02-08 16:13:27 +01:00
Darien Raymond	efcb567273	remove context in struct	2018-02-08 15:39:46 +01:00
Darien Raymond	a1ae4aa515	cleanup session history	2018-02-07 16:35:22 +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	cf832a4272	adjust init sequence	2018-01-31 13:23:23 +01:00
Darien Raymond	0273b36027	prepare for remove function	2018-01-30 21:38:43 +01:00
Darien Raymond	c3dce11c4e	fix a typo	2018-01-19 14:08:45 +01:00
Darien Raymond	4b5e41c783	fix UDP handling in Shadowsocks client	2018-01-19 11:08:34 +01:00
Darien Raymond	0e01e28278	use uuid as struct	2018-01-18 23:25:48 +01:00
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	664b840812	send username/password together with initial handshake data in socks client. Fix #785	2017-12-26 23:33:25 +01:00
Darien Raymond	ab4f245313	overrideable dns	2017-12-19 23:55:09 +01:00
Darien Raymond	f4c35db968	merge log into common log	2017-12-19 21:28:12 +01:00
Darien Raymond	1f226797bc	remove header operation to http protocol package	2017-12-18 20:59:43 +01:00
Darien Raymond	484bdeecc9	comments	2017-12-14 15:02:36 +01:00
Darien Raymond	b81ff78af3	fix basic auth response	2017-12-05 23:49:16 +01:00
DarienRaymond	82009c869e	Merge pull request #758 from sunshineplan/master ... 完善HTTP基本认证	2017-12-05 21:32:58 +01:00
Darien Raymond	81c4f23691	merge address writing	2017-12-04 00:55:34 +01:00
Darien Raymond	d43a23aa96	move error generator to common	2017-12-03 01:04:57 +01:00
sunshineplan	cf0fc6e4a0	完善HTTP基本认证	2017-12-02 17:07:42 +08:00
Darien Raymond	9ff0dc7327	remove struct scoped context	2017-12-01 10:36:08 +01:00
Darien Raymond	3aa5102036	lazy init of authenticator	2017-11-29 23:08:02 +01:00
Darien Raymond	f6bb214d30	fix lint warnings	2017-11-29 22:57:18 +01:00
Darien Raymond	cb68575444	support none cipher in shadowsocks	2017-11-29 22:19:04 +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	64e5430ed9	lazy init of authenticator	2017-11-27 10:42:51 +01:00
Darien Raymond	eef2a72ac0	fix aes cfb decode packet. fix #739	2017-11-27 10:42:34 +01:00
Darien Raymond	fefb5c8e01	fix aead udp	2017-11-26 21:51:30 +01:00
Darien Raymond	b64aceabcf	fix aead reader and writer	2017-11-26 16:56:01 +01:00
Darien Raymond	b7d022702e	warn user when http proxy is not finished properly	2017-11-26 15:36:05 +01:00
Darien Raymond	721bea5d54	fix lint warnings	2017-11-26 15:13:33 +01:00
Darien Raymond	6c0a1439c4	fix #739	2017-11-26 14:18:23 +01:00
Darien Raymond	02ab3f3494	refine aead check on server	2017-11-26 01:02:10 +01:00
Darien Raymond	9dbdcb3a39	fix check of AEAD cipher	2017-11-26 00:59:56 +01:00
Darien Raymond	80258c0542	handle AEAD cipher	2017-11-26 00:58:57 +01:00
Darien Raymond	713ebfb203	implementation for Shadowsocks AEAD	2017-11-26 00:51:54 +01:00
Darien Raymond	25dd739285	refactor	2017-11-25 15:20:59 +01:00
Darien Raymond	74327ea8ae	prevent using net.Conn.WriteTo()	2017-11-24 23:24:12 +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	9f146ac7d2	cleanup	2017-11-20 11:27:33 +01:00
Darien Raymond	ed1243b32b	require proxy auth when not set. fix #712	2017-11-18 19:40:53 +01:00
Darien Raymond	028b2b74c9	fix lint warning	2017-11-17 21:02:32 +01:00
Darien Raymond	a6393449e0	force reader to be nil	2017-11-17 20:58:46 +01:00
Darien Raymond	5e8cf7bde6	redo http upload performance	2017-11-17 20:54:24 +01:00
Darien Raymond	41bc2a6ce4	Revert "improve performance for http upload" ... This reverts commit cddf74334d.	2017-11-17 02:56:24 +00:00
Darien Raymond	c4be61e854	retrieve the root cause of the error	2017-11-16 12:01:42 +01:00
Darien Raymond	cddf74334d	improve performance for http upload	2017-11-16 04:10:03 +01:00
Darien Raymond	f3ba1dbb8c	fix lint warnings	2017-11-15 18:28:39 +01:00
Darien Raymond	23f209075f	use ip if already resolved	2017-11-15 12:55:54 +01:00
Darien Raymond	26f005e822	resolve to ip on demand	2017-11-15 12:55:47 +01:00
Darien Raymond	f3c5df8798	make sure writer not buffered	2017-11-15 11:23:25 +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
DarienRaymond	71d34e7451	Merge pull request #685 from valture/ua-leak ... Prevent UA from being set to golang's default ones	2017-11-05 22:30:43 +01:00
Darien Raymond	4444cc985d	http proxy in transparent mode	2017-11-05 22:13:15 +01:00
Valture	40b97e7cd3	add test for UA header	2017-11-05 20:06:40 +00:00
Valture	973378d610	Prevent UA from being set to golang's default ones ... Go automatically sets HTTP header `User-Agent' to `Go-http-client/1.1' if it hasn't been set before, which in some cases breaks the transparency of proxy. Such behavior can be prevented by setting it to an empty string.	2017-11-05 19:24:26 +00:00
Darien Raymond	cec45a416c	allow fast close on UDP session. fix #682	2017-11-04 20:50:17 +01:00
Darien Raymond	fde421ac58	Revert "check request.Host instead of request.URL.Host. fix #681" ... This reverts commit ba16987a07.	2017-11-04 09:47:41 +01:00
Darien Raymond	ba16987a07	check request.Host instead of request.URL.Host. fix #681	2017-11-04 00:35:05 +01:00
Darien Raymond	10712b3235	fix http port parsing	2017-11-03 13:03:51 +01:00
Darien Raymond	100391fdb7	fix http basic auth. fix #659	2017-10-28 14:25:22 +02:00
Darien Raymond	02685094d3	rewrite vmess encoding using buf	2017-10-27 21:11:45 +02:00
Darien Raymond	1d3c8098e9	basic auth in http server	2017-10-26 21:44:13 +02:00
Darien Raymond	12a0d6e0b9	cleanup	2017-10-26 21:07:33 +02:00
DarienRaymond	1a8ed61b9b	Merge pull request #651 from v2ray/udpfollow ... Added UDP TPROXY Transmit Support	2017-10-26 20:59:04 +02:00
Darien Raymond	74cf833758	fully migrate to new assertion lib	2017-10-24 16:15:35 +02:00
Darien Raymond	34ea53e5b7	comments	2017-10-23 18:42:38 +02:00
Darien Raymond	e06e3db50a	fix lint warnings	2017-10-23 17:39:15 +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	2ce1d8ffa2	Revert "support early terminition in Freedom" ... This reverts commit 3d0b2e4c79.	2017-09-27 15:10:25 +02:00
Darien Raymond	3d0b2e4c79	support early terminition in Freedom	2017-09-27 14:09:38 +02:00
Darien Raymond	8971e699d9	common.Must2	2017-09-19 23:27:49 +02:00
Darien Raymond	190adf1872	fix socks client for super long domain	2017-09-19 01:39:33 +02:00
Darien Raymond	e149782025	simplify destination copy logic	2017-09-11 22:03:26 +02:00
Darien Raymond	b589ca89c1	refactor	2017-09-07 22:58:10 +02:00
Darien Raymond	9594f76f93	ensure enough buffer for socks header	2017-09-07 22:58:04 +02:00
Shelikhoo	8e846fe6f8	Added UDP TPROXY Transmit Support	2017-09-07 06:55:15 +08:00
Darien Raymond	1c856a46ab	step 1 to remove reference to net package	2017-08-29 12:56:57 +02:00
Darien Raymond	444758314d	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-08-09 21:38:48 +02:00
Valture	2058920d95	fix HTTP proxy OK response	2017-08-03 07:55:38 +00:00
Darien Raymond	e7aaba0c30	refactor	2017-07-25 23:12:54 +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	ef59f67961	refactor	2017-07-25 22:14:52 +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	5829b45bbe	close timer faster	2017-05-09 00:01:15 +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	939fae00e9	packet mode reader and writer	2017-05-02 00:28:16 +02:00
Darien Raymond	bd8239f12d	remove unused code	2017-04-28 14:58:58 +02:00
Darien Raymond	6f3362fc4c	update activity	2017-04-27 22:30:48 +02:00
Darien Raymond	326a54baea	refactor	2017-04-27 00:19:49 +02:00
Darien Raymond	3aa5343722	adjust error level	2017-04-27 00:09:01 +02:00
Darien Raymond	f3c830c659	more test case on shadowsocks tcp	2017-04-26 23:46:19 +02:00
Darien Raymond	4668f9d3de	refactor	2017-04-25 23:51:04 +02:00
Darien Raymond	d615874aa9	adjust error levels	2017-04-23 20:41:45 +02:00
Darien Raymond	e87b0ca848	size encoder and decoder	2017-04-23 13:30:08 +02:00
Darien Raymond	6a90ce3c43	comments	2017-04-21 15:36:05 +02:00
Darien Raymond	498c7dafdf	clean udp writer	2017-04-21 14:51:09 +02:00
Darien Raymond	6d7aaa6535	bug fixes	2017-04-19 21:27:21 +02:00
Darien Raymond	5bfab82c41	refactor	2017-04-18 22:36:43 +02:00
Darien Raymond	ceffb71e7b	refactor	2017-04-18 22:35:13 +02:00
Darien Raymond	33ba08be77	reduce buffer size for http header reading	2017-04-18 14:24:34 +02:00
Darien Raymond	9db86e871e	close connection when content length unknown	2017-04-18 14:18:09 +02:00
Darien Raymond	18904e9adb	only keep connection alive when content length is known	2017-04-18 13:39:34 +02:00
Darien Raymond	72d5d68443	fix http connect handling	2017-04-18 13:30:26 +02:00
Darien Raymond	35acdb8385	detailed error message	2017-04-18 00:14:42 +02:00
Darien Raymond	ab9349ec31	rename buf.Copy	2017-04-17 22:50:02 +02:00
Darien Raymond	8868fe68ed	optimize http server	2017-04-17 22:35:20 +02:00
Darien Raymond	cdcf72cbe7	refine error messages	2017-04-16 22:48:51 +02:00
Darien Raymond	d6988f1a63	simplify code	2017-04-16 13:17:35 +02:00
Darien Raymond	2f565bfd5e	simplify ray stream	2017-04-16 09:57:28 +02:00
Darien Raymond	02ce3ffded	release buffer	2017-04-15 22:29:38 +02:00
Darien Raymond	47ba054ad5	optimize ota writer	2017-04-15 21:49:18 +02:00
Darien Raymond	b1dfff2fdd	remove 8k buffer pool	2017-04-15 21:19:21 +02:00
Darien Raymond	f506a39d32	multi buffer	2017-04-15 21:07:23 +02:00
Darien Raymond	8800238d24	improve http response performance	2017-04-12 11:13:54 +02:00
Darien Raymond	042e5e8033	multiple fixes for http proxy	2017-04-12 00:21:46 +02:00
Darien Raymond	f2f1ad8d6b	fix test break	2017-04-11 16:58:51 +02:00
Darien Raymond	62c896e8b8	correctly handle keep-alive in http server	2017-04-11 14:59:58 +02:00
Darien Raymond	8bb2d02f78	check number of shadowsocks servers	2017-04-11 13:42:10 +02:00
Darien Raymond	ac8d882a55	check number of socks servers	2017-04-11 10:35:14 +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	7c1b3ac1f0	cleanup error messages	2017-04-09 13:30:46 +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	503f767862	error generator	2017-04-09 00:54:23 +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	9bb66b4de4	update error messages	2017-04-07 22:45:07 +02:00
Darien Raymond	de0d0b3eb0	fix test break	2017-04-07 22:29:31 +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	2668954c12	update error messages	2017-04-06 22:17:13 +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	dff0230034	add aead cipher	2017-04-05 22:55:26 +02:00
Darien Raymond	a3042583e8	remove unused file	2017-04-05 22:51:07 +02:00
Darien Raymond	2e5cb82790	update proto	2017-04-04 12:28:14 +02:00
Darien Raymond	db8e09512c	stop sending content-length in http CONNECT	2017-04-04 11:01:41 +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	e39a67d5bc	log timeout in freedom	2017-03-31 17:45:55 +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	6363c33790	detect actual address type for domain address type	2017-02-22 10:24:04 +01:00
Darien Raymond	e480091388	smart error propagation	2017-02-21 23:14:07 +01:00
Darien Raymond	0f71305ee1	refine log message	2017-02-21 22:15:20 +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