55 Commits

Author	SHA1	Message	Date
Darien Raymond	74ad6eaff9	test case for socks json config	2017-01-08 22:07:44 +01:00
Darien Raymond	24a8ad6dcf	enable socks outbound	2017-01-08 01:25:35 +01:00
Darien Raymond	723207158f	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-01-04 11:10:52 +01:00
Darien Raymond	588c43f291	kcp header as wechat video	2017-01-03 22:46:22 +01:00
Darien Raymond	31d6e74482	remove rawtcp	2017-01-03 14:53:59 +01:00
Darien Raymond	1e5061f15e	fix #351	2017-01-03 01:37:27 +01:00
Darien Raymond	7dc7937443	rename ws to websocket	2016-12-23 00:30:46 +01:00
Darien Raymond	25533412db	comments	2016-12-21 21:43:00 +01:00
Darien Raymond	09c0fa558a	comments	2016-12-15 15:55:31 +01:00
Darien Raymond	4e3ed19308	fix parser for escape	2016-12-15 15:53:23 +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	49202930ff	bug fix	2016-12-15 00:00:44 +01:00
Darien Raymond	b469dea315	json reader that allows comments	2016-12-14 23:51:03 +01:00
Darien Raymond	3b5a791ae8	simplify IPOrDomain construction	2016-12-14 23:04:02 +01:00
Darien Raymond	d6a6e0aaf8	send back http response on error	2016-12-14 12:25:22 +01:00
Darien Raymond	a11d2ce9d6	support server name override	2016-12-11 23:58:37 +01:00
Darien Raymond	d0b301594d	support security = "auto"	2016-12-11 14:58:53 +01:00
Darien Raymond	0b16486fce	Fix TLS type	2016-12-09 13:42:06 +01:00
Darien Raymond	0917866f38	refine kcp header and security	2016-12-08 16:27:41 +01:00
Darien Raymond	a6e25b3f67	security options in vmess	2016-12-07 21:43:41 +01:00
Darien Raymond	e46bad3f18	format errors	2016-12-04 09:43:33 +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	d00f8eef56	remove use of 'v' as a variable name	2016-11-27 17:01:44 +01:00
Darien Raymond	470e35849f	Server side OTA settings in shadowsocks	2016-11-25 16:46:59 +01:00
Darien Raymond	03d8c33fd1	tag for default inbound and outbound	2016-11-17 23:23:46 +01:00
Darien Raymond	fc81b0aae2	config for inbound tag routing	2016-11-13 21:23:34 +01:00
Darien Raymond	5dc05d6352	allow outbound to be proxied	2016-11-10 23:41:28 +01:00
Darien Raymond	2e0d54fd4c	fix routing config on source IP	2016-11-09 10:56:15 +01:00
Darien Raymond	9f68062d48	refine http header parsing	2016-11-06 15:48:25 +01:00
Darien Raymond	edc5bbbb72	add more default headers	2016-11-06 13:55:06 +01:00
Darien Raymond	66e8090d3a	update http header	2016-11-06 13:38:32 +01:00
Darien Raymond	805bbe5fe4	default user agent strings	2016-11-06 00:42:54 +01:00
Darien Raymond	31be091a55	simplify http header parsing	2016-11-05 15:14:55 +01:00
Darien Raymond	d2263a452d	update http header json config	2016-11-05 01:28:15 +01:00
Darien Raymond	dfc03ff939	support noop connection auth	2016-11-05 01:15:32 +01:00
Darien Raymond	c84629c374	add shadowsocks in json config	2016-11-05 01:01:30 +01:00
Darien Raymond	817cc8d82e	fix shadowsocks conf	2016-11-05 01:01:07 +01:00
Darien Raymond	80312627c4	fix typo	2016-11-04 10:49:43 +01:00
Darien Raymond	3d167a6855	json config for http header	2016-11-04 10:49:18 +01:00
Darien Raymond	9d2407f4e4	fix test break	2016-11-02 16:41:02 +01:00
Darien Raymond	de4836c720	refine ota settings in conf	2016-11-02 16:21:20 +01:00
Darien Raymond	5e1c6fe816	bug fix	2016-10-31 16:46:47 +01:00
Darien Raymond	a54c39b4ac	config for shadowsocks	2016-10-31 16:46:15 +01:00
Darien Raymond	c221802963	shadowsocks client	2016-10-31 16:35:18 +01:00
Darien Raymond	59fa064cae	default log settings	2016-10-24 15:08:06 +02:00
Darien Raymond	a7ef82ffbc	fix test break	2016-10-19 12:01:11 +02:00
Darien Raymond	ca980f5718	json conf for source session in router	2016-10-18 23:14:48 +02:00
Darien Raymond	f37b04a690	per connection stream settings	2016-10-18 21:57:40 +02:00