Commit graph

1038 commits

Author SHA1 Message Date
gVisor bot
f1f6a18e56 [内容]
同步至最新v1.10.0
2022-03-19 15:01:49 +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
90b7714f2c Chore: fix typo (#2033) 2022-03-19 13:58:51 +08:00
gVisor bot
338b43a32e Chore: split amd64 v3 to special release 2022-03-19 13:42:06 +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
e1d1a27ca8 [内容]
1.wintun.dll 0.14.1
2022-03-19 01:54:21 +08:00
gVisor bot
f18800de42 [内容]
1.autoIptables 开关
2.go.mod 调整
3.processName 调整
4.makefile 调整
5.Tun模块 部分代码调整
2022-03-19 01:11:27 +08:00
gVisor bot
c8b9f88179 Merge pull request #19 from Adlyq/Alpha-pr
[skip ci]Only prompt when interface cannot be found
2022-03-18 21:45:50 +08:00
gVisor bot
1b72afb708 Only prompt when interface cannot be found 2022-03-18 17:41:06 +08:00
gVisor bot
188f4faec7 Merge pull request #18 from Adlyq/Alpha
[Fix] Process name display for Android
2022-03-18 13:20:35 +08:00
gVisor bot
afdac61612 Merge remote-tracking branch 'upstream/Alpha' into Alpha 2022-03-18 12:38:16 +08:00
gVisor bot
c43675c880 Merge remote-tracking branch 'origin/Alpha' into Alpha
# Conflicts:
#	go.mod
#	go.sum
2022-03-18 02:36:09 +08:00
gVisor bot
47450aa401 1.fix module package
2.fix govet error
2022-03-18 02:35:15 +08:00
gVisor bot
e2bbab0f6d 1.fix module package
2.fix govet error
2022-03-18 01:25:59 +08:00
gVisor bot
5fd0567402 fix 2022-03-18 00:40:39 +08:00
gVisor bot
db27b65237 Merge remote-tracking branch 'upstream/Alpha' into Alpha 2022-03-18 00:33:27 +08:00
gVisor bot
b26848f444 update 2022-03-18 00:27:48 +08:00
gVisor bot
0bd8e30655 update 2022-03-18 00:24:38 +08:00
gVisor bot
f23ba06b57 Merge remote-tracking branch 'upstream/Alpha' into Alpha 2022-03-18 00:10:37 +08:00
gVisor bot
d0ef727198 update 2022-03-17 23:57:58 +08:00
gVisor bot
2e68885dc7 Merge remote-tracking branch 'upstream/Alpha' into Alpha 2022-03-17 23:40:51 +08:00
gVisor bot
b8c9a1bf6d update 2022-03-17 23:24:07 +08:00
gVisor bot
3dc7fb7e27 [Fix] Process name display for Android 2022-03-17 20:31:16 +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
64dc15e99d Merge pull request #17 from Adlyq/Alpha
[Fix] Parse
2022-03-17 12:28:45 +08:00
gVisor bot
f3d1de077e [Fix] Parse 2022-03-17 12:26:43 +08:00
gVisor bot
77f725afb6 [Fix] Parse 2022-03-17 12:23:50 +08:00
gVisor bot
9ef90782ce Chore: use gateway address of fake ip pool as the TUN device address 2022-03-17 07:41:18 +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
71492ea424 Merge remote-tracking branch 'origin/Alpha' into Alpha 2022-03-17 00:12:26 +08:00
gVisor bot
6cddf49d6e [Build test] 1.18
[Updata] wintun.dll
2022-03-17 00:12:11 +08:00
gVisor bot
99048c26ec [Build test] 1.18
[Updata] wintun.dll
2022-03-17 00:02:22 +08:00
gVisor bot
aead96abb3 [Build test] 1.18 2022-03-16 23:30:29 +08:00
gVisor bot
c30891a7f6 [Fix] 优化geodata初始化逻辑 2022-03-16 23:09:05 +08:00
gVisor bot
cef603715c [Fix] 优化geodata初始化逻辑 2022-03-16 23:02:16 +08:00
gVisor bot
90e464ef38 [Fix] 优化geodata初始化逻辑 2022-03-16 22:55:18 +08:00
gVisor bot
6a735b10d7 Migration: go 1.18 2022-03-16 22:00:20 +08:00
gVisor bot
5af26db8ff [build test] 1.18 2022-03-16 21:47:00 +08:00
gVisor bot
446fd99436 Chore: Merge branch 'ogn-dev' into with-tun 2022-03-16 20:16:30 +08:00
gVisor bot
9e3260a172 Fix: should keep alive in tcp relay 2022-03-16 18:17:28 +08:00
gVisor bot
a57355aae3 [build test]1.18 2022-03-16 17:54:44 +08:00
gVisor bot
01d7a43793 [build test] 2022-03-16 17:33:08 +08:00
gVisor bot
7a3a4413c9 [build test] 2022-03-16 17:29:09 +08:00
gVisor bot
3c4c4c43e4 Fix: docker build makefile 2022-03-16 12:13:59 +08:00
gVisor bot
907c68c9cb Migration: go 1.18 2022-03-16 12:10:13 +08:00
gVisor bot
40381afa05 [build test] 2022-03-16 00:43:08 +08:00
gVisor bot
f7759c1468 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
gVisor bot
440b54ab22 [Skip CI] 2022-03-15 22:25:33 +08:00
gVisor bot
d3658311d1 [Skip CI] 2022-03-15 11:47:42 +08:00