81c5a65f23
Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha
...
# Conflicts:
# README.md
# adapter/outbound/trojan.go
# adapter/outbound/vless.go
# transport/trojan/trojan.go
2022-03-30 13:15:45 +08:00
9ff1f5530e
Feature: Trojan XTLS
2022-03-30 00:15:39 +08:00
b3ea2ff8b6
Chore: adjust VLESS
2022-03-29 23:50:41 +08:00
131e9d38b6
Fix: Vless UDP
2022-03-29 07:24:11 +08:00
7e2c6e5188
Chore: adjust HealthCheck at first check
2022-03-28 00:46:44 +08:00
4502776513
Refactor: MainResolver
2022-03-28 00:44:13 +08:00
611ce5f5f1
[commit]
...
[Feat] add Pass type for support temporary skip rule set
2022-03-27 23:44:51 +08:00
520657e953
[Fix] use direct to update http providers when proxy 寄
2022-03-24 12:34:45 +08:00
9b4ddbed2c
[skip ci] [Pre] avoid npe
2022-03-23 13:48:21 +08:00
bac04ab54b
Merge branch 'ogn-dev' into with-tun
2022-03-20 21:26:25 +08:00
2df890c4ee
Merge remote-tracking branch 'clash/dev' into Alpha
...
# Conflicts:
# Makefile
2022-03-19 14:53:47 +08:00
f9cc1cc363
Fix: routing-mark option doesn't work on proxies ( #2028 )
2022-03-19 13:29:30 +08:00
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
e194efcecb
Migration: go 1.18
2022-03-17 01:51:28 +08:00
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
346d817dba
Chore: Merge branch 'ogn-dev' into with-tun
2022-03-16 20:16:30 +08:00
6a661bff0c
Migration: go 1.18
2022-03-16 12:10:13 +08:00
06942c67fd
Fix the filter under proxy-group to filter other groups
2022-02-23 16:17:29 +08:00
ac5c57ecef
Chore: compatible with VMESS WS older version configurations
2022-02-23 14:21:53 +08:00
b192238699
Merge from remote branch
2022-02-23 01:00:27 +08:00
27292dac0c
Replace the regular implementation of the filter for proxy-providers and proxy-groups with regex2
2022-02-16 22:18:05 +08:00
2bf34c766e
[Feat]
...
support trojan xtls
change geodataloader mode as memconservative
2022-02-04 23:33:36 +08:00
35b19c3d7f
Merge branch 'Dev' into Feature
...
# Conflicts:
# Makefile
2022-02-04 18:44:35 +08:00
90e6ed4612
[Fixed] Fixed clash process name is Clash.Meta
2022-02-04 17:38:06 +08:00
ae5a790510
[Fixed] Abnormal rule when host is ip addr
2022-02-04 17:38:06 +08:00
be0fadc09e
[Feat]
...
1.Add DNS over QUIC support
2.Replace Country.mmdb with GeoIP.dat
3.build with Alpha tag
2022-01-27 12:25:53 +08:00
a5ce62db33
Merge branch 'clash-dev' into Dev
2022-01-25 15:05:24 +08:00
58a47e1835
[Style] clear unless notes
2022-01-21 22:38:28 +08:00
daf83eb6f7
[Fixed] select group crash
2022-01-21 22:38:02 +08:00
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
cfe7354c07
Improve: change provider file modify time when updated ( #1918 )
2022-01-18 13:32:47 +08:00
8f3385bbb6
Feature: support snell v3 ( #1884 )
2022-01-10 20:24:20 +08:00
4f1b227ca2
[Style] Positive health check
2022-01-08 09:23:49 +08:00
75b5f633cd
[Fixed] Positive health check multithreading is not safe
2022-01-07 12:58:40 +08:00
bfb976bbdc
[test]Add name filter to proxy group
2022-01-05 12:19:49 +08:00
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
3cb87e083c
Fix: duplicate provider err typo
2022-01-03 17:21:27 +08:00
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 <haotia@gmail.com >
2022-01-02 01:09:29 +08:00
204a72bbd3
Chore: remove forward compatible code
2022-01-02 00:48:57 +08:00
82c8e02d02
[Style] Add User-Agent for provider request
2021-12-26 22:26:53 +08:00
a210ec4197
[Feature] 添加unified-delay boolean 控制延迟测试,默认为false,当设置true时忽略握手延迟,将统一延迟结果,从而利于不同协议的url-test
2021-12-26 21:20:41 +08:00
14ae87fcd0
Chore: remove reduce regex compile ( #1855 )
2021-12-26 20:47:12 +08:00
8955107d6b
Update vless.go
2021-12-20 12:59:06 +08:00
ee6fc12709
Fix: when both providers and proxies are present, use the health check configuration for proxies ( #1821 )
...
Co-authored-by: Ho <ho@fluidex.com >
2021-12-12 20:37:30 +08:00
8df3efe932
[Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题
2021-12-06 00:19:03 +08:00
645c3154d6
[Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题
2021-12-05 03:51:26 +08:00
a847d7b58d
[Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题
2021-12-05 02:18:58 +08:00
23ca356447
Fixed: Modify the trigger condition, only if it fails successively
2021-12-04 00:16:39 +08:00
5c53243e81
Experimental: Positive health testing
2021-12-03 14:35:21 +08:00
53eb3f15bb
Revert "[fix]code"
...
This reverts commit 0431969a73
.
2021-12-02 20:08:34 +08:00