Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2024-11-15 13:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,347 Commits 1 Branch 71 Tags 35 MiB
1faa172944
Commit Graph

1347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yaling888
bac04ab54b Merge branch 'ogn-dev' into with-tun 2022-03-20 21:26:25 +08:00
Dreamacro
8c9e0b3884 Chore: use GOAMD64 v1 on build docker image 2022-03-20 11:32:18 +08:00
yaling888
fc8092f7cc Fix: wintun dns address 2022-03-20 04:19:48 +08:00
MetaCubeX
5b7f46bc97 [skip ci][内容] 
1.调整部分代码
 2022-03-20 02:39:48 +08:00
MetaCubeX
d1838f663e Merge remote-tracking branch 'yaling888/with-tun' into Alpha 
# Conflicts:
#	listener/tun/tun_adapter.go
 2022-03-19 22:37:51 +08:00
MetaCubeX
2d1c031ce0 [skip ci][内容] 
1.修复部分空指针问题
2.修改go.mod
 2022-03-19 22:28:28 +08:00
MetaCubeX
e67f94b87a [内容] 
同步至最新v1.10.0
 2022-03-19 15:01:49 +08:00
MetaCubeX
2df890c4ee Merge remote-tracking branch 'clash/dev' into Alpha 
# Conflicts:
#	Makefile
 2022-03-19 14:53:47 +08:00
Kr328
30d4668008
Chore: fix typo (#2033) 2022-03-19 13:58:51 +08:00
Dreamacro
02333a859a Chore: split amd64 v3 to special release 2022-03-19 13:42:06 +08:00
risetechlab
f9cc1cc363
Fix: routing-mark option doesn't work on proxies (#2028) 2022-03-19 13:29:30 +08:00
MetaCubeX
520256365e [内容] 
1.wintun.dll 0.14.1
 2022-03-19 01:54:21 +08:00
MetaCubeX
9270d3c475 [内容] 
1.autoIptables 开关
2.go.mod 调整
3.processName 调整
4.makefile 调整
5.Tun模块 部分代码调整
 2022-03-19 01:11:27 +08:00
Meta
c8b1050c15
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
admin
39de5d58c8 Only prompt when interface cannot be found 2022-03-18 17:41:06 +08:00
yaling888
7b7abf6973 Feature: auto detect interface if switch network 2022-03-18 17:03:50 +08:00
Meta
a38f30ec3b
Merge pull request #18 from Adlyq/Alpha 
[Fix] Process name display for Android
 2022-03-18 13:20:35 +08:00
admin
2ea92d70f9 Merge remote-tracking branch 'upstream/Alpha' into Alpha 2022-03-18 12:38:16 +08:00
yaling888
8e5f01597e Fix: build 2022-03-18 05:21:28 +08:00
yaling888
546f2fa739 Chore: make fake ip pool start with the third ip 2022-03-18 05:17:47 +08:00
MetaCubeX
ea2e715da9 Merge remote-tracking branch 'origin/Alpha' into Alpha 
# Conflicts:
#	go.mod
#	go.sum
 2022-03-18 02:36:09 +08:00
MetaCubeX
1350330fe0 1.fix module package 
2.fix govet error
 2022-03-18 02:35:15 +08:00
MetaCubeX
317797acc8 1.fix module package 
2.fix govet error
 2022-03-18 01:25:59 +08:00
MetaCubeX
8766764d49 fix 2022-03-18 00:40:39 +08:00
admin
b8d48e1618 Merge remote-tracking branch 'upstream/Alpha' into Alpha 2022-03-18 00:33:27 +08:00
MetaCubeX
f972d1fa58 update 2022-03-18 00:27:48 +08:00
MetaCubeX
df78ba8fa6 update 2022-03-18 00:24:38 +08:00
admin
0c83575302 Merge remote-tracking branch 'upstream/Alpha' into Alpha 2022-03-18 00:10:37 +08:00
MetaCubeX
e9151bc43f update 2022-03-17 23:57:58 +08:00
admin
68345b6a19 Merge remote-tracking branch 'upstream/Alpha' into Alpha 2022-03-17 23:40:51 +08:00
MetaCubeX
435bee0ca2 update 2022-03-17 23:24:07 +08:00
admin
92d169ca81 [Fix] Process name display for Android 2022-03-17 20:31:16 +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
Meta
c503e44324
Merge pull request #17 from Adlyq/Alpha 
[Fix] Parse
 2022-03-17 12:28:45 +08:00
admin
ce509295c0 [Fix] Parse 2022-03-17 12:26:43 +08:00
admin
f671d6a1fd [Fix] Parse 2022-03-17 12:23:50 +08:00
yaling888
8d0ae4284d Chore: use gateway address of fake ip pool as the TUN device address 2022-03-17 07:41:18 +08:00
MetaCubeX
e194efcecb Migration: go 1.18 2022-03-17 01:51:28 +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
c791044ddf Merge remote-tracking branch 'origin/Alpha' into Alpha 2022-03-17 00:12:26 +08:00
MetaCubeX
dc2abe6eeb [Build test] 1.18 
[Updata] wintun.dll
 2022-03-17 00:12:11 +08:00
MetaCubeX
1071e3f4a3 [Build test] 1.18 
[Updata] wintun.dll
 2022-03-17 00:02:22 +08:00
MetaCubeX
acc249495d [Build test] 1.18 2022-03-16 23:30:29 +08:00
MetaCubeX
5a2cc9a36f [Fix] 优化geodata初始化逻辑 2022-03-16 23:09:05 +08:00
MetaCubeX
1cc6cfab9c [Fix] 优化geodata初始化逻辑 2022-03-16 23:02:16 +08:00
MetaCubeX
0183d752a0 [Fix] 优化geodata初始化逻辑 2022-03-16 22:55:18 +08:00
yaling888
b8d635a4b3 Migration: go 1.18 2022-03-16 22:00:20 +08:00
MetaCubeX
2f24e49ff6 [build test] 1.18 2022-03-16 21:47:00 +08:00
yaling888
346d817dba Chore: Merge branch 'ogn-dev' into with-tun 2022-03-16 20:16:30 +08:00
yaling888
3a9bbf6c73 Fix: should keep alive in tcp relay 2022-03-16 18:17:28 +08:00