Commit Graph

139 Commits

Author SHA1 Message Date
gVisor bot
b8996bac73 [skip ci] [Pre] avoid npe 2022-03-23 13:48:21 +08:00
gVisor bot
9b48fc9d8d Merge branch 'ogn-dev' into with-tun 2022-03-20 21:26:25 +08:00
gVisor bot
14a9087538 Merge remote-tracking branch 'clash/dev' into Alpha
# Conflicts:
#	Makefile
2022-03-19 14:53:47 +08:00
gVisor bot
87164f52af Fix: routing-mark option doesn't work on proxies (#2028) 2022-03-19 13:29:30 +08:00
gVisor bot
db31cfbd7f 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
gVisor bot
f5401aa63a Migration: go 1.18 2022-03-17 01:51:28 +08:00
gVisor bot
50ab57c72e 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
gVisor bot
446fd99436 Chore: Merge branch 'ogn-dev' into with-tun 2022-03-16 20:16:30 +08:00
gVisor bot
907c68c9cb Migration: go 1.18 2022-03-16 12:10:13 +08:00
gVisor bot
187c3607af Fix the filter under proxy-group to filter other groups 2022-02-23 16:17:29 +08:00
gVisor bot
19613a4fad Chore: compatible with VMESS WS older version configurations 2022-02-23 14:21:53 +08:00
gVisor bot
7f0de1861a Merge from remote branch 2022-02-23 01:00:27 +08:00
gVisor bot
f3f047645d Replace the regular implementation of the filter for proxy-providers and proxy-groups with regex2 2022-02-16 22:18:05 +08:00
gVisor bot
c57d92d7c1 [Feat]
support trojan xtls
change geodataloader mode as memconservative
2022-02-04 23:33:36 +08:00
gVisor bot
cdc8baf44e Merge branch 'Dev' into Feature
# Conflicts:
#	Makefile
2022-02-04 18:44:35 +08:00
gVisor bot
a8dafd434e [Fixed] Fixed clash process name is Clash.Meta 2022-02-04 17:38:06 +08:00
gVisor bot
b79eb1cea9 [Fixed] Abnormal rule when host is ip addr 2022-02-04 17:38:06 +08:00
gVisor bot
095a65abd9 [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
gVisor bot
9afe58058d Merge branch 'clash-dev' into Dev 2022-01-25 15:05:24 +08:00
gVisor bot
b350055692 [Style] clear unless notes 2022-01-21 22:38:28 +08:00
gVisor bot
39c3ca2b75 [Fixed] select group crash 2022-01-21 22:38:02 +08:00
gVisor bot
3c645b4f54 [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
gVisor bot
14a453b1b1 Improve: change provider file modify time when updated (#1918) 2022-01-18 13:32:47 +08:00
gVisor bot
70c8e6e1ba Feature: support snell v3 (#1884) 2022-01-10 20:24:20 +08:00
gVisor bot
ffe59c5fba [Style] Positive health check 2022-01-08 09:23:49 +08:00
gVisor bot
d96180dc60 [Fixed] Positive health check multithreading is not safe 2022-01-07 12:58:40 +08:00
gVisor bot
269a8560ce [test]Add name filter to proxy group 2022-01-05 12:19:49 +08:00
gVisor bot
4208d48a9d 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
gVisor bot
91c5381222 Fix: duplicate provider err typo 2022-01-03 17:21:27 +08:00
gVisor bot
85f1b22340 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
gVisor bot
6fa3953335 Chore: remove forward compatible code 2022-01-02 00:48:57 +08:00
gVisor bot
e1a1f87dd4 [Style] Add User-Agent for provider request 2021-12-26 22:26:53 +08:00
gVisor bot
5317d6e3e6 [Feature] 添加unified-delay boolean 控制延迟测试,默认为false,当设置true时忽略握手延迟,将统一延迟结果,从而利于不同协议的url-test 2021-12-26 21:20:41 +08:00
gVisor bot
4b8a1cdb08 Chore: remove reduce regex compile (#1855) 2021-12-26 20:47:12 +08:00
gVisor bot
7a2769621b Update vless.go 2021-12-20 12:59:06 +08:00
gVisor bot
e1fe9c6157 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
gVisor bot
2cd16ea478 [Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题 2021-12-06 00:19:03 +08:00
gVisor bot
bcf5a8d10c [Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题 2021-12-05 03:51:26 +08:00
gVisor bot
885ea9f7bf [Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题 2021-12-05 02:18:58 +08:00
gVisor bot
a3ec549dbf Fixed: Modify the trigger condition, only if it fails successively 2021-12-04 00:16:39 +08:00
gVisor bot
1c440d8d54 Experimental: Positive health testing 2021-12-03 14:35:21 +08:00
gVisor bot
05b2332af7 Revert "[fix]code"
This reverts commit 0431969a73.
2021-12-02 20:08:34 +08:00
gVisor bot
d68d6467f3 [fix]code 2021-12-02 03:39:37 +08:00
gVisor bot
76fe2b0bb8 Fix: provider filter potential panic 2021-11-21 17:44:03 +08:00
gVisor bot
ca43efdaaa Feature: add filter on proxy provider (#1511) 2021-11-20 23:38:49 +08:00
gVisor bot
9f8324e9e3 Fix: should return io.EOF immediately 2021-11-20 12:44:31 +08:00
gVisor bot
8e330640ea Change: use nop packet conn for reject 2021-11-20 12:34:14 +08:00
gVisor bot
1100475326 [Fix]Vless tls must not be true 2021-11-17 19:09:01 +08:00
gVisor bot
6a72feb8b5 [Fix]Vless tls must not be true 2021-11-17 17:56:24 +08:00
gVisor bot
e69c54cfcd [test] 2021-11-17 16:03:47 +08:00
gVisor bot
f5d2e7cd04 [test]core 1.8 2021-11-17 15:00:32 +08:00
gVisor bot
fa244e6cfd Feature: mark on socket (#1705) 2021-11-08 16:59:48 +08:00
gVisor bot
a3189021a5 Fix: parse dial interface option 2021-11-08 13:31:08 +08:00
gVisor bot
af069e3340 Fix: codeql alerts 2021-11-08 00:32:21 +08:00
gVisor bot
2762c33ad3 Feature: dial different NIC for all proxies (#1714) 2021-11-07 16:48:51 +08:00
gVisor bot
f7d136f56c Merge from remote branch 2021-10-28 11:36:11 +08:00
gVisor bot
0387c93c56 Style: format code 2021-10-28 00:06:55 +08:00
gVisor bot
1b7ad8f494 Feature: support trojan websocket 2021-10-16 20:19:59 +08:00
gVisor bot
50a2222cd2 Chore: contexify ProxyAdapter ListenPacket 2021-10-15 21:44:53 +08:00
gVisor bot
653f2de2c0 Style: use gofumpt for fmt 2021-10-10 23:44:09 +08:00
gVisor bot
0ebd7b6949 Chore: remove deprecated ioutil 2021-10-09 20:35:06 +08:00
gVisor bot
7f798f26ed Chore: add remove TODO 2021-10-05 12:42:21 +08:00
gVisor bot
249d830d73 Merge from remote branch 2021-09-17 15:07:27 +08:00
gVisor bot
fb357d1dc7 Fix: should not trust address of http.Client (#1616) 2021-09-13 23:46:39 +08:00
gVisor bot
554165397c Fix: VLESS WSOpts 2021-09-08 21:32:08 +08:00
gVisor bot
b883eb6e55 Fix: vmess ws headers not set properly (#1595) 2021-09-08 21:20:16 +08:00
gVisor bot
9c46fabbe4 Fix: vmess ws headers not set properly (#1595) 2021-09-08 14:44:24 +08:00
gVisor bot
317bf173df Merge from remote branch 2021-09-08 04:42:56 +08:00
gVisor bot
cfa6da15e7 Fix: VLESS WSOpts Headers 2021-09-08 04:34:11 +08:00
gVisor bot
da551ac737 Feature: add dhcp type dns client (#1509) 2021-09-06 23:07:34 +08:00
gVisor bot
df4b919f8f Feature: skip DIRECT proxies in relay (#1583) 2021-09-06 21:39:28 +08:00
gVisor bot
8595347485 Merge from remote branch 2021-09-01 00:38:43 +08:00
gVisor bot
d99920a3e6 Feature: add vmess WebSocket early data (#1505)
Co-authored-by: ShinyGwyn <79344143+ShinyGwyn@users.noreply.github.com>
2021-08-22 00:25:29 +08:00
gVisor bot
2e762b39b7 Merge from remote branch 2021-07-28 22:13:21 +08:00
gVisor bot
44360ef29b Chore: adjust batch 2021-07-23 00:30:23 +08:00
gVisor bot
4e38de95f2 Fix: incorrect use batch 2021-07-21 23:53:31 +08:00
gVisor bot
b926902a22 Fix: limit concurrency number of provider health check 2021-07-21 17:01:15 +08:00
gVisor bot
7fa486ea4c Chore: logging remote port on request (#1494) 2021-07-19 15:31:38 +08:00
gVisor bot
c3090aacb1 Style: code style 2021-07-09 02:19:43 +08:00
gVisor bot
8b2f737511 Merge from remote branch 2021-07-07 03:53:32 +08:00
gVisor bot
c17b71b12b Feature: add xtls support for VLESS 2021-07-06 23:55:34 +08:00
gVisor bot
cd6cd3880d Fix: staticcheck error 2021-07-06 00:33:13 +08:00
gVisor bot
e259cea893 Chore: move provider interface to constant 2021-07-06 00:31:13 +08:00
gVisor bot
b5939c1cc3 Merge from remote branch 2021-07-03 22:31:12 +08:00
gVisor bot
089faa30a5 Fix: remove ClientSessionCache and add NextProtos for vmess to fix #1468 2021-07-03 20:34:44 +08:00
gVisor bot
38c102a93d Code: refresh code 2021-07-01 22:49:29 +08:00
gVisor bot
225c875ed4 Refactor: plain http proxy (#1443) 2021-06-15 17:13:40 +08:00
gVisor bot
45f439c77f chore: expose udp field to proxies API (#1441) 2021-06-10 15:08:33 +08:00
gVisor bot
542325aae4 Style: code style 2021-06-10 14:05:56 +08:00