442 Commits

Author	SHA1	Message	Date
Darien Raymond	723207158f	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-01-04 11:10:52 +01:00
Darien Raymond	c4e2d99859	refine socks tcp handling	2017-01-04 00:43:13 +01:00
Darien Raymond	31d6e74482	remove rawtcp	2017-01-03 14:53:59 +01:00
Darien Raymond	c9a421fba6	remove generate package comments in .pb.go files.	2017-01-03 14:17:44 +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	f6aa7a0053	fix usage of ray stream.	2016-12-30 00:51:39 +01:00
Darien Raymond	609dbc1f13	task engine for all proxies	2016-12-30 00:32:20 +01:00
Darien Raymond	7c751fcca0	common.Must	2016-12-28 00:53:29 +01:00
Darien Raymond	c347e50c28	rename cached to buffered	2016-12-27 21:41:44 +01:00
Darien Raymond	a4dfca0ef7	accommodate protobuf compiler change	2016-12-23 12:42:25 +01:00
Darien Raymond	7dc7937443	rename ws to websocket	2016-12-23 00:30:46 +01:00
Darien Raymond	eb782436b3	proto option for C# namespace	2016-12-23 00:24:28 +01:00
Darien Raymond	3e73e66adb	remove unused code	2016-12-21 16:38:57 +01:00
Darien Raymond	3a6f66d177	remove unused code	2016-12-21 16:00:16 +01:00
Darien Raymond	c3942fd5f0	fix lint warnings	2016-12-21 15:48:39 +01:00
Darien Raymond	ceaf5d1178	fix lint warnings	2016-12-21 15:37:16 +01:00
Darien Raymond	1ab02e0a6b	refactor proxy registry	2016-12-15 15:46:20 +01:00
Darien Raymond	c693867603	include base error	2016-12-15 15:36:50 +01:00
Darien Raymond	50bc195f7f	rename TypedSettings to TypedMessage	2016-12-15 11:51:09 +01:00
Darien Raymond	5bbbdc05de	errors.Format	2016-12-15 11:05:32 +01:00
Darien Raymond	eee23e6718	fix api usage	2016-12-11 21:43:16 +01:00
Darien Raymond	1948d0738f	refactor io package	2016-12-09 13:17:34 +01:00
Darien Raymond	055023fdd5	refactor buffer	2016-12-09 12:08:25 +01:00
Darien Raymond	7a80409e30	rename alloc to buf	2016-12-09 11:35:27 +01:00
Darien Raymond	a3cb770f77	clean up errors	2016-12-09 00:11:05 +01:00
Darien Raymond	8c8f0a53fd	rewrite alloc.buffer	2016-12-06 11:03:42 +01:00
Darien Raymond	186bf1f141	FillFullFrom	2016-12-05 17:05:47 +01:00
Darien Raymond	cf3eb0e77d	refine buffer usage	2016-12-05 15:19:14 +01:00
Darien Raymond	efb24a4d21	rewrite error lib	2016-12-04 09:10:47 +01:00
Darien Raymond	f95c322677	rename 'this'	2016-11-27 21:39:09 +01:00
Darien Raymond	6804d8f73a	better handling error from Pipe()	2016-11-22 00:17:49 +01:00
Darien Raymond	c041740940	remove ErrMissingApplication	2016-11-21 21:13:01 +01:00
Darien Raymond	2078f29142	refine error message	2016-11-19 14:38:13 +01:00
Darien Raymond	3a51157929	fix allow passive connection	2016-11-13 23:08:32 +01:00
Darien Raymond	9471b5b066	refine dispatcher	2016-11-13 14:33:00 +01:00
Darien Raymond	43dacc3936	remove small buffer pool	2016-11-01 12:37:35 +01:00
Darien Raymond	5a311cbe08	json config parser	2016-10-17 14:35:13 +02:00
Darien Raymond	e33b7df34c	remove use of any	2016-10-16 14:22:21 +02:00
Darien Raymond	fc6a706166	refactor protos	2016-10-12 18:43:55 +02:00
Darien Raymond	1d13f47f9c	protobuf for stream settings	2016-10-02 23:43:58 +02:00
Darien Raymond	af6abfa3e3	update proto generated code	2016-09-26 15:14:39 +02:00
Darien Raymond	91f2a40dae	refine proto package names	2016-09-26 15:14:16 +02:00
Darien Raymond	922e761bef	rename server spec user	2016-09-25 22:57:27 +02:00
Darien Raymond	c5f09c64a2	refine socks config	2016-09-25 22:54:18 +02:00
Darien Raymond	7de7588ec2	proto for destination	2016-09-20 11:53:05 +02:00
Darien Raymond	d08cba000f	accounts in protobuf	2016-09-18 00:41:21 +02:00
Darien Raymond	3423adaea4	fix test break	2016-08-29 12:25:16 +02:00
Darien Raymond	7a31e7a0c2	fix test break	2016-08-29 12:23:17 +02:00
Darien Raymond	948f04921d	update socks code for server config	2016-08-28 23:46:50 +02:00
Darien Raymond	ea2c491ade	global proto gen	2016-08-28 23:41:51 +02:00
Darien Raymond	11e310298c	proto for socks server	2016-08-28 23:41:45 +02:00
Darien Raymond	0f74c618de	close input stream early	2016-08-28 12:01:37 +02:00
Darien Raymond	9b72d3cbd7	simplify socks transport	2016-08-28 11:59:03 +02:00
Darien Raymond	cdb4c56546	protobuf for net	2016-08-27 00:04:35 +02:00
Darien Raymond	bbca180dba	try protobuf	2016-08-25 21:55:49 +02:00
v2ray	07a86f549b	unified import path	2016-08-20 20:55:45 +02:00
v2ray	39737f6fc1	merge bad configuration error	2016-08-18 08:21:20 +02:00
v2ray	89a876a6d4	rename proxy/internal to proxy/registry	2016-08-17 23:30:15 +02:00
v2ray	210a32dc12	support udp redirection	2016-08-15 17:44:46 +02:00
v2ray	cc92973daf	fix destination from addr	2016-08-14 23:20:23 +02:00
v2ray	4419f1e3d6	introduce address family in v2net	2016-08-14 18:14:12 +02:00
v2ray	a9d583b92f	connection session	2016-08-14 17:08:01 +02:00
v2ray	bcd27ba36f	option to allow passive connection	2016-08-12 23:37:21 +02:00
v2ray	545fa5b53c	rename errors	2016-08-07 15:32:41 +02:00
v2ray	c42ed62fd5	remove use of small buffer in tests	2016-08-01 22:59:18 +02:00
v2ray	283bafdd4a	remove use of small buffer	2016-08-01 17:47:20 +02:00
v2ray	e6a61930d9	remove use of small buffer	2016-07-29 23:18:58 +02:00
v2ray	b72afc7c35	fix build break	2016-07-26 10:23:02 +02:00
v2ray	6a620d1c6d	socks client config	2016-07-25 23:45:25 +02:00
v2ray	84a7a2ad61	correct initialization in socks server	2016-07-23 11:09:49 +02:00
v2ray	566adec285	allow customized timeout in socks protocol	2016-07-11 15:46:18 +02:00
v2ray	7f661f5215	rename Error to Err	2016-06-27 08:53:35 +02:00
v2ray	67ac925ee7	refactor bytes functions	2016-06-26 22:34:48 +02:00
v2ray	9b6dc6bcea	massive refactoring for kcp	2016-06-14 22:54:08 +02:00
v2ray	09f7e8b61e	meaningful error message	2016-06-11 22:52:37 +02:00
v2ray	e732ba62a6	unified config loader	2016-06-10 22:26:39 +02:00
v2ray	aad10a75d3	typo	2016-06-05 23:37:28 +02:00
v2ray	5eae540e5c	log access in socks and http	2016-06-05 15:02:15 +02:00
v2ray	50ca869929	organize handler metadata	2016-06-04 14:25:13 +02:00
v2ray	a4d76dc394	support using specific address	2016-06-04 00:38:22 +02:00
v2ray	4b92e6b25b	update log	2016-06-03 20:21:46 +02:00
v2ray	b47c1ca609	get rid of annoying firewall warnings	2016-05-29 16:37:52 +02:00
v2ray	fc63f0432c	simplify testing	2016-05-24 21:55:46 +02:00
v2ray	3582b9d869	move net/testing/assert into assert	2016-05-24 15:29:08 +02:00
v2ray	3ded18a75b	initializable apps	2016-05-18 08:12:04 -07:00
v2ray	18d75cb7b4	bug fixes to dns server	2016-05-16 11:53:18 -07:00
v2ray	7d43952690	tcphub now takes tls config as construtor parameter	2016-05-03 00:16:07 +02:00
v2ray	f594f5b606	simplify tcp connection	2016-05-02 23:53:16 +02:00
v2ray	94eab286c0	introduct Connection interface	2016-04-27 23:01:31 +02:00
v2ray	d9d3eac8f7	Fix unkeyed fields	2016-04-26 00:59:44 +02:00
v2ray	26ebd8dde9	refactor	2016-04-26 00:35:42 +02:00
v2ray	991cea01ab	rename SocksServer to Server	2016-04-26 00:33:16 +02:00
v2ray	42907ff2e8	Remove v2net.Packet	2016-04-26 00:13:26 +02:00
v2ray	44bf412dfc	release all adaptive readers and writers	2016-04-18 19:01:24 +02:00
v2ray	7407c8d561	use stream instead of raw chan	2016-04-18 18:44:10 +02:00
v2ray	42b8dbe871	release all readers and writers	2016-04-12 21:56:36 +02:00
v2ray	ef51c600fb	Apply buffered reader and writer to socks	2016-02-27 11:02:42 +01:00
v2ray	45db388e3f	more docs	2016-02-06 18:01:27 +01:00
Darien Raymond	e5d0da0982	wording	2016-02-05 11:45:31 +00:00
Darien Raymond	20147cb0bd	fix test break	2016-02-05 10:48:34 +00:00
Darien Raymond	c618ce543c	use net.ParseAddress in socks udp	2016-02-05 10:23:16 +00:00
Darien Raymond	4d2bcda9cc	test case for socks protocol	2016-02-05 10:21:13 +00:00
v2ray	32b2220739	apply udpHub in socks proxy	2016-02-03 22:43:09 +01:00
v2ray	48aa9af631	remove out dated test	2016-02-01 17:21:31 +01:00
Darien Raymond	0d77139c24	fix udp issue in socks proxy	2016-02-01 15:36:33 +00:00
v2ray	d3ff2b3698	chunk stream in vmess	2016-02-01 12:22:29 +01:00
v2ray	2031c13a7f	refactor app.Space	2016-01-31 17:01:28 +01:00
v2ray	383eb57487	rename CorruptedPacket to ErrorCorruptedPacket	2016-01-30 17:20:30 +01:00
v2ray	1e79a3b75a	rename errors	2016-01-30 12:32:38 +01:00
v2ray	f34e253ea3	Rename errors with Error prefix	2016-01-30 12:23:56 +01:00
Darien Raymond	008c285324	move transport methods from net to io	2016-01-29 13:39:55 +00:00
v2ray	1f9bd5f692	rename TCPListener to TCPHub	2016-01-28 20:47:00 +01:00
Darien Raymond	925c06aeed	rename transport/listener to hub	2016-01-28 16:08:32 +00:00
v2ray	8ae8b3c9f5	custom tcp listener and connection object	2016-01-27 22:11:31 +01:00
v2ray	9ae258de3d	rename	2016-01-25 17:29:26 +01:00
v2ray	d4dcee5fa3	rename InboundConfig methods	2016-01-25 17:23:10 +01:00
v2ray	01ed2fa889	rename RegisterInboundConnectionConfig to RegisterInboundConfig	2016-01-25 17:19:09 +01:00
v2ray	9fe8178e4a	rename InboundConnectionHandler to InboundHandler	2016-01-25 17:18:24 +01:00
v2ray	b0adb24003	handle inbound detour in vmess inbound	2016-01-19 23:41:40 +01:00
v2ray	eec0bb4db4	lazy evaluation of log fields	2016-01-18 12:24:33 +01:00
v2ray	8f20933457	cleanup socks log	2016-01-18 11:43:24 +01:00
v2ray	dde47290d7	completely remove json folder in v2ray	2016-01-17 21:43:10 +01:00
v2ray	5ceac7a6e2	move host from net/json to net	2016-01-15 13:17:04 +01:00
v2ray	e5fa96f814	massive refactoring against json config parsing	2016-01-15 12:43:06 +01:00
Darien Raymond	dc1fbecdfb	remove fuzzing tests	2016-01-12 10:45:38 +00:00
v2ray	5b1854f842	simplify connection handler registration	2016-01-06 16:23:54 +01:00
Darien Raymond	e6ad1d8518	format code	2016-01-04 14:16:52 +00:00
v2ray	4271e619fe	fixes for mutex usage	2016-01-04 08:40:24 +01:00
v2ray	59a5f832f6	fixes for sync logic	2016-01-04 01:19:27 +01:00
v2ray	56c5302367	close method for point server	2016-01-04 00:33:25 +01:00
v2ray	201481a82c	close method for inbound connection handler	2016-01-03 23:30:37 +01:00
v2ray	0780db7999	move connhandler to proxy	2016-01-02 23:32:18 +01:00
v2ray	54ce82fbfa	Move unnecessary functions to internal	2016-01-02 23:08:36 +01:00
v2ray	1c4c9bffad	Move proxy/common/config to proxy/internal/config	2016-01-02 17:40:51 +01:00
v2ray	3baa1f5bc5	interface for inbound connection handler manager	2016-01-01 23:44:11 +01:00
v2ray	34a0cb0b70	move port out of address	2015-12-16 23:53:38 +01:00
Darien Raymond	f0c1695db4	send request without waiting for the first packet.	2015-12-14 14:51:48 +00:00
v2ray	1c5c1a7aef	debug info	2015-12-12 20:57:47 +01:00
v2ray	88851f2bc9	Allow IP address is passed as domain in socks5 protocol	2015-12-12 20:57:39 +01:00
Darien Raymond	dd81fc6f6a	hide space implementations from interfaces	2015-12-11 11:01:20 +00:00
v2ray	092217182a	simplify config directory	2015-12-06 18:21:15 +01:00
v2ray	8bee0c4a7b	cleanup shell/point/config	2015-12-06 16:41:41 +01:00
v2ray	15e6e6d80c	introduce app.Space	2015-12-05 22:55:45 +01:00
v2ray	36b7a3fe07	test case for socks protocol	2015-12-03 23:31:04 +01:00
v2ray	f69b83f3e6	add interface for socks config	2015-12-03 22:41:06 +01:00
Darien Raymond	ae056714db	refactor common/net.Port	2015-12-02 20:44:01 +00:00
Darien Raymond	fa7c1069bc	more update	2015-12-02 16:27:55 +00:00
Darien Raymond	36848af749	leveral serial.String in code	2015-12-02 15:49:34 +00:00
Darien Raymond	3c12469ae5	leverage serial.String in assert	2015-12-02 15:41:19 +00:00
Darien Raymond	7960b97c8e	fix test break	2015-12-02 15:26:11 +00:00
Darien Raymond	0a2e4343bc	massive refactoring against unit test lib	2015-12-02 14:27:18 +00:00
V2Ray	cee85bdf26	Add Port as a type	2015-12-02 12:47:54 +01:00
V2Ray	07582c5b60	Move point to shell	2015-11-29 14:45:32 +01:00
V2Ray	9a88e8696a	format code	2015-11-27 21:57:15 +01:00
V2Ray	4046ee968c	refactor code	2015-11-27 21:50:28 +01:00
V2Ray	b6cebd127d	fuzz test for socks udp	2015-11-10 18:16:13 +01:00
V2Ray	bd48556b98	Smarter reader generator	2015-11-10 12:13:01 +01:00
V2Ray	d34678d9a6	fuzzing test for socks protocol	2015-11-09 23:52:31 +01:00
V2Ray	e60fcba4b3	Test cases for Socks end 2 end.	2015-11-06 13:08:20 +01:00
V2Ray	1d4b541d2f	Move mock config to app/config	2015-11-04 23:01:04 +01:00
V2Ray	8204c9923d	typo	2015-11-04 17:57:11 +01:00
V2Ray	0d06561b7e	More test case	2015-11-03 22:27:26 +01:00
V2Ray	c144e77eb3	Refactor socks config	2015-11-03 22:23:50 +01:00
V2Ray	654cdf18d9	Refactor socks json config	2015-11-03 22:09:07 +01:00
V2Ray	6faff6d514	test case for socks udp protocol	2015-11-03 18:33:58 +01:00
V2Ray	d9ebd008d3	Check lenth of the udp packet before parsing	2015-11-03 18:20:28 +01:00
V2Ray	f080f36372	format code	2015-11-03 00:07:19 +01:00
V2Ray	1edd0e660e	Remove redunent code	2015-11-02 23:55:10 +01:00
V2Ray	8fbb9762db	typo	2015-11-02 23:54:11 +01:00
V2Ray	1a4405dbe1	Remove redunent code	2015-11-02 23:52:22 +01:00
V2Ray	f2cf4a1f89	Test case for too-short request	2015-11-02 23:48:47 +01:00
V2Ray	03b8c8f9e8	Port picker	2015-11-01 21:32:08 +01:00
V2Ray	192960b711	Move mocked connection handlers to proxy/testing/mocks	2015-11-01 21:15:08 +01:00
V2Ray	2b45e63607	Move config cache to proxy/common	2015-10-30 22:42:24 +01:00
V2Ray	f93b29993b	Move connection handler interfaces to proxy/common/connhandler	2015-10-30 00:11:29 +01:00
V2Ray	361a22d74d	Move proxy errors to proxy/common/errors	2015-10-29 23:59:57 +01:00
Claire Raymond	f10f08c87d	add retry on socks and vmess inbound	2015-10-15 11:42:43 +00:00
V2Ray	4bc91b0215	Fix test	2015-10-14 14:56:11 +02:00
V2Ray	890d185979	Cleanup root directory	2015-10-14 14:51:19 +02:00
V2Ray	1b80a1a85a	Handle multiple UDP packets in socks.	2015-10-14 09:56:04 +02:00
V2Ray	99671a173f	Customize UDP server address	2015-10-14 00:04:49 +02:00
V2Ray	3c259b7069	Remove unused const	2015-10-13 23:55:54 +02:00
V2Ray	4ac3eab385	format code	2015-10-13 22:00:12 +02:00
V2Ray	8c5865d4e7	Lazy initialize of socks5 response	2015-10-13 22:00:03 +02:00
V2Ray	7cc8d90f26	test case for wrong auth method	2015-10-13 21:55:12 +02:00
V2Ray	dc7d4a2309	Test case for wrong user account in socks5	2015-10-13 21:29:27 +02:00
V2Ray	1d40220d31	Remove error defination	2015-10-13 13:55:06 +02:00
V2Ray	bc6174d4b5	Continue to work even if failed to accept connection	2015-10-11 22:44:48 +02:00
V2Ray	95b44f2160	Clear buffer for UDP response.	2015-10-11 15:18:35 +02:00
V2Ray	5cee727308	Fix socks authentication	2015-10-10 22:31:25 +02:00
V2Ray	32ab3dcd61	typo	2015-10-10 17:30:37 +02:00
V2Ray	578ede2538	release buffer after using	2015-10-10 17:01:05 +02:00
V2Ray	213aa2ecf0	Socks supports multiple accounts	2015-10-10 15:51:35 +02:00
V2Ray	936fd03c30	format code	2015-10-08 23:29:06 +02:00
V2Ray	ebb4f5b7bd	udp	2015-10-08 23:28:51 +02:00
V2Ray	746580d566	Use buffer in socks proxy	2015-10-08 23:06:12 +02:00
V2Ray	3cb1951dfc	Use []byte in pool instead of buffer	2015-10-08 17:41:38 +02:00
V2Ray	9ee73c4f6b	Maintain an internal buffer pool to accelerate allocation	2015-10-08 14:46:18 +02:00
V2Ray	e7daa4c21c	Add size parameter to transport.ReadFrom	2015-10-07 21:17:11 +02:00
V2Ray	3ba9ee73b9	Increase reading timeout in favor of long connection	2015-10-07 15:24:34 +02:00
V2Ray	72b4eeba8b	Simpilify configuration files	2015-10-06 23:11:08 +02:00
V2Ray	78daf8a879	format code	2015-10-06 17:24:57 +02:00
V2Ray	7a24dc3e09	Fix for domain address	2015-10-06 17:24:39 +02:00
V2Ray	bbf80541b1	Fix UDP address	2015-10-06 16:44:09 +02:00
V2Ray	af8baa144d	Update socks implementation	2015-10-06 11:57:26 +02:00
V2Ray	fe6e139e74	Add warning for fragmented packets	2015-10-06 09:37:51 +02:00
V2Ray	798011b140	Revert	2015-10-06 09:33:37 +02:00
V2Ray	28386b077b	Fix UDP addr	2015-10-06 00:02:28 +02:00
V2Ray	4aba285a99	format code	2015-10-05 17:09:57 +02:00
V2Ray	f7e165c114	compatibility	2015-10-05 17:09:44 +02:00
V2Ray	0be00a1c52	Fix socks test	2015-10-05 17:03:26 +02:00
V2Ray	0677013455	format code	2015-10-05 16:59:56 +02:00
V2Ray	38e64bf2ce	typo	2015-10-05 16:59:46 +02:00
V2Ray	9b12ee2eb3	format code	2015-10-05 16:58:14 +02:00
V2Ray	eb94f7a51c	Fix Socks UDP implementation	2015-10-05 16:57:50 +02:00
V2Ray	1d1708ea3c	lazy init of socks5 response	2015-10-04 16:53:50 +02:00
V2Ray	59a6e1cef8	test case for socks udp	2015-10-04 00:44:27 +02:00
V2Ray	838cb8950a	Enable UDP in Socks proxy	2015-10-04 00:21:06 +02:00
V2Ray	ddad439614	Refactor socks request handling	2015-10-03 21:42:03 +02:00
V2Ray	5c4b149d48	UDP support	2015-10-03 11:34:01 +02:00
V2Ray	76563cb7c7	simplify udp handling	2015-10-02 15:32:26 +02:00
V2Ray	365baa0c6a	Lazy initialization of UDP ports map	2015-09-30 21:31:05 +02:00
V2Ray	c097e6a3c6	Print release date in version command	2015-09-29 11:52:34 +02:00
V2Ray	544b99b1a6	dispatch udp response	2015-09-28 21:32:07 +02:00
V2Ray	ba3f6108b8	assign port token for a udp packet	2015-09-28 14:57:43 +02:00
V2Ray	13e595e4cb	Move socks config into a sparate folder	2015-09-25 21:00:51 +02:00
V2Ray	3747e45978	test cases for socks4	2015-09-25 20:48:55 +02:00
V2Ray	d77ba76ccf	Update error handling in socks proxy	2015-09-25 17:59:45 +02:00
V2Ray	08f85fc9b7	Unify error checking by introducing error codes	2015-09-25 00:17:44 +02:00
V2Ray	fc14b9346c	Remove keepalive settings	2015-09-24 15:10:02 +02:00
V2Ray	a78dbe7133	Close connection more aggressively.	2015-09-24 14:51:19 +02:00
V2Ray	bb442b4f83	Fix usage of Mutex	2015-09-23 17:13:50 +02:00
V2Ray	3fbae6795a	Switch to Mutex for better readability	2015-09-23 14:14:53 +02:00
V2Ray	019d8266bc	Basic implementation of socks udp listener.	2015-09-22 23:50:05 +02:00
V2Ray	f30841019d	simplify code	2015-09-22 18:31:06 +02:00
V2Ray	4874cd54a4	Introduce Packet to unify TCP and UDP communication	2015-09-22 14:45:03 +02:00
V2Ray	e57089637a	udp packet format in socks5	2015-09-21 20:56:07 +02:00
V2Ray	cb16047cf0	prefer interface over struct	2015-09-20 18:22:29 +02:00
V2Ray	b319704282	Add network type to destination to be ready for UDP connection	2015-09-20 16:03:12 +02:00
V2Ray	a887fd01b8	Move log into common	2015-09-20 00:50:21 +02:00
V2Ray	075753c030	Massive refactoring for better code structure	2015-09-19 23:54:36 +02:00