Commit Graph
123 Commits
Author SHA1 Message Date
Clash-Mini 4a446c4e31 [build] 2022-02-06 01:59:35 +08:00
Clash-Mini 35b19c3d7f Merge branch 'Dev' into Feature
# Conflicts:
#	Makefile
2022-02-04 18:44:35 +08:00
Skyxim 90e6ed4612 [Fixed] Fixed clash process name is Clash.Meta 2022-02-04 17:38:06 +08:00
Clash-Mini 176eb3926b Merge remote-tracking branch 'pro-plus/plus-pro' into Feature
# Conflicts:
#	.github/workflows/Alpha.yml
#	.github/workflows/codeql-analysis.yml
#	.github/workflows/docker.yml
#	.github/workflows/linter.yml
#	.github/workflows/stale.yml
#	Makefile
#	README.md
#	adapter/outbound/vless.go
#	component/dialer/dialer.go
#	component/geodata/geodata.go
#	component/geodata/router/condition.go
#	config/config.go
#	config/initial.go
#	constant/metadata.go
#	constant/path.go
#	constant/rule.go
#	constant/rule_extra.go
#	dns/filters.go
#	go.mod
#	go.sum
#	hub/executor/executor.go
#	hub/route/configs.go
#	listener/listener.go
#	listener/tun/dev/dev.go
#	listener/tun/dev/dev_darwin.go
#	listener/tun/dev/dev_linux.go
#	listener/tun/dev/dev_windows.go
#	listener/tun/dev/dev_windows_extra.go
#	listener/tun/dev/wintun/dll_windows.go
#	listener/tun/dev/wintun/session_windows.go
#	listener/tun/ipstack/gvisor/tun.go
#	listener/tun/ipstack/gvisor/tundns.go
#	listener/tun/ipstack/stack_adapter.go
#	listener/tun/ipstack/system/tun.go
#	listener/tun/tun_adapter.go
#	main.go
#	rule/base.go
#	rule/common/process.go
#	rule/geoip.go
#	rule/parser.go
#	rule/port.go
#	test/go.mod
#	test/go.sum
#	test/vless_test.go
#	transport/vless/xtls.go
#	tunnel/tunnel.go
2022-02-04 05:30:21 +08:00
yaling888 25e115d042 Feature: process condition for rules 2022-01-28 22:52:35 +08:00
Clash-Mini 9e4e1482d9 [chore] Replace Country.mmdb with GeoIP.dat 2022-01-26 12:01:14 +08:00
Clash-Mini a5ce62db33 Merge branch 'clash-dev' into Dev 2022-01-25 15:05:24 +08:00
Skyxim 8595d6c2e9 [Feature]
1.Add Network rule, match network type(TCP/UDP)
2.Add logic rules(NOT,OR,AND)
-AND,((DOMAIN,baidu.com),(NETWORK,UDP)),REJECT

(cherry picked from commit d7092e2e37f2c48282c878edea1b2ebc2912b09a)
2022-01-22 22:37:07 +08:00
Skyxim b15344ec78 [Refactor]
1.allow maybe empty group
2.use COMPATIBLE(DIRECT alias) when proxy group is empty
3.http provider pass through tunnel
2022-01-18 21:09:36 +08:00
yaling888 daae846db3 Merge from remote branch 2022-01-18 09:51:20 +08:00
thank243 9732efe938 Fix: tls handshake requires a timeout (#1893) 2022-01-15 19:33:21 +08:00
Clash-Mini a15d2535f1 升级版本号 2022-01-05 11:41:17 +08:00
yaling888 c14dd79e69 Merge from remote branch 2022-01-05 01:46:37 +08:00
Clash-Mini 9475799615 make tun config compatible with premium 2022-01-05 00:33:42 +08:00
Maze.tsz 3bb32d12e0 Merge remote-tracking branch 'clash/dev' into Meta
# Conflicts:
#	.github/workflows/docker.yml
#	dns/server.go
#	go.mod
#	go.sum
#	hub/executor/executor.go
#	test/go.mod
#	test/go.sum
2022-01-04 17:31:07 +08:00
HamsterReservedandHamster Tian 8679968ab0 Fix: multiple port string parsing overflow (#1868)
Ports in TCP and UDP should be parsed as an unsigned integer,
otherwise ports > 32767 get truncated to 32767. As this is
the case with Metadata.UDPAddr(), this fundamentally breaks
UDP connections where demand for high port numbers is high.

This commit fixes all known cases where ParseInt is used for ports,
and has been verified to fix Discord voice connections on port
50001~50004.

Fixes: d40e5e4fe6

Co-authored-by: Hamster Tian <[email protected]>
2022-01-02 01:09:29 +08:00
yaling888 5657aa50cf Merge from remote branch 2021-12-09 21:38:24 +08:00
bobo liu 78e105f3b2 Chore: builtin right mime of .js (#1808) 2021-12-08 13:38:25 +08:00
[email protected] eb999b3bf1 fix AutoIptables 2021-12-04 19:59:41 +08:00
Maze.tsz 8580ee8898 [style] 2021-12-04 17:41:13 +08:00
[email protected] edf1bb476d test 2021-12-03 20:38:40 +08:00
Skyxim c6f923041f Feature:Supported Rule-Set 2021-12-02 22:56:17 +08:00
[email protected] c7b257b188 [style] 2021-12-01 19:25:32 +08:00
Maze.tsz 35cf39e415 Revert "[test] rule providers"
This reverts commit 078389f4f6.
2021-11-26 00:57:41 +08:00
Maze.tsz 340efef2d8 Revert "[test] rule providers"
This reverts commit 14af94205c.
2021-11-26 00:57:36 +08:00
Maze.tsz 0f2b87497b Revert "[fix]code"
This reverts commit 06e9243fda.
2021-11-26 00:57:29 +08:00
Maze.tsz 06e9243fda [fix]code 2021-11-26 00:27:00 +08:00
[email protected] 14af94205c [test] rule providers 2021-11-25 23:20:08 +08:00
[email protected] 078389f4f6 [test] rule providers 2021-11-25 23:14:31 +08:00
beyondkmp 1401a82bb0 Feature: add filter on proxy provider (#1511) 2021-11-20 23:38:49 +08:00
Mazeorz 223de1f3fd [update]version 2021-11-18 23:54:20 +08:00
Mazeorz 900e852525 [test] 2021-11-17 16:03:47 +08:00
yaling888 6bd186d3c0 Merge from remote branch 2021-11-09 21:11:38 +08:00
yaling888 4c6bb7178b Feature: resolve ip with proxy adapter 2021-11-09 19:44:16 +08:00
Dreamacro d40e5e4fe6 Fix: codeql alerts 2021-11-08 00:32:21 +08:00
Dreamacro 1a7830f18e Feature: dial different NIC for all proxies (#1714) 2021-11-07 16:48:51 +08:00
yaling888 5a27df899f Chore: script built 2021-10-27 23:10:11 +08:00
yaling888 4b614090f8 Merge remote branch 2021-10-21 22:37:30 +08:00
Dreamacro 81d5da51a3 Fix: unexpected proxy dial behavior on mapping mode 2021-10-18 21:08:27 +08:00
Dreamacro 68753b4ae1 Chore: contexify ProxyAdapter ListenPacket 2021-10-15 21:44:53 +08:00
yaling888 c0e9d69163 Feature: add mode script 2021-10-15 14:11:14 +08:00
Dreamacro 537b672fcf Change: use bbolt as cache db 2021-10-04 19:20:11 +08:00
yaling888 4cc16e0136 Feature: add source ipcidr condition for all rules 2021-08-31 21:46:04 +08:00
yaling888 83c9664c17 Merge from remote branch 2021-08-05 00:49:17 +08:00
Dreamacro 1bfebd0d03 Fix: listener patch diff 2021-08-01 00:35:37 +08:00
yaling888 ba2fd00f01 Merge from remote branch 2021-07-28 22:13:21 +08:00
xᴊᴀsᴏɴʟʏᴜ 3705996974 Chore: split SOCKS version inbound metadata type (#1513) 2021-07-27 13:58:29 +08:00
Dreamacro 46f4f84442 Chore: use iife replace init in some cases 2021-07-11 19:43:25 +08:00
yaling888 5852245045 Merge from remote branch 2021-07-07 03:53:32 +08:00
Dreamacro d755383e39 Chore: move provider interface to constant 2021-07-06 00:31:13 +08:00