344 Commits

Author	SHA1	Message	Date
Darien Raymond	94b880d060	move session based info into session package	2018-09-18 23:09:54 +02:00
Darien Raymond	383b84e7dd	unified tproxy option	2018-09-17 15:12:58 +02:00
Darien Raymond	d068f357bd	update proto lib	2018-09-14 11:00:59 +02:00
Darien Raymond	eb05a92592	dont start periodic task until necessary	2018-08-29 23:00:01 +02:00
Darien Raymond	54e1bb96cc	introduce in-memory user	2018-08-27 00:11:32 +02:00
Darien Raymond	d828aa2fba	add full domain matching	2018-08-21 21:30:32 +02:00
Darien Raymond	059dfdbb97	doc for strmatcher interface	2018-08-20 15:39:58 +02:00
Darien Raymond	fca324a399	fix build break	2018-08-19 22:28:02 +02:00
Darien Raymond	edcf564dd7	improve performance of domain matcher	2018-08-19 21:04:15 +02:00
Darien Raymond	ef679bddbd	test case	2018-08-02 13:28:13 +02:00
Darien Raymond	4b63638dca	update protobuf lib	2018-07-25 00:36:28 +02:00
Darien Raymond	ecd45ffb65	propagate error when adding domain condition	2018-07-17 17:53:24 +02:00
Darien Raymond	c0e37ef34a	prototype for new sniffing mechanism	2018-07-16 13:47:00 +02:00
Darien Raymond	cb0eb91f2b	strmatcher	2018-06-26 21:57:41 +02:00
Darien Raymond	ff0ae91b9b	update protobuf generated files	2018-06-26 16:28:54 +02:00
Darien Raymond	4a46817cf6	optimize map usage	2018-05-31 12:05:25 +02:00
Darien Raymond	68da956fc4	re-generate code	2018-05-25 11:56:01 +02:00
Darien Raymond	758723516e	reorder condition list to short circuit IP resolution if possible. ... Fix #1021	2018-04-06 15:56:53 +02:00
Darien Raymond	75a7e9c7f5	comments	2018-04-04 21:32:40 +02:00
Darien Raymond	88b25d38cb	simplify context retrieval	2018-02-21 17:05:29 +01:00
Darien Raymond	efcb567273	remove context in struct	2018-02-08 15:39:46 +01:00
Darien Raymond	292d7cc353	massive refactoring for interoperability	2018-01-10 12:22:37 +01:00
Darien Raymond	24395a3e60	comments for protos.	2018-01-04 11:09:23 +01:00
Darien Raymond	2bf5a008f0	fix error levels	2017-12-27 22:25:12 +01:00
Darien Raymond	a82ca019b2	release script relocation	2017-12-25 21:54:44 +01:00
Darien Raymond	c277c6de54	fix test	2017-12-20 00:00:36 +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	d43a23aa96	move error generator to common	2017-12-03 01:04:57 +01:00
Darien Raymond	5e27e3d260	gofmt	2017-12-03 01:04:38 +01:00
Darien Raymond	fd8db49dc9	generalized event handler	2017-11-28 23:41:20 +01:00
Darien Raymond	aa2c1f76f4	remove unused function	2017-11-16 18:54:10 +01:00
Darien Raymond	26f005e822	resolve to ip on demand	2017-11-15 12:55:47 +01:00
Darien Raymond	57648c145c	cachable domain matcher: step 2	2017-11-06 22:30:56 +01:00
Darien Raymond	6b77e14bf6	cachable domain matcher, step 1	2017-11-06 21:12:28 +01:00
Darien Raymond	682319a004	proto def for geosite	2017-11-05 17:19:34 +01:00
Darien Raymond	3545d20b1c	protobuf for geoip	2017-11-02 10:54:06 +01:00
Darien Raymond	74cf833758	fully migrate to new assertion lib	2017-10-24 16:15:35 +02:00
Darien Raymond	52ad41cda3	completely move away from net package	2017-08-29 14:32:54 +02:00
Darien Raymond	815019f6da	rename IPNet to IPNetTable	2017-08-29 13:51:09 +02:00
Darien Raymond	661c0fc237	more test cases for router config	2017-05-17 21:46:57 +02:00
Darien Raymond	fcafd4e8f8	test case for email	2017-05-17 13:28:22 +02:00
Darien Raymond	069837417f	test case for routing rule	2017-05-17 13:24:53 +02:00
Darien Raymond	52216d0204	test case for domain matcher	2017-05-09 13:39:09 +02:00
Darien Raymond	74b2734cb8	refactor	2017-05-08 12:25:36 +02:00
Darien Raymond	a0bde091d4	sub domain matcher	2017-05-08 12:18:13 +02:00
Darien Raymond	a0ac334703	refactor	2017-05-08 11:48:41 +02:00
Darien Raymond	59a1e2d736	refactor	2017-04-23 19:16:56 +02:00
Darien Raymond	68bc9ea8e4	cleanup error messages	2017-04-09 15:04:04 +02:00
Darien Raymond	35248497d2	refactor error messages	2017-04-09 01:43:25 +02:00
Darien Raymond	75f5cb9afb	refactor log and error	2017-04-06 21:13:17 +02:00
Darien Raymond	2e5cb82790	update proto	2017-04-04 12:28:14 +02:00
Darien Raymond	d04d92c187	update context functions	2017-02-09 22:49:38 +01:00
Darien Raymond	b5d14b6823	update java options	2017-02-03 23:15:10 +01:00
Darien Raymond	f046f334cd	move common/log to app/log	2017-02-01 21:35:40 +01:00
Darien Raymond	0bf5f3e531	fix #374	2017-01-28 09:04:29 +01:00
Darien Raymond	09e5ae7a4b	remove unnecessary code	2017-01-27 22:49:54 +01:00
Darien Raymond	8231d2cdad	dns test	2017-01-27 21:19:46 +01:00
Darien Raymond	9716d7fdfe	Fix usage of source in context	2017-01-27 20:38: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	8b00d6fc30	clean imports	2017-01-14 00:27:45 +01:00
Darien Raymond	289c467a12	remove unnecessary code	2017-01-13 13:47:44 +01:00
Darien Raymond	17504d2aac	context'ize apps	2017-01-13 13:41:40 +01:00
Darien Raymond	b11d48d73f	simplify app design	2017-01-06 15:32:36 +01:00
Darien Raymond	e678000c44	remove release() pattern	2017-01-04 12:52:24 +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	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	095c29fa8c	decouple outbound handler manager	2016-12-16 23:02:11 +01:00
Darien Raymond	50bc195f7f	rename TypedSettings to TypedMessage	2016-12-15 11:51:09 +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	c041740940	remove ErrMissingApplication	2016-11-21 21:13:01 +01:00
Darien Raymond	fc81b0aae2	config for inbound tag routing	2016-11-13 21:23:34 +01:00
Darien Raymond	a7ef82ffbc	fix test break	2016-10-19 12:01:11 +02:00
Darien Raymond	aae99a8e98	use session in router	2016-10-18 23:01:39 +02:00
Darien Raymond	e13c97d162	rename IP to CIDR in router	2016-10-18 16:42:22 +02:00
Darien Raymond	4e80ed05d9	comments	2016-10-18 10:31:39 +02:00
Darien Raymond	5a311cbe08	json config parser	2016-10-17 14:35:13 +02:00
Darien Raymond	e866ff24a4	refine app settings in v2ray config	2016-10-16 16:04:30 +02:00
Darien Raymond	22ef12a456	simplify router	2016-10-12 16:11:13 +02:00
Darien Raymond	63f3108737	protobuf for router	2016-10-11 23:02:44 +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	ea2c491ade	global proto gen	2016-08-28 23:41:51 +02:00
Darien Raymond	64e38ba851	update chinaip	2016-08-25 22:17:57 +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	ad1353ac2f	merge similar error definitions	2016-08-18 08:34:21 +02:00
v2ray	4419f1e3d6	introduce address family in v2net	2016-08-14 18:14:12 +02:00
v2ray	dbee8c620a	update china ip	2016-07-24 13:44:49 +02:00
v2ray	7f661f5215	rename Error to Err	2016-06-27 08:53:35 +02:00
v2ray	08261e4f13	more china sites	2016-06-05 23:41:37 +02:00
v2ray	372a32a66f	more china sites	2016-06-04 17:48:23 +02:00
v2ray	e0c22860f1	more china sites	2016-06-03 12:47:22 +02:00
v2ray	3a6bf38686	remove validity map	2016-05-31 00:21:29 +02:00
v2ray	21ab26f41f	missing function	2016-05-29 22:42:15 +02:00
v2ray	c75d840706	Remove serial.String	2016-05-24 22:41:51 +02:00
v2ray	fc63f0432c	simplify testing	2016-05-24 21:55:46 +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	ac58eed310	more china sites	2016-05-23 14:19:38 +02:00
v2ray	1b71c7d68d	acgvideo.com	2016-05-22 19:04:20 +02:00
v2ray	3ded18a75b	initializable apps	2016-05-18 08:12:04 -07:00
v2ray	7765fedd78	modulize dispatcher and proxyman	2016-05-17 23:05:52 -07:00
v2ray	18d75cb7b4	bug fixes to dns server	2016-05-16 11:53:18 -07:00
v2ray	dac1339d6e	Use dns in router	2016-05-16 00:25:34 -07:00
v2ray	0cedf8ad7d	generator for china ip	2016-05-11 23:45:35 -07:00
v2ray	f5960db27e	more china sites	2016-03-11 23:51:24 +01:00
v2ray	50ef8e0465	more china sites	2016-03-08 17:35:33 +01:00
v2ray	486965d1eb	more china sites	2016-03-08 15:45:30 +01:00
v2ray	441a198b86	more china sites	2016-03-05 22:03:28 +01:00
v2ray	26925a7d90	more china sites	2016-03-04 00:27:33 +01:00
v2ray	7b74665a64	more china sites	2016-02-29 23:20:08 +01:00
v2ray	02178afaff	more china sites	2016-02-27 21:47:07 +01:00
v2ray	f130cee83b	more china sites	2016-02-25 14:38:56 +01:00
v2ray	b3f547dc90	more china sites	2016-02-24 14:48:05 +01:00
v2ray	238d465181	more china sites	2016-02-24 12:53:55 +01:00
v2ray	f242ca048c	update china ip	2016-02-23 23:31:37 +01:00
v2ray	47e61f62c1	more china sites	2016-02-23 21:39:55 +01:00
v2ray	9e06048ec6	more china sites	2016-02-23 12:02:26 +01:00
v2ray	f6bec7dc72	more china sites	2016-02-22 17:08:31 +01:00
v2ray	e117a695ae	more china sites	2016-02-22 13:44:46 +01:00
v2ray	4bb1d822af	prefer Network over string	2016-02-06 18:03:42 +01:00
v2ray	2d551c97df	gofmt -s	2016-02-05 22:06:27 +01:00
v2ray	39eea81c5c	simplify router config	2016-02-01 23:21:54 +01:00
v2ray	5df2a1c6e6	refactor router rules	2016-02-01 22:30:00 +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
v2ray	3f5bda898c	more tests for router rules	2016-01-24 17:36:55 +01:00
v2ray	fafc813f0e	test case for field rule	2016-01-24 15:36:55 +01:00
v2ray	4f5743604a	AnyCondition	2016-01-24 14:40:46 +01:00
v2ray	eec0bb4db4	lazy evaluation of log fields	2016-01-18 12:24:33 +01:00
v2ray	dde47290d7	completely remove json folder in v2ray	2016-01-17 21:43:10 +01:00
Darien Raymond	ae8121e633	remove json packages in app folder	2016-01-17 15:20:49 +00:00
v2ray	2d233295e6	simplify stringlist	2016-01-15 15:23:12 +01:00
v2ray	a403859105	move network to net	2016-01-15 14:34:33 +01:00
v2ray	393a64820f	simplify port range	2016-01-15 13:39:36 +01:00
v2ray	c4b787e637	more china sites	2016-01-12 18:25:51 +01:00
v2ray	c31c49d11f	more china sites	2016-01-12 10:40:44 +01:00
v2ray	57709a5cdb	more china sites	2016-01-10 15:23:07 +01:00
v2ray	2c892e7b9d	more china sites	2016-01-10 09:34:31 +01:00
v2ray	84464e863d	more china sites	2016-01-04 22:02:06 +01:00
Darien Raymond	30ed9fdddc	more china sites	2016-01-04 17:01:51 +00:00
v2ray	5df40c31f0	more china sites	2016-01-04 09:37:41 +01:00
v2ray	e2623e65dd	more china sites	2016-01-04 01:12:38 +01:00
v2ray	24adb769a6	more china sites	2016-01-04 01:05:32 +01:00
v2ray	8a132643ef	more china sites	2016-01-03 15:38:09 +01:00
v2ray	20b64ecdfe	more china sites	2015-12-25 01:24:08 +01:00
v2ray	367d17b44c	more china sites	2015-12-23 09:58:18 +01:00
v2ray	34a0cb0b70	move port out of address	2015-12-16 23:53:38 +01:00
v2ray	655f8cd150	more china sites	2015-12-16 15:49:09 +01:00
v2ray	ac8d0bbd1c	more china sites	2015-12-16 00:57:04 +01:00
v2ray	51c6ef63f4	more china sites	2015-12-16 00:08:46 +01:00
v2ray	8d6874a7da	more china sites	2015-12-15 23:04:44 +01:00
v2ray	05397c5bde	more china sites	2015-12-15 22:55:06 +01:00
Darien Raymond	86f97616fc	add cache to router	2015-12-14 13:40:13 +00:00
Darien Raymond	56976e2d1b	more chinasites	2015-12-14 10:52:18 +00:00
v2ray	543478a01e	Move code to init	2015-12-14 01:12:29 +01:00
v2ray	d3422597d6	more china sites	2015-12-14 01:07:45 +01:00
v2ray	1e6aa73781	chinasites	2015-12-14 01:01:57 +01:00
v2ray	cf56b89898	more router test cases	2015-12-12 20:47:29 +01:00
v2ray	164465e60d	more test case	2015-12-12 17:17:23 +01:00
v2ray	b87cc5baf1	fix a bug in fieldrule	2015-12-12 17:15:29 +01:00
v2ray	6afeaccc5a	Update chinaip generator	2015-12-08 23:12:12 +01:00
v2ray	9d51bd2985	test case for chinaip	2015-12-08 18:19:40 +01:00
Darien Raymond	c19341ffab	chinaip	2015-12-08 16:31:31 +00:00
v2ray	641e5db851	rename RouterConfig to Config	2015-12-08 00:04:02 +01:00
v2ray	aab774e78f	simplify router config	2015-12-07 22:47:47 +01:00
Darien Raymond	74c7810957	lowercase domain matching	2015-12-07 11:10:27 +00:00
Darien Raymond	96aa94002a	regexp support in domain matching	2015-12-07 10:58:43 +00:00
Darien Raymond	9b830fc432	update end 2 end test	2015-12-02 23:41:34 +00:00
Darien Raymond	3c12469ae5	leverage serial.String in assert	2015-12-02 15:41:19 +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
Darien Raymond	56a79a2190	remove DetourTag and add more test cases	2015-11-30 15:14:38 +00:00
Darien Raymond	f6c486327f	faster check in field rule	2015-11-30 12:46:09 +00:00
V2Ray	07582c5b60	Move point to shell	2015-11-29 14:45:32 +01:00
Darien Raymond	759efb0cfa	field domain and ip accepts list of strings	2015-11-26 11:22:34 +00:00
V2Ray	790f6c038c	Fix field rule	2015-11-22 22:14:27 +01:00
V2Ray	1cdd3e6647	test case for ip rule	2015-11-22 21:16:28 +01:00
V2Ray	12e72509a5	code ready for selective routing	2015-11-22 17:41:52 +01:00
V2Ray	f4ec19625e	Implementation of rules router	2015-11-22 12:05:21 +01:00
V2Ray	d48ac4418f	config for rule based router	2015-11-21 21:43:40 +01:00
V2Ray	57dc6c69f1	Router config	2015-11-14 14:24:56 +01:00
V2Ray	1d4b98ab9a	Outbound detour config	2015-11-13 23:43:58 +01:00
V2Ray	0a8e283e55	function to create router	2015-11-03 23:24:56 +01:00
V2Ray	d585ec0593	Move config to app/point	2015-10-30 22:50:45 +01:00
V2Ray	d0ae47e2ce	Router interface	2015-10-28 23:18:07 +01:00