637 Commits

Author	SHA1	Message	Date
Darien Raymond	38014efdee	refactor websocket	2017-02-16 17:13:20 +01:00
Darien Raymond	935620104d	refactor websocket	2017-02-16 16:53:31 +01:00
Darien Raymond	48eb40ff39	dice.RandomUint16	2017-02-14 22:29:44 +01:00
Darien Raymond	8d6a4d0a8a	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-02-14 10:13:13 +01:00
Darien Raymond	9ca520893b	comments	2017-02-14 09:26:17 +01:00
Darien Raymond	520e3ea9e6	signal.semaphore	2017-02-13 23:29:34 +01:00
Darien Raymond	90200fbecb	remove signal.Once	2017-02-13 23:12:27 +01:00
Darien Raymond	48639ddb98	fix a bug in udp hub	2017-02-13 23:03:36 +01:00
Darien Raymond	5040817a7b	apply contex in udp hub	2017-02-13 22:39:50 +01:00
Darien Raymond	237ccf505c	Merge branch 'master' of https://github.com/v2ray/v2ray-core	2017-02-10 17:19:16 +01:00
Darien Raymond	5ccc915f8f	typo	2017-02-10 16:50:45 +01:00
Darien Raymond	6888093197	gofmt	2017-02-10 16:42:24 +01:00
Darien Raymond	2ba59428c9	remove lock in websocket connection	2017-02-10 16:41:54 +01:00
Darien Raymond	cfcf16feed	fix typo	2017-02-10 11:57:59 +01:00
Darien Raymond	1aeab3dd96	normalized path in websocket	2017-02-10 11:47:53 +01:00
Darien Raymond	5e7fb6d0dd	refine error handling in retry logic	2017-02-10 11:41:50 +01:00
Darien Raymond	d270a99d4f	simplify code	2017-02-09 12:31:40 +01:00
Darien Raymond	0d68293ef8	fix test break	2017-02-09 12:31:26 +01:00
Darien Raymond	cdb0b94046	cleanup websocket code	2017-02-09 11:42:17 +01:00
Darien Raymond	5ec3fe093d	fix test break	2017-02-08 19:00:13 +01:00
Darien Raymond	3be6c72211	cleanup websocket code	2017-02-08 18:30:16 +01:00
Darien Raymond	6bcce77afb	fix import	2017-02-07 23:33:40 +01:00
Darien Raymond	3643dc37e0	refine kcp output	2017-02-07 00:38:46 +01:00
Darien Raymond	ce34a25e66	fix build break	2017-02-06 13:49:03 +01:00
Darien Raymond	e665de182d	dispatcher test	2017-02-04 23:40:10 +01:00
Darien Raymond	9978cf07e6	fix udp dispatcher	2017-02-04 21:55:59 +01:00
Darien Raymond	b5d14b6823	update java options	2017-02-03 23:15:10 +01:00
Darien Raymond	c4d0227977	simplify dialer and dispatcher parameters	2017-02-03 22:35:09 +01:00
Darien Raymond	f046f334cd	move common/log to app/log	2017-02-01 21:35:40 +01:00
Darien Raymond	9139a87865	closw conn in the same routine	2017-01-28 16:28:18 +01:00
Darien Raymond	18e1ca85aa	rename udp.Server	2017-01-27 14:45:16 +01:00
Darien Raymond	55fb18b6e1	reduce websocket buffer size	2017-01-27 13:50:38 +01:00
Darien Raymond	ea728d5112	update	2017-01-26 23:51:06 +01:00
Darien Raymond	fcd34014bb	fix java class name	2017-01-26 23:41:48 +01:00
Darien Raymond	d2764d8776	fix test break	2017-01-26 20:55:01 +01:00
Darien Raymond	ca721230e1	split listening settings from inbound proxies and apply context	2017-01-26 20:46:44 +01:00
Darien Raymond	6eff0acc0b	rename transportsettings to transportconfig	2017-01-16 14:18:33 +01:00
Darien Raymond	8b00d6fc30	clean imports	2017-01-14 00:27:45 +01:00
Darien Raymond	0a91893a26	handle IPv6 address in tproxy	2017-01-13 17:10:07 +01:00
Darien Raymond	f7e1f00c88	rename dispatcher.Interface	2017-01-13 13:53:44 +01:00
Darien Raymond	289c467a12	remove unnecessary code	2017-01-13 13:47:44 +01:00
Darien Raymond	db1c9131f0	global config creator	2017-01-12 22:47:10 +01:00
Darien Raymond	d4c471c967	generate TLS certificate on the fly	2017-01-12 16:10:03 +01:00
Darien Raymond	d24fe9dbfb	separate network and transport protocol	2017-01-12 12:54:34 +01:00
Darien Raymond	72992c7478	able to close ray stream with error	2017-01-10 14:22:42 +01:00
Darien Raymond	f75d94817a	fix #356	2017-01-08 16:01:28 +01:00
Darien Raymond	43cc81e5a8	better locking in udp server	2017-01-06 11:40:59 +01:00
Darien Raymond	5e7e549ec1	comments	2017-01-05 12:14:48 +01:00
Darien Raymond	a8e274f4c4	remove unused code	2017-01-05 12:09:28 +01:00
Darien Raymond	f7721029c7	fix #355	2017-01-04 17:23:41 +01:00
Darien Raymond	4afad8d31c	simpify websocket connection	2017-01-04 15:34:21 +01:00
Darien Raymond	5684beed8c	fix websocket conn reuse	2017-01-04 15:34:11 +01:00
Darien Raymond	e35e271708	cleanup internet connection	2017-01-04 13:29:41 +01:00
Darien Raymond	e678000c44	remove release() pattern	2017-01-04 12:52:24 +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	aefa53f827	refine http header	2017-01-03 23:09:51 +01:00
Darien Raymond	588c43f291	kcp header as wechat video	2017-01-03 22:46:22 +01:00
Darien Raymond	21a15bbf74	registerable dialer and listener	2017-01-03 15:16:48 +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	19e0cb40e9	locker protected connection	2017-01-02 07:43:02 +01:00
Darien Raymond	48bddb25d7	fix lint warnings	2017-01-01 22:12:44 +01:00
Darien Raymond	58ae7e4967	refine proto settings	2017-01-01 21:19:12 +01:00
Darien Raymond	2a52ae9e96	default next protos	2016-12-31 23:22:26 +01:00
Darien Raymond	3cc0783d9c	fix test break	2016-12-30 23:30:35 +01:00
Darien Raymond	a44d556667	test case for tls connection	2016-12-30 23:12:00 +01:00
Darien Raymond	38e4cad8d1	remove unused variable	2016-12-26 16:49:36 +01:00
Darien Raymond	29d62185cf	notify read and write on remote close	2016-12-26 08:22:25 +01:00
Darien Raymond	f1a9647c8a	lint warnings	2016-12-25 00:01:24 +01:00
Darien Raymond	4e224d64c6	Fix #337	2016-12-24 22:04:09 +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	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	cdcccb4590	simplify segment writer	2016-12-20 22:53:58 +01:00
Darien Raymond	bccf11c12c	fix tls over kcp	2016-12-20 13:03:20 +01:00
Darien Raymond	0f0f01ddf6	return error when header too long	2016-12-19 12:16:57 +01:00
Darien Raymond	68164d46f9	limit max http header length	2016-12-16 17:01:47 +01:00
Darien Raymond	b17f06bb4e	test case for http header	2016-12-16 16:52:11 +01:00
Darien Raymond	50bc195f7f	rename TypedSettings to TypedMessage	2016-12-15 11:51:09 +01:00
Darien Raymond	d6a6e0aaf8	send back http response on error	2016-12-14 12:25:22 +01:00
Darien Raymond	42417cab17	fix compile warning	2016-12-12 21:58:13 +01:00
Darien Raymond	a67d525fc2	try fix connection reuse settings	2016-12-12 13:08:31 +01:00
Darien Raymond	a11d2ce9d6	support server name override	2016-12-11 23:58:37 +01:00
Darien Raymond	eee23e6718	fix api usage	2016-12-11 21:43:16 +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	41fcffbfab	fix data input and output signal	2016-12-08 22:50:12 +01:00
Darien Raymond	40249dfacb	change API	2016-12-08 22:49:24 +01:00
Darien Raymond	30d886fd6f	refresh protobuf	2016-12-08 20:59:58 +01:00
Darien Raymond	41258f19fc	comments	2016-12-08 16:37:04 +01:00
Darien Raymond	1431e32d01	comments	2016-12-08 16:32:53 +01:00
Darien Raymond	0917866f38	refine kcp header and security	2016-12-08 16:27:41 +01:00
Darien Raymond	d716d02cd8	correctly handle sending window length	2016-12-07 00:31:01 +01:00
Darien Raymond	8c8f0a53fd	rewrite alloc.buffer	2016-12-06 11:03:42 +01:00
Darien Raymond	4bf8288cc2	remove use of Buffer.Value	2016-12-05 21:33:24 +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	a4019a6900	fast return on zero ack list	2016-12-02 21:40:58 +01:00
Darien Raymond	207c7aa8a7	flush acklist when dirty	2016-12-02 16:49:33 +01:00
Darien Raymond	60697e4e4f	fix test break	2016-12-02 15:10:48 +01:00
Darien Raymond	1186b0e733	fix label name	2016-12-02 00:09:57 +01:00
Darien Raymond	a53808c83b	fix link	2016-12-01 22:22:28 +01:00
Darien Raymond	fa0011c4c9	fix build break	2016-12-01 22:22:20 +01:00
Darien Raymond	eb877fa808	remove unnecessary import	2016-11-30 22:24:59 +01:00
Darien Raymond	3ffef74d75	allocate in advance	2016-11-30 22:24:06 +01:00
Darien Raymond	8b07c39281	update default kcp bandwidth settings	2016-11-30 21:36:40 +01:00
Darien Raymond	31fbb62d0f	add back flush timeout	2016-11-29 17:12:09 +01:00
Darien Raymond	3be9519ed4	send more ack seg	2016-11-29 08:31:19 +01:00
Darien Raymond	2dc74faf19	send more ack numbers if not full	2016-11-28 22:06:32 +01:00
Darien Raymond	5ffabe1148	reduce time spent on kcp test	2016-11-28 22:05:57 +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	b1f78a1ffc	enable conn reuse settings in mkcp	2016-11-27 09:02:27 +01:00
Darien Raymond	d19ee4d408	connection reuse for mkcp	2016-11-27 08:58:31 +01:00
Darien Raymond	b2e084c78c	recycler interface	2016-11-27 08:47:24 +01:00
Darien Raymond	22379e5a6b	refactor connection pool	2016-11-24 23:16:05 +01:00
Darien Raymond	e8cde53975	fix tcp log	2016-11-22 08:23:03 +01:00
Darien Raymond	e0116d3957	fix http read	2016-11-22 00:52:26 +01:00
Darien Raymond	15cb543abb	release memory in kcp connection	2016-11-21 22:41:12 +01:00
Darien Raymond	70c75038a2	small buffer	2016-11-21 22:08:34 +01:00
Darien Raymond	30cd9e929d	add exponential backoff as retry logic	2016-11-20 21:47:51 +01:00
Darien Raymond	d6086e0e9b	remove buggy test case	2016-11-19 22:54:42 +01:00
Darien Raymond	f64c79e239	log	2016-11-19 22:40:06 +01:00
Darien Raymond	ac2f62b239	reduce memory footprint in kcp	2016-11-19 01:49:54 +01:00
Darien Raymond	ed780951aa	save some goroutines	2016-11-19 01:48:38 +01:00
Darien Raymond	292176c57f	simplify udp payload queue	2016-11-19 00:34:30 +01:00
Darien Raymond	1a1383c2ea	simplify random	2016-11-18 21:34:42 +01:00
Darien Raymond	a14795e1e6	optimize udp hub	2016-11-18 21:30:03 +01:00
Darien Raymond	4ee758c4d2	simplify kcp logic	2016-11-18 16:19:13 +01:00
Darien Raymond	ad3f450bce	fix usage of io.EOF	2016-11-17 23:21:44 +01:00
Darien Raymond	e72f8a26c8	min timeout	2016-11-13 22:29:31 +01:00
Darien Raymond	0cd9f5165f	update kcp sending worker	2016-11-13 22:27:58 +01:00
Darien Raymond	9471b5b066	refine dispatcher	2016-11-13 14:33:00 +01:00
Darien Raymond	5dc05d6352	allow outbound to be proxied	2016-11-10 23:41:28 +01:00
Darien Raymond	d343cb1ee6	proxy connection	2016-11-09 00:17:09 +01:00
Darien Raymond	7a09fcdc2f	increase kcp ack frequency	2016-11-08 00:35:14 +01:00
Darien Raymond	b0d009664a	Fix HTTP serialization	2016-11-07 10:47:30 +01:00
Darien Raymond	dc0cbce6e1	optimize pickString	2016-11-06 14:04:44 +01:00
Darien Raymond	66e8090d3a	update http header	2016-11-06 13:38:32 +01:00
Darien Raymond	f108633e2e	ssr compatibility	2016-11-05 01:50:51 +01:00
Darien Raymond	13dde1799d	comments	2016-11-05 01:01:46 +01:00
Darien Raymond	bae0de7d95	test case for http auth	2016-11-04 21:59:19 +01:00
Darien Raymond	010f34c76c	allow single side auth	2016-11-03 23:14:27 +01:00
Darien Raymond	0747203132	refine http header	2016-11-02 22:26:21 +01:00
Darien Raymond	aabb9137e1	remove unused code	2016-11-01 12:34:07 +01:00
Darien Raymond	33d2513e3c	reduce memory allocation in kcp	2016-11-01 12:07:20 +01:00
Darien Raymond	5b58066345	use local buffer in UDP hub	2016-11-01 11:46:34 +01:00
Darien Raymond	d3f323e24b	response factory	2016-11-01 00:42:55 +01:00
Darien Raymond	187688cacb	fix type def	2016-11-01 00:42:44 +01:00
Darien Raymond	72339a3509	fix TCP conn reuse with tls	2016-11-01 00:41:46 +01:00
Darien Raymond	ac3b91a877	http authenticator	2016-10-31 22:26:46 +01:00
Darien Raymond	97dc7b30de	remove test cases depending on external resources	2016-10-24 16:48:16 +02:00
Darien Raymond	e13c97d162	rename IP to CIDR in router	2016-10-18 16:42:22 +02:00
Darien Raymond	2320bc3304	remove unused code	2016-10-18 15:31:48 +02:00
Darien Raymond	751a105324	comments	2016-10-18 15:31:39 +02:00
Darien Raymond	b81d091fb8	comments	2016-10-18 00:09:49 +02:00
Darien Raymond	9bd8822668	unused proto	2016-10-18 00:09:41 +02: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	be026870f7	protogen update	2016-10-16 00:23:27 +02:00
Darien Raymond	d26ee5441e	fix authenticator config	2016-10-12 22:43:17 +02:00
Darien Raymond	ab3173039b	increase ping interval	2016-10-11 21:21:06 +02:00
Darien Raymond	b5910dccae	simplify fast resend	2016-10-11 13:17:57 +02:00
Darien Raymond	f8ad1f4a3e	update predicate syntax	2016-10-11 12:44:17 +02:00
Darien Raymond	da9f1a8013	predicate.Not	2016-10-11 12:30:53 +02:00
Darien Raymond	f3a83c57ab	optimize ping and updater logic	2016-10-11 12:24:19 +02:00
Darien Raymond	78f87c4f60	test case for cmd only segment	2016-10-11 11:44:30 +02:00
Darien Raymond	e023859ef0	stop data updating thread when there is no data	2016-10-10 16:50:54 +02:00
Darien Raymond	67793eb3e0	fix config creator cache	2016-10-03 12:25:36 +02:00
Darien Raymond	1d13f47f9c	protobuf for stream settings	2016-10-02 23:43:58 +02:00
Darien Raymond	5ec948f690	integrate tls settings in ws	2016-09-30 16:53:40 +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	dc6b7e2e75	protobuf for blackhole config	2016-09-22 12:01:36 +02:00
Darien Raymond	b28d718b79	optional field in kcp config	2016-09-21 21:08:05 +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	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	fbdb1e09d7	remove incorrect check on config name	2016-09-19 23:54:48 +02:00
Darien Raymond	9ade07db03	remove IsTCP() and IsUDP()	2016-09-19 16:39:11 +02:00
Darien Raymond	5f5d28009f	fix typo in utp def	2016-09-19 14:41:54 +02:00
Darien Raymond	04d956462c	fix test without -json tag	2016-08-25 13:25:59 +02:00
Darien Raymond	3fd66ad795	remove PingNecessary()	2016-08-25 12:00:31 +02:00
Darien Raymond	e49fb2f50d	no compacting buffers	2016-08-25 11:41:05 +02:00
Darien Raymond	fcad4aa212	adjust receiving buffer size	2016-08-25 09:45:56 +02:00
Darien Raymond	0da987ec43	refine buffer size	2016-08-25 00:04:54 +02:00
Darien Raymond	2ae8e5d033	rename buffer size	2016-08-24 23:54:39 +02:00
Darien Raymond	2839ce7a88	simplify receiving worker	2016-08-24 23:51:53 +02:00
Darien Raymond	5d20e3f70b	remove sending queue	2016-08-24 15:47:14 +02:00
Darien Raymond	e6e0419958	format private annotation	2016-08-24 11:17:42 +02:00
Darien Raymond	a9da266bf9	update default in-fligh size	2016-08-24 07:50:33 +02:00
Darien Raymond	98025e1457	change default kcp.tti to 50	2016-08-23 23:32:36 +02:00
v2ray	07a86f549b	unified import path	2016-08-20 20:55:45 +02:00
v2ray	d08ffedf48	reduce ping frequency	2016-08-20 11:33:22 +02:00
v2ray	d83a0ce5d2	Apply new read function to UDP hub.	2016-08-19 13:00:55 +02:00
v2ray	55e5268ce8	Fix UDP reading on Windows	2016-08-19 12:58:26 +02:00
v2ray	ad1353ac2f	merge similar error definitions	2016-08-18 08:34:21 +02:00
v2ray	d9884b4010	format import	2016-08-17 23:14:13 +02:00
v2ray	8ecec9b49d	format log	2016-08-17 23:12:10 +02:00
v2ray	bb3ceb3d7b	simplify case	2016-08-17 23:05:47 +02:00
v2ray	41d89e6d1e	skip test requires root permission	2016-08-16 09:01:58 +02:00
v2ray	9876844296	fix test break	2016-08-16 08:37:38 +02:00
v2ray	6417adb56d	correctly get sys fd from udp conn	2016-08-15 23:11:01 +02:00
v2ray	0bca6e8657	fix kcp listener	2016-08-15 22:20:16 +02:00
v2ray	a5a70afdb8	remove port testing	2016-08-15 22:12:11 +02:00
v2ray	338dc1ebb6	remove unused deps	2016-08-15 21:51:51 +02:00
v2ray	c7871a3ab2	test case for socket opt	2016-08-15 21:33:32 +02:00
v2ray	2a778762b1	rename udp.go to hub.go	2016-08-15 21:33:21 +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
Shelikhoo	22519353c3	Check Read	2016-08-15 21:55:43 +08:00
Shelikhoo	32e8deb6e8	Simplify Design	2016-08-15 21:36:37 +08:00
Shelikhoo	45d801b922	WsTest:more case	2016-08-15 21:29:15 +08:00
Shelikhoo	6c8b4f5db3	Fix	2016-08-15 21:21:09 +08:00
Shelikhoo	d7440bb1d6	Test:listen tls	2016-08-15 21:19:53 +08:00
Shelikhoo	856f2a2dd3	Fix assert fail	2016-08-15 21:19:15 +08:00
Shelikhoo	f7ce9d3be6	Add Developer Insecure Skip Verify for testing	2016-08-15 20:42:38 +08:00
Shelikhoo	02e3c17c97	test:listen	2016-08-15 20:20:47 +08:00
Shelikhoo	40ec84e222	Dial test	2016-08-15 20:15:12 +08:00
Shelikhoo	2209294dfc	Set reuse limit	2016-08-15 20:14:45 +08:00
Shelikhoo	0a49628555	Bettering ping method	2016-08-15 19:13:18 +08:00
Shelikhoo	e382eaa59f	typo	2016-08-15 18:59:50 +08:00
Shelikhoo	4c093a2107	Apply coding style	2016-08-15 18:59:14 +08:00
Shelikhoo	a5ae6a0f4e	Remove workaround	2016-08-15 18:57:39 +08:00
Shelikhoo	bfb4e0d9b0	Apply coding style	2016-08-15 18:56:33 +08:00
Shelikhoo	273c8f6c57	Support Stop listener	2016-08-15 18:47:44 +08:00
Shelikhoo	062d05fdcf	Added Stoppable listener for TLS listener	2016-08-15 18:43:17 +08:00
Shelikhoo	c8cd1320c7	Use stopable listener for HTTP	2016-08-15 18:17:29 +08:00
Shelikhoo	a36582b294	Added stopable listener	2016-08-15 18:16:54 +08:00
Shelikhoo	863237b518	Justify lock use	2016-08-15 17:53:11 +08:00
Shelikhoo	4853a1a6d3	Increase ping time	2016-08-15 17:48:30 +08:00
Shelikhoo	de28198234	Guess protocol	2016-08-15 17:47:15 +08:00
Shelikhoo	7b3cf631c2	Removed inaccessable doc	2016-08-15 17:40:56 +08:00
Shelikhoo	ee22082fb4	Fix host bug	2016-08-15 14:30:38 +08:00
Shelikhoo	00aeb29e46	typo	2016-08-15 12:31:55 +08:00
Shelikhoo	2bf9edfe7d	Prevent unnesessary log	2016-08-15 12:23:15 +08:00
Shelikhoo	d250013c99	Increase conn keep-alive time	2016-08-15 11:07:29 +08:00
Shelikhoo	d06c75f926	Doc sync to code change	2016-08-15 10:25:20 +08:00
Shelikhoo	7259b3363b	Merge branch 'master' into websockwt	2016-08-15 10:17:22 +08: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	fed2933043	fix crash	2016-08-14 20:41:26 +08:00
Shelikhoo	5e576e11bb	fix crash	2016-08-14 20:40:59 +08:00
Shelikhoo	49441a5050	Docs	2016-08-14 14:11:51 +08:00