xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2189 commits 17 branches 83 tags 10 MiB
Commit graph

281 commits

Author SHA1 Message Date
gVisor bot
06def71944 Chore: merge branch 'ogn-dev' into with-tun 2022-03-29 07:22:52 +08:00
gVisor bot
4fe3b781b0 [Chore]升级项目依赖 
[Chore]隐藏TUN模式在system堆栈启动时弹窗
 2022-03-28 19:48:32 +08:00
gVisor bot
6dc80f4b93 Fix: convert size to unit32 in getoridst to solve some mips64 devices cannot get redirect origin dst (#2041) 
Change-Id: I40aa73dcea692132e38db980320a8a07ed427fe6

Co-authored-by: Zhao Guowei <zhaoguowei@bytedance.com>
 2022-03-28 14:48:51 +08:00
gVisor bot
7b4e06816f Merge remote-tracking branch 'tun/with-tun' into Alpha 2022-03-28 10:51:59 +08:00
gVisor bot
323dea4352 Chore: adjust gVisor stack 2022-03-28 03:25:55 +08:00
gVisor bot
3fd2aa1832 Merge remote-tracking branch 'tun/with-tun' into Alpha 2022-03-25 14:20:05 +08:00
gVisor bot
cd7aad233e Chore: adjust tun RelayDnsPacket 2022-03-25 04:09:11 +08:00
gVisor bot
e16bc7f69a Fix: udp 4In6 of tun system stack 2022-03-25 03:42:46 +08:00
gVisor bot
a52743bd28 [SKIP CI] 
Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha

# Conflicts:
#	README.md
#	hub/route/server.go
 2022-03-23 13:23:34 +08:00
gVisor bot
6addcc260f bypass support for auto-iptables 2022-03-23 11:36:13 +08:00
gVisor bot
22db48dd37 [skip ci] 
# Conflicts:
#	.github/workflows/linter.yml
#	.github/workflows/release.yml
#	config/config.go
#	go.mod
#	go.sum
#	hub/executor/executor.go
 2022-03-23 01:41:42 +08:00
gVisor bot
b7798b8c9d Chore: adjust the signal 2022-03-22 18:40:33 +08:00
gVisor bot
56dc81ea73 Refactor: iptables auto config, disabled by default 2022-03-22 05:38:42 +08:00
gVisor bot
e773595e33 auto change interface for tproxy 2022-03-21 19:51:27 +08:00
gVisor bot
6218abbacc Fix: retry create TUN on Windows 2022-03-20 21:27:33 +08:00
gVisor bot
e07c3a7fe0 Fix: wintun dns address 2022-03-20 04:19:48 +08:00
gVisor bot
29b8076c75 Merge remote-tracking branch 'yaling888/with-tun' into Alpha 
# Conflicts:
#	listener/tun/tun_adapter.go
 2022-03-19 22:37:51 +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
f3304cf245 Feature: auto detect interface if switch network 2022-03-18 17:03:50 +08:00
gVisor bot
6d4942e90b Fix: build 2022-03-18 05:21:28 +08:00
gVisor bot
598ec35701 Chore: make fake ip pool start with the third ip 2022-03-18 05:17:47 +08:00
gVisor bot
b8c9a1bf6d update 2022-03-17 23:24:07 +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
9ef90782ce Chore: use gateway address of fake ip pool as the TUN device address 2022-03-17 07:41:18 +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
6cddf49d6e [Build test] 1.18 
[Updata] wintun.dll
 2022-03-17 00:12:11 +08:00
gVisor bot
6a735b10d7 Migration: go 1.18 2022-03-16 22:00:20 +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
907c68c9cb Migration: go 1.18 2022-03-16 12:10:13 +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
d3658311d1 [Skip CI] 2022-03-15 11:47:42 +08:00
gVisor bot
e252d96095 Chore: use slice instead of map for system stack udp receiver queue 2022-03-15 05:19:29 +08:00
gVisor bot
fb7ba942c7 Style: code style 2022-03-15 02:55:06 +08:00
gVisor bot
e855cefc13 [Skip CI] 2022-03-15 02:20:19 +08:00
gVisor bot
00fdc33c3a [Fixed] memory leak 2022-03-13 18:35:55 +08:00
gVisor bot
b76d0e2109 [Fixed] handle network protocol[0] panic (not pretty) 2022-03-13 18:34:49 +08:00
gVisor bot
cb7e7fa23f Fix: should use the correct gateway for TUN system stack 2022-03-13 17:48:43 +08:00
gVisor bot
dc0339e399 Chore: embed the RuleExtra into Base 2022-03-13 01:22:05 +08:00
gVisor bot
c8861d83f8 Chore: bump to go1.18rc1, use netip.Addr to replace net.IP with system TUN stack 2022-03-12 02:16:13 +08:00
gVisor bot
0175b103d0 Chore: refactor TUN 2022-03-09 05:08:35 +08:00
gVisor bot
f8e9902530 Chore: code style 2022-03-09 00:32:21 +08:00
gVisor bot
4389f8918e [Fixed] skip maybe invaild ip data packet 2022-03-04 22:32:33 +08:00
gVisor bot
802c412939 Merge branch 'ogn-dev' into with-tun 2022-03-03 04:17:00 +08:00
gVisor bot
e488aaff9d Chore: use SIMD for AMD64 and ARM64 system stack checksum 2022-02-23 14:51:04 +08:00
gVisor bot
e04b6de377 Chore: use "-m mark --mark" instead of "-m owner --uid-owner" 2022-02-23 14:19:59 +08:00
gVisor bot
32db97450b Fix: listener tcp keepalive & reuse net.BufferedConn (#1987) 2022-02-23 11:22:46 +08:00
gVisor bot
7f0de1861a Merge from remote branch 2022-02-23 01:00:27 +08:00
gVisor bot
2a9b3e6447 Chore: upgrade gvisor 2022-02-22 22:30:41 +08:00
gVisor bot
940f442478 [FEAT] 
1.Add geodata loader mode switch
yaml   geodata-loader: memconservative / standard
2.Add AutoIptables mode switch
yaml   auto-iptables: true
3.support trojan xtls
4.update gvisor
5.Fix process
6.Fix darwin autoRoute
 2022-02-05 21:33:49 +08:00
gVisor bot
0aead76a23 [Feat] 
update gvisor
Chore: use "-m mark --mark" instead of "-m owner --uid-owner"
 2022-02-04 06:11:24 +08:00
gVisor bot
15ed2ca588 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
gVisor bot
aa9f8bf28e [Feat] 
update gvisor
Chore: use "-m mark --mark" instead of "-m owner --uid-owner"
 2022-02-04 04:47:40 +08:00
gVisor bot
fdb0a3f5a8 Chore: use "-m mark --mark" instead of "-m owner --uid-owner" 2022-02-02 21:59:44 +08:00
gVisor bot
a27851ae17 Chore: upgrade gvisor 2022-02-01 02:00:10 +08:00
gVisor bot
917c1cd699 Revert "Chore: upgrade gvisor version" 
This reverts commit d633e3d96e.
 2022-01-30 00:45:02 +08:00
gVisor bot
18e0f75e9e Chore: upgrade gvisor version 2022-01-28 22:42:58 +08:00
gVisor bot
0867bb8b8a [Fixed] auto-route support use ip route 2022-01-22 13:24:31 +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
0a96994452 [Refactor] gvisor support hijack dns list 
dns-hijack:
 - 1.1.1.1
 - 8.8.8.8:53
 - tcp://1.1.1.1:53
 - udp://223.5.5.5
 - 10.0.0.1:5353
 2022-01-09 00:35:45 +08:00
gVisor bot
1c1eb6bdfb [Fixed] Remove the Linux automatic routing configuration Change the name of the Linux network card to utun 2022-01-08 16:57:59 +08:00
gVisor bot
28d8bf17cb [Style] Adjust delete routes on macos 2022-01-08 16:55:02 +08:00
gVisor bot
27f0f65bfb [Style] Adjust the routing table of tun on mac 2022-01-07 22:40:05 +08:00
gVisor bot
fbe17bcd6a [update]readme 2022-01-05 17:04:56 +08:00
gVisor bot
13392ea6b4 Revert "make tun config compatible with premium" 
This reverts commit ba6fdd2962.
 2022-01-05 01:56:05 +08:00
gVisor bot
acf9ba1280 make tun config compatible with premium 2022-01-05 01:50:43 +08:00
gVisor bot
fd5852ce1c Merge from remote branch 2022-01-05 01:46:37 +08:00
gVisor bot
f507672d4b make tun config compatible with premium 2022-01-05 00:33:42 +08:00
gVisor bot
63254f0306 merge clash 1.9.0 2022-01-04 17:58:50 +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
34b0cdf0f7 [Fix] Linux Tun 2021-12-27 07:09:45 +08:00
gVisor bot
5db5d143ca [test] 2021-12-27 06:44:17 +08:00
gVisor bot
e97e562eb1 [fix]autoIptables 2021-12-27 03:29:14 +08:00
gVisor bot
0ecc9f4941 [fix] 2021-12-27 03:16:48 +08:00
gVisor bot
074c28f0bd Chore: ReCreate* do side effect job (#1849) 2021-12-26 22:08:53 +08:00
gVisor bot
ef28fde9db [Fixed] Configure tun interface on linux 2021-12-11 22:34:45 +08:00
gVisor bot
b22eeb86e2 [Fixed] Add retry to open tun 2021-12-09 22:52:32 +08:00
gVisor bot
c9001cc60c [Fixed] The array may be sent out of bounds 2021-12-09 22:52:32 +08:00
gVisor bot
165e7ccc76 [style] 2021-12-04 17:41:13 +08:00
gVisor bot
934efb3d85 [fix]Linux TProxy 2021-12-04 14:34:01 +08:00
gVisor bot
2860238d49 [style] 2021-12-01 17:08:44 +08:00
gVisor bot
139de5886e [style] embed_wintun.dll 2021-11-30 18:00:19 +08:00
gVisor bot
4287b63fa7 [style] embed_wintun.dll 2021-11-30 17:58:21 +08:00
gVisor bot
c47a8f7f71 [fix] embed_windows 2021-11-27 22:10:37 +08:00
gVisor bot
94a6b07a05 [fix] embed_windows 2021-11-27 21:51:38 +08:00
gVisor bot
c4e5539d4e [test] embed_windows 2021-11-27 21:36:10 +08:00
gVisor bot
d161de6dc1 [test] embed_windows 2021-11-27 21:23:34 +08:00
gVisor bot
3412642797 [test]tun 2021-11-17 19:35:34 +08:00
gVisor bot
e69c54cfcd [test] 2021-11-17 16:03:47 +08:00
gVisor bot
5c51a83fa5 Feature: resolve ip with proxy adapter 2021-11-09 19:44:16 +08:00
gVisor bot
801dc4886d Chore: use custom buffer pool for lwIP stack 2021-11-04 18:33:11 +08:00
gVisor bot
768a66065e Chore: adjust all udp alloc size 
Chore: adjust all udp alloc size
 2021-11-04 00:44:16 +08:00
gVisor bot
cc9ff5ccd7 Chore: adjust all udp alloc size 2021-11-03 22:29:24 +08:00
gVisor bot
feff4a93a9 Wintun: use new swdevice-based API for upcoming Wintun 0.14 2021-11-03 15:10:31 +08:00
gVisor bot
5cca04291b Wintun: use new swdevice-based API for upcoming Wintun 0.14 2021-11-03 15:02:40 +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
258f837da3 Chore: script built 2021-10-27 23:10:11 +08:00
gVisor bot
aba096784d Merge remote branch 2021-10-21 22:37:30 +08:00
gVisor bot
4d79fe1706 Fix: remove ResponseHeaderTimeout limitation (#1690) 2021-10-20 13:44:05 +08:00
gVisor bot
54c22a2fce Feature: add mode script 2021-10-15 14:11:14 +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
fda2b71ac2 Fix: http proxy should response correct http version (#1651) 2021-09-30 16:30:07 +08:00
gVisor bot
554efd8a27 Feature: add lwIP TCP/IP stack to tun listener 2021-09-30 04:05:52 +08:00
gVisor bot
febc9fb22c Chore: format with go 1.17 2021-09-24 04:37:04 +08:00
gVisor bot
a30741b122 Chore: update gvisor 2021-09-23 02:42:17 +08:00
gVisor bot
efad0f5659 Fix: gvisor ipv6 routeing in Tun 2021-09-17 16:49:53 +08:00
gVisor bot
249d830d73 Merge from remote branch 2021-09-17 15:07:27 +08:00
gVisor bot
0427b76fc9 Fix: http/https proxy authentication (#1613) 2021-09-14 00:08:23 +08:00
gVisor bot
fb357d1dc7 Fix: should not trust address of http.Client (#1616) 2021-09-13 23:46:39 +08:00
gVisor bot
8595347485 Merge from remote branch 2021-09-01 00:38:43 +08:00
gVisor bot
5046f3beab Fix: HTTP proxy internal linkage signature (#1555) 2021-08-20 23:38:47 +08:00
gVisor bot
38bf28b439 Migration: go 1.17 2021-08-18 13:26:23 +08:00
gVisor bot
92396fc893 Merge from remote branch 2021-08-05 00:49:17 +08:00
gVisor bot
d47aef7bae Fix: interface nil check panic from previous commit 2021-08-04 23:52:50 +08:00
gVisor bot
3317beb191 Fix: listener patch diff 2021-08-01 00:35:37 +08:00
gVisor bot
2e762b39b7 Merge from remote branch 2021-07-28 22:13:21 +08:00
gVisor bot
6ba3a17d7b Chore: split SOCKS version inbound metadata type (#1513) 2021-07-27 13:58:29 +08:00
gVisor bot
67f3156897 Fix: error var name 2021-07-27 02:38:41 +08:00
gVisor bot
8928b3d71d Fix: remove Content-Length from CONNECT response (#1502) 2021-07-22 18:06:03 +08:00
gVisor bot
b29ea418cb Fix: socks inbound packet typo 2021-07-21 23:08:52 +08:00
gVisor bot
6b418d4369 Chore: logging real listen port (#1492) 2021-07-19 14:07:51 +08:00
gVisor bot
dd6e71d58f Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) 2021-07-18 16:09:09 +08:00
gVisor bot
c3090aacb1 Style: code style 2021-07-09 02:19:43 +08:00
gVisor bot
c586479a13 Feature: support multiport condition for rule SRC-PORT and DST-PORT 2021-07-06 15:07:05 +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
b495157bec Chore: Listener should not expose original net.Listener 2021-06-13 23:05:22 +08:00
gVisor bot
894e2843d5 Style: code style 2021-06-13 17:23:10 +08:00