adlyq
2f95d56a12
pref: uid style in log
2022-04-23 17:37:50 +08:00
adlyq
b8d5321615
feat: cache uid
2022-04-23 12:11:26 +08:00
adlyq
de4341c8cd
Revert: "fix: proxy-groups filter logic"
...
This reverts commit 8a85c63b08
2022-04-22 18:56:35 +08:00
adlyq
8a85c63b08
fix: proxy-groups filter logic
2022-04-22 17:27:55 +08:00
adlyq
3d6aea4c1e
feat: support uid rule
...
eg. UID,1000/5000-6000,Proxy
2022-04-22 16:27:51 +08:00
adlyq
0cb5270452
Merge remote-tracking branch 'origin/Alpha' into Alpha
2022-04-22 15:58:57 +08:00
yaling888
f91d106cdf
Chore: fix typos
2022-04-22 12:42:20 +08:00
adlyq
e98dcc4267
[fix] logic
2022-04-21 18:56:33 +08:00
yaling888
7ca1a03d73
Refactor: metadata use netip.Addr
2022-04-20 22:52:05 +08:00
Meta
815a060309
Update metadata.go
...
revet commit 13012a9
2022-04-10 00:47:22 +08:00
Skyxim
544e0f137d
feat: sniffer support
...
sniffer:
enable: true
force: false # Overwrite domain
sniffing:
- tls
2022-04-09 22:30:36 +08:00
MetaCubeX
91e48b707b
Merge remote-tracking branch 'yaling888/with-tun' into Alpha
2022-04-05 14:44:40 +08:00
fishg
93d2cfa091
fix: when ssh connect to a ip, if this ip map to a domain in clash, change ip to host may redirect to a diffrent ip
2022-04-05 03:26:23 +08:00
MetaCubeX
611ce5f5f1
[commit]
...
[Feat] add Pass type for support temporary skip rule set
2022-03-27 23:44:51 +08:00
Meta
b5f6f26de4
Update version.go
...
[BUILD TEST]
2022-03-22 01:39:00 +08:00
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
609d69191a
Merge remote-tracking branch 'clash/dev' into Alpha
...
# Conflicts:
# .github/workflows/docker.yml
# adapter/outboundgroup/fallback.go
# adapter/outboundgroup/loadbalance.go
# adapter/outboundgroup/relay.go
# adapter/outboundgroup/selector.go
# adapter/outboundgroup/urltest.go
# config/config.go
# go.mod
# go.sum
# main.go
# test/go.mod
# test/go.sum
2022-03-17 01:41:51 +08:00
MetaCubeX
acc249495d
[Build test] 1.18
2022-03-16 23:30:29 +08:00
yaling888
b8d635a4b3
Migration: go 1.18
2022-03-16 22:00:20 +08:00
yaling888
346d817dba
Chore: Merge branch 'ogn-dev' into with-tun
2022-03-16 20:16:30 +08:00
MetaCubeX
0f2123179a
[build test]
2022-03-16 17:29:09 +08:00
Dreamacro
6a661bff0c
Migration: go 1.18
2022-03-16 12:10:13 +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
20b66d9550
Style: code style
2022-03-15 02:55:06 +08:00
MetaCubeX
68fccfacc0
[Skip CI]
2022-03-15 02:20:19 +08:00
MetaCubeX
cf52fbed65
[Skip CI]
2022-03-15 02:06:57 +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
8333815e95
Chore: refactor TUN
2022-03-09 05:08:35 +08:00
admin
06942c67fd
Fix the filter under proxy-group to filter other groups
2022-02-23 16:17:29 +08:00
yaling888
2f234cf6bc
Feature: process condition for rules
2022-02-23 14:01:53 +08:00
yaling888
d876d6e74c
Feature: resolve ip with a proxy adapter
2022-02-23 02:38:50 +08:00
yaling888
b192238699
Merge from remote branch
2022-02-23 01:00:27 +08:00
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
HamsterReserved
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
2022-01-02 01:09:29 +08:00
yaling888
5657aa50cf
Merge from remote branch
2021-12-09 21:38:24 +08:00
