MetaCubeX
|
30f1b29257
|
Merge remote-tracking branch 'yaling888/with-tun' into Alpha
# Conflicts:
# .github/workflows/codeql-analysis.yml
# .github/workflows/linter.yml
# .github/workflows/release.yml
# Makefile
# README.md
# adapter/outbound/vless.go
# component/geodata/memconservative/cache.go
# component/geodata/router/condition.go
# component/geodata/router/condition_geoip.go
# component/geodata/standard/standard.go
# component/geodata/utils.go
# config/config.go
# config/initial.go
# constant/metadata.go
# constant/path.go
# constant/rule.go
# constant/rule_extra.go
# dns/client.go
# dns/filters.go
# dns/resolver.go
# go.mod
# go.sum
# hub/executor/executor.go
# hub/route/configs.go
# listener/listener.go
# listener/tproxy/tproxy_linux_iptables.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/wintun/config.go
# listener/tun/dev/wintun/dll_windows.go
# listener/tun/dev/wintun/session_windows.go
# listener/tun/dev/wintun/wintun_windows.go
# listener/tun/ipstack/commons/dns.go
# listener/tun/ipstack/gvisor/tun.go
# listener/tun/ipstack/gvisor/tundns.go
# listener/tun/ipstack/gvisor/utils.go
# listener/tun/ipstack/stack_adapter.go
# listener/tun/ipstack/system/dns.go
# listener/tun/ipstack/system/tcp.go
# listener/tun/ipstack/system/tun.go
# listener/tun/tun_adapter.go
# main.go
# rule/common/base.go
# rule/common/domain.go
# rule/common/domain_keyword.go
# rule/common/domain_suffix.go
# rule/common/final.go
# rule/common/geoip.go
# rule/common/geosite.go
# rule/common/ipcidr.go
# rule/common/port.go
# rule/parser.go
# rule/process.go
# test/go.mod
# test/go.sum
# transport/vless/xtls.go
# tunnel/tunnel.go
|
2022-03-17 17:41:02 +08:00 |
|
MetaCubeX
|
f01ac69654
|
Merge remote-tracking branch 'clash/dev' into Alpha
# Conflicts:
# .github/workflows/codeql-analysis.yml
# .github/workflows/docker.yml
# .github/workflows/linter.yml
# .github/workflows/stale.yml
# Makefile
# component/dialer/dialer.go
# config/config.go
# constant/metadata.go
# constant/rule.go
# rule/common/domain.go
# rule/common/domain_keyword.go
# rule/common/domain_suffix.go
# rule/common/final.go
# rule/common/ipcidr.go
# rule/geoip.go
# rule/parser.go
# rule/port.go
# rule/process.go
|
2022-03-15 23:13:41 +08:00 |
|
yaling888
|
46b9a1092d
|
Chore: embed the RuleExtra into Base
|
2022-03-13 01:22:05 +08:00 |
|
Kr328
|
b866f06414
|
Chore: move find connection process to tunnel (#2016)
|
2022-03-12 19:07:53 +08:00 |
|
yaling888
|
2f234cf6bc
|
Feature: process condition for rules
|
2022-02-23 14:01:53 +08:00 |
|
Clash-Mini
|
28a1475f66
|
[FEAT] Add geodata loader mode switch
|
2022-02-05 02:42:49 +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 |
|
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
|
b99b4ad15f
|
Fixed:Rule-Set Supported RuleExtra
|
2021-12-02 23:32:30 +08:00 |
|
Skyxim
|
c6f923041f
|
Feature:Supported Rule-Set
|
2021-12-02 22:56:17 +08:00 |
|
maze.y2b@gmail.com
|
cb52682790
|
[style]
|
2021-12-01 16:51:31 +08:00 |
|
Maze.tsz
|
35cf39e415
|
Revert "[test] rule providers"
This reverts commit 078389f4f6.
|
2021-11-26 00:57:41 +08:00 |
|
maze.y2b@gmail.com
|
078389f4f6
|
[test] rule providers
|
2021-11-25 23:14:31 +08:00 |
|
Mazeorz
|
900e852525
|
[test]
|
2021-11-17 16:03:47 +08:00 |
|
yaling888
|
c0e9d69163
|
Feature: add mode script
|
2021-10-15 14:11:14 +08:00 |
|
yaling888
|
b904ca0bcc
|
Feature: add source ipcidr condition to rule final
|
2021-09-01 18:29:48 +08:00 |
|
yaling888
|
4cc16e0136
|
Feature: add source ipcidr condition for all rules
|
2021-08-31 21:46:04 +08:00 |
|
yaling888
|
d7732f6ebc
|
Code: refresh code
|
2021-07-01 22:49:29 +08:00 |
|
Dreamacro
|
045edc188c
|
Style: code style
|
2021-06-10 14:05:56 +08:00 |
|