693 Commits

Author	SHA1	Message	Date
Darien Raymond	f87d7f36f5	check nil settings	2016-10-14 21:19:45 +02:00
Darien Raymond	b060bb3b94	refactor proxy config cache	2016-10-13 11:14:24 +02:00
Darien Raymond	fc6a706166	refactor protos	2016-10-12 18:43:55 +02:00
Darien Raymond	22ef12a456	simplify router	2016-10-12 16:11:13 +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	c6a7389817	refine cipher settings	2016-09-25 22:19:49 +02:00
Darien Raymond	ce5bc72f0c	refine shadowsocks proto	2016-09-25 22:07:32 +02:00
Darien Raymond	5e9017720e	check nil	2016-09-24 23:36:26 +02:00
Darien Raymond	24e575f2cd	protobuf for vmess	2016-09-24 23:11:58 +02:00
Darien Raymond	60f4292882	protobuf for dokodemo config	2016-09-22 16:49:20 +02:00
Darien Raymond	dc6b7e2e75	protobuf for blackhole config	2016-09-22 12:01:36 +02:00
Darien Raymond	1a3f51ade7	protobuf for kcp config	2016-09-21 14:39:07 +02:00
Darien Raymond	8f6a972970	refactor config cache	2016-09-21 13:52:16 +02:00
Darien Raymond	d38e62932d	proto for dns config	2016-09-20 16:05:35 +02:00
Darien Raymond	7de7588ec2	proto for destination	2016-09-20 11:53:05 +02:00
Darien Raymond	c518726910	network proto	2016-09-20 10:44:44 +02:00
Darien Raymond	9ade07db03	remove IsTCP() and IsUDP()	2016-09-19 16:39:11 +02:00
Darien Raymond	8b37edd02d	format log	2016-09-18 00:46:16 +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	7f2ba0d106	remove unnecessary code	2016-08-28 23:47:39 +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
Darien Raymond	e6e0419958	format private annotation	2016-08-24 11:17:42 +02:00
v2ray	07a86f549b	unified import path	2016-08-20 20:55:45 +02:00
v2ray	2268f3d1bc	remove import path restriction	2016-08-19 17:05:15 +02:00
v2ray	ad1353ac2f	merge similar error definitions	2016-08-18 08:34:21 +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	99821dc2fb	change to wait group	2016-08-16 17:00:04 +02:00
v2ray	125ef8372c	actually follow redirect of UDP	2016-08-16 13:04:07 +02:00
v2ray	d025b8d48f	fix test break	2016-08-15 23:02:03 +02:00
v2ray	a5a70afdb8	remove port testing	2016-08-15 22:12:11 +02:00
Darien Raymond	667b71aad0	Merge pull request #238 from xiaokangwang/websocket ... Websocket transport support for v2ray	2016-08-15 17:45:25 +02:00
v2ray	210a32dc12	support udp redirection	2016-08-15 17:44:46 +02:00
v2ray	956b47f6ae	release connection after all data read in freedom	2016-08-15 14:31:46 +02:00
v2ray	66bb7879e0	handle empty payload in freedom and outbound	2016-08-15 12:23:35 +02:00
Shelikhoo	7259b3363b	Merge branch 'master' into websockwt	2016-08-15 10:17:22 +08:00
v2ray	cc92973daf	fix destination from addr	2016-08-14 23:20:23 +02:00
v2ray	07dee80f54	update server	2016-08-14 22:08: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
Shelikhoo	508f79f95f	Advertise WS cap	2016-08-13 21:33:34 +08:00
v2ray	bcd27ba36f	option to allow passive connection	2016-08-12 23:37:21 +02:00
v2ray	9e997a5be7	typo	2016-08-09 23:17:02 +02:00
v2ray	c6ad190f0a	add json tag	2016-08-08 23:53:07 +02:00
v2ray	545fa5b53c	rename errors	2016-08-07 15:32:41 +02:00
v2ray	0d73726930	srtp header for kcp	2016-08-06 21:59:22 +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	443e9d4725	fix a bug in vmess encoding	2016-07-27 16:36:46 +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	2034d54bab	rename VMessAccount to vmess.Account	2016-07-25 17:36:24 +02:00
v2ray	2049759640	use server spec in vmess	2016-07-25 16:48:09 +02:00
v2ray	0857fdb0f8	test code for blackhole config	2016-07-24 13:40:27 +02:00
v2ray	f871ca63e2	refine error message	2016-07-24 11:29:59 +02:00
v2ray	96ec5cfc58	Fix VMess inbound for empty response	2016-07-24 09:59:52 +02:00
v2ray	6f5b54747e	move encoding to vmess	2016-07-23 13:17:51 +02:00
v2ray	3be5045dfc	replace NewSmallBuffer with NewLocalBuffer	2016-07-23 11:55:57 +02:00
v2ray	84a7a2ad61	correct initialization in socks server	2016-07-23 11:09:49 +02:00
v2ray	85d6e1ad13	prepend hash	2016-07-17 23:11:05 +02:00
v2ray	3f396078ab	remove unnecessary buffer	2016-07-16 13:22:34 +02:00
v2ray	fc69c77369	fix an offset issue in OTA	2016-07-13 11:38:14 +02:00
v2ray	e13ea7a54f	refine log in vmess	2016-07-12 00:12:35 +02:00
v2ray	566adec285	allow customized timeout in socks protocol	2016-07-11 15:46:18 +02:00
v2ray	30041041d3	timeout settings in http proxy	2016-07-10 15:34:14 +02:00
v2ray	754e8b6e78	tls config	2016-07-10 15:27:58 +02:00
v2ray	d5cb2e88c9	Fix Shadowsocks OTA	2016-07-04 09:47:14 +02:00
v2ray	2c259165ff	read entire small payload	2016-07-03 22:32:28 +02:00
v2ray	54b791821e	remove unnecessary log	2016-07-03 09:40:22 +02:00
v2ray	7aa848dc02	remove unused import	2016-06-30 10:47:33 +02:00
v2ray	f050113925	fix #185	2016-06-30 00:08:20 +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	560b429902	Update log	2016-06-19 02:02:38 +02:00
v2ray	20f046af0b	fix a race condition issue in VMess inbound	2016-06-18 17:01:48 +02:00
v2ray	71ce8f4416	enable kcp	2016-06-14 23:00:00 +02:00
v2ray	9b6dc6bcea	massive refactoring for kcp	2016-06-14 22:54:08 +02:00
Darien Raymond	22ce652a25	Merge pull request #170 from xiaokangwang/kcptransport ... Add KCP(UDPSession) as a transport for v2ray, reslove #162	2016-06-13 16:35:57 +02:00
v2ray	8a5f37dad7	check if address is set	2016-06-12 22:54:33 +02:00
Shelikhoo	e72a7cb96f	KCP: VMess will call setProxyCap to advertise KCP capacity on init	2016-06-12 13:57:08 +08:00
Shelikhoo	29cb680a4b	KCP: VMess will advertise its KCP capacity	2016-06-12 13:52:29 +08:00
Shelikhoo	6d6158b089	KCP: Vmess will pass its meta to Dial3 and ListenTCP6	2016-06-12 13:48:40 +08:00
Shelikhoo	a9ef8d27bd	Merged latest master	2016-06-12 12:58:20 +08:00
Shelikhoo	8666d122f0	InboundHandlerMeta,OutboundHandlerMeta added KcpSupported bool to declare KCP support	2016-06-12 12:46:26 +08:00
v2ray	679d646571	only build for linux	2016-06-12 01:35:40 +02:00
v2ray	1c06fc216a	allow redirection in dokodemo	2016-06-12 01:30:56 +02:00
v2ray	09f7e8b61e	meaningful error message	2016-06-11 22:52:37 +02:00
v2ray	d9b59133cc	Properly close inbound when no payload	2016-06-11 01:37:33 +02:00
v2ray	8a83a0b30e	typo	2016-06-11 01:32:55 +02:00
v2ray	9c3f2ada47	update default response	2016-06-10 23:09:14 +02:00
v2ray	8b3875050d	http response in blackhole	2016-06-10 23:01:17 +02:00
v2ray	e732ba62a6	unified config loader	2016-06-10 22:26:39 +02:00
Darien Raymond	3f7b70a465	Merge pull request #168 from xiaokangwang/fix.internal.CreateOutboundHandler.ErrorProxyNotFound ... Fixed: internal.CreateOutboundHandler should return ErrorProxyNotFound if !found instead of ErrorNameExists	2016-06-09 11:03:18 +02:00
Shelikhoo	3b1f8b553b	Fixed: internal.CreateOutboundHandler should return ErrorProxyNotFound if !found instead of ErrorNameExists	2016-06-09 09:38:44 +08:00
v2ray	83c7e8491c	fix conn reuse	2016-06-06 01:20:20 +02:00
v2ray	e878973def	retry if vmess conn fails	2016-06-06 00:10:51 +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	6c31ff91e6	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2016-06-03 20:21:53 +02:00
v2ray	4b92e6b25b	update log	2016-06-03 20:21:46 +02:00
Darien Raymond	a2d8d55ba1	Update io_test.go	2016-06-03 11:40:50 +02:00
v2ray	0a7deabd46	remove unnecessary log	2016-06-02 23:23:04 +02:00
v2ray	47338fba1e	timeout setting for freedom	2016-06-02 23:18:44 +02:00
v2ray	72fb5a256c	send reuse option in header	2016-06-02 21:34:25 +02:00
v2ray	b9c88b673b	unexpected eof	2016-06-02 21:20:58 +02:00
v2ray	dfe1ac1f2b	Fix connection reuse	2016-06-02 02:20:53 +02:00
v2ray	6ce7b1d532	informational logs	2016-06-02 00:57:08 +02:00
v2ray	9713bf9adf	completely fix detour config	2016-06-01 22:45:12 +02:00
v2ray	957eaf38db	Assign detour config	2016-06-01 22:33:45 +02:00
v2ray	43f6998d31	discard bad connections	2016-06-01 22:09:34 +02:00
v2ray	0fac2084c7	reusable connection	2016-05-31 00:21:41 +02:00
v2ray	9b07ffd68f	cleanup http proxy package	2016-05-29 16:46:31 +02:00
v2ray	b47c1ca609	get rid of annoying firewall warnings	2016-05-29 16:37:52 +02:00
v2ray	3f9cb1136a	allow dynamic type of user accounts	2016-05-28 13:44:11 +02:00
v2ray	46f76e55e5	reorg chan reader	2016-05-25 22:36:52 +02:00
v2ray	81cdaa0e4e	Unify buffer allocation	2016-05-25 22:05:47 +02:00
v2ray	3156c4586c	Allow data stream passing through http proxy	2016-05-25 09:32:26 +02:00
v2ray	c75d840706	Remove serial.String	2016-05-24 22:41:51 +02:00
v2ray	444808a51a	Remove Intxx interfaces	2016-05-24 22:15:46 +02:00
v2ray	ab39750ceb	Remove serial.Bytes	2016-05-24 22:09:22 +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	50957b9973	Fix build break	2016-05-23 20:25:24 +02:00
v2ray	47b2fafb32	Shorten StringLiteral	2016-05-23 20:23:40 +02:00
v2ray	cfdda19834	Shorten BytesLiteral	2016-05-23 20:21:23 +02:00
v2ray	5b23d25e35	address	2016-05-23 20:16:36 +02:00
v2ray	0ea2678e72	Allow freedom to consume DNS settings	2016-05-22 22:30:21 +02:00
v2ray	ec610494ea	Fix dokodemo for space	2016-05-22 19:32:37 +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	3b545abe02	dns client implementation	2016-05-15 23:09:28 -07:00
v2ray	634c4964cc	Massive fixes	2016-05-12 17:20:07 -07:00
v2ray	9a3c7a03c9	rename shadowsocks server	2016-05-12 10:42:08 -07:00
v2ray	ff210aa67f	agressively close stream	2016-05-09 08:23:31 -07:00
v2ray	b5f43031d4	refactor alter id generation	2016-05-07 21:07:46 +02:00
v2ray	8a07534586	remove unnecessary package alias	2016-05-07 20:26:29 +02:00
v2ray	ef200c3c5e	http client	2016-05-07 14:08:27 +02:00
v2ray	f2c656843e	allow tls connection in http proxy	2016-05-07 10:36:36 +02:00
v2ray	b65017d28d	Fix build break	2016-05-07 10:06:56 +02:00
v2ray	301b0ccff7	refine cert config in http	2016-05-07 10:06:12 +02:00
v2ray	67db5830be	agreesively close rays	2016-05-07 09:53:15 +02:00
v2ray	8d1f06ebaf	clean up on error	2016-05-07 00:19:06 +02:00
v2ray	0bc846f016	Fix ending in vmess reader.	2016-05-05 00:24:18 +02:00
v2ray	a7f61af79b	fix auth reader	2016-05-04 23:41:24 +02:00
v2ray	c20c44526c	Fix buffer overrun in vmess	2016-05-03 14:57:09 +02: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	36bf645199	Fix a dead lock issue in VMess	2016-05-02 14:03:31 +02:00
v2ray	0442000964	fix nil reference issue in shadowsocks	2016-05-02 09:38:50 +02:00
v2ray	c11ddace15	fix a buffer bug	2016-05-01 20:14:57 +02:00
v2ray	b453288e04	release shadowsocks request	2016-05-01 17:18:02 +02:00
v2ray	58530e6920	force chunked stream	2016-04-28 21:14:00 +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	a7f40da07a	Fix unused variables	2016-04-26 00:46:04 +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	7db14dad9b	releasble user validator	2016-04-25 18:39:30 +02:00
v2ray	c044234e4a	tls settings for http proxy	2016-04-25 15:30:28 +02:00
v2ray	6486891b18	comments	2016-04-24 22:54:41 +02:00
v2ray	9e1d0d8c5e	update detour config settings	2016-04-24 22:40:43 +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	70f803173a	simplify reader/writer interface	2016-04-12 21:43:13 +02:00
v2ray	e8023f0d92	releasable writer	2016-03-24 23:36:18 +08:00
v2ray	77ecd1649b	fix test break	2016-03-13 11:34:09 +01:00
v2ray	ff69ac7a0e	Release all references	2016-03-11 23:51:58 +01:00
v2ray	3b35df1244	Handler state	2016-03-06 16:36:08 +01:00
v2ray	7f2b157956	Fix OTA in Shadowsocks TCP	2016-02-28 21:11:50 +01:00
v2ray	684e133ac5	better log	2016-02-28 21:02:03 +01:00
v2ray	e298121126	Fix shadowsocks OTA issue	2016-02-28 21:00:53 +01:00
v2ray	3d4da5822b	Email in shadowsocks	2016-02-28 14:50:30 +01:00
v2ray	c1c22a50d5	remove old commands	2016-02-27 22:41:57 +01:00
v2ray	3ec40eedc1	remove old vmess request	2016-02-27 22:37:22 +01:00
v2ray	547cc75651	Migrate VMessIn with protocol	2016-02-27 17:28:21 +01:00
v2ray	2144c47102	Migrate VMessOut into protocol	2016-02-27 16:41:21 +01:00
v2ray	ef51c600fb	Apply buffered reader and writer to socks	2016-02-27 11:02:42 +01:00
v2ray	76ca9de25f	refactor protocol	2016-02-25 21:50:10 +01:00
v2ray	59bc881d70	move timestamp generator to protocol	2016-02-25 17:14:49 +01:00
v2ray	f0081f5327	remove unused code	2016-02-25 16:58:54 +01:00
v2ray	791ac307a2	Move userset to protocol	2016-02-25 16:40:43 +01:00
v2ray	9f50692d15	auto user creation for dynamic port	2016-02-25 14:38:41 +01:00
v2ray	87b15b2b20	Add ChaCha20 in Shadowsocks	2016-02-23 18:16:13 +01:00